[Flac-dev] Patch : fix configure.in and Makefile.am problems.
Erik de Castro Lopo
erikd-flac at mega-nerd.com
Sat Jan 29 21:32:04 PST 2005
Note : I'm subscribed to the list. Please don't CC replies to me.
Hi all,
I am trying to compiler current CV head on a PowerPC G3 Debain system.
Debian test has automake 1.9 which is a little more stringent about
errors than 1.8. The following patch has the following fixes.
0) Remove AC_CANNONIAL_HOST because it has already been invoked
earlier
1) Make sure FLaC__HAS_AS__TEMPORARILY_DISABLED and
FLaC__HAS_GAS__TEMPORARILY_DISABLED have been defined on PPC.
2) Fix all instances of CFLAGS/CXXFLAGS being set in Makefile.am.
These two variables are automaticall set in Makefile.in. If you
need extra flag foo in Makefile.am, the correct way to do it is
AM_CFLAGS/AM_CXXFLAGS.
Probably more to come as this thing still doesn't compile.
Cheers,
Erik
Index: configure.in
===================================================================
RCS file: /cvsroot/flac/flac/configure.in,v
retrieving revision 1.105
diff -u -r1.105 configure.in
--- configure.in 27 Jan 2005 03:59:55 -0000 1.105
+++ configure.in 30 Jan 2005 05:23:53 -0000
@@ -42,7 +42,6 @@
dnl AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] )
AC_CHECK_FUNCS(getopt_long, [], [])
-AC_CANONICAL_HOST
case "$host_cpu" in
i*86) cpu_ia32=true ; AC_DEFINE(FLAC__CPU_IA32) ;;
powerpc) cpu_ppc=true ; AC_DEFINE(FLAC__CPU_PPC) ;;
@@ -209,6 +208,9 @@
CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
CXXFLAGS="$OUR_CFLAGS_HEAD $CXXFLAGS"
+AM_CONDITIONAL(FLaC__HAS_AS__TEMPORARILY_DISABLED, test "yes" = "no")
+AM_CONDITIONAL(FLaC__HAS_GAS__TEMPORARILY_DISABLED, test "yes" = "no")
+
AM_CONFIG_HEADER(config.h)
AH_TEMPLATE(FLAC__ALIGN_MALLOC_DATA, [define to align allocated memory on 32-byte boundaries])
AH_TEMPLATE(FLAC__CPU_IA32, [define if building for ia32/i386])
Index: src/flac/Makefile.am
===================================================================
RCS file: /cvsroot/flac/flac/src/flac/Makefile.am,v
retrieving revision 1.33
diff -u -r1.33 Makefile.am
--- src/flac/Makefile.am 25 Jan 2005 04:18:27 -0000 1.33
+++ src/flac/Makefile.am 30 Jan 2005 05:23:53 -0000
@@ -16,7 +16,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
bin_PROGRAMS = flac
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+AM_CFLAGS = @OGG_CFLAGS@
if FLaC__HAS_OGG
NEED_OGGFLAC_LIB = $(top_builddir)/src/libOggFLAC/libOggFLAC.la
Index: src/libFLAC/Makefile.am
===================================================================
RCS file: /cvsroot/flac/flac/src/libFLAC/Makefile.am,v
retrieving revision 1.57
diff -u -r1.57 Makefile.am
--- src/libFLAC/Makefile.am 29 Jan 2005 06:10:58 -0000 1.57
+++ src/libFLAC/Makefile.am 30 Jan 2005 05:23:53 -0000
@@ -43,7 +43,7 @@
CPUCFLAGS = -maltivec -mabi=altivec -force_cpusubtype_ALL -DFLAC__NO_ASM
endif
endif
-CFLAGS = @CFLAGS@ $(DEBUGCFLAGS) $(CPUCFLAGS)
+AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS)
if FLaC__NO_ASM
else
Index: src/libFLAC++/Makefile.am
===================================================================
RCS file: /cvsroot/flac/flac/src/libFLAC++/Makefile.am,v
retrieving revision 1.23
diff -u -r1.23 Makefile.am
--- src/libFLAC++/Makefile.am 25 Jan 2005 04:18:35 -0000 1.23
+++ src/libFLAC++/Makefile.am 30 Jan 2005 05:23:54 -0000
@@ -29,7 +29,6 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
lib_LTLIBRARIES = libFLAC++.la
-CXXFLAGS = @CXXFLAGS@
m4datadir = $(datadir)/aclocal
m4data_DATA = libFLAC++.m4
Index: src/libOggFLAC/Makefile.am
===================================================================
RCS file: /cvsroot/flac/flac/src/libOggFLAC/Makefile.am,v
retrieving revision 1.23
diff -u -r1.23 Makefile.am
--- src/libOggFLAC/Makefile.am 25 Jan 2005 04:18:35 -0000 1.23
+++ src/libOggFLAC/Makefile.am 30 Jan 2005 05:23:54 -0000
@@ -32,7 +32,7 @@
if DEBUG
DEBUGCFLAGS =
endif
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@ $(DEBUGCFLAGS)
+AM_CFLAGS = @OGG_CFLAGS@ $(DEBUGCFLAGS)
SUBDIRS = include .
Index: src/libOggFLAC++/Makefile.am
===================================================================
RCS file: /cvsroot/flac/flac/src/libOggFLAC++/Makefile.am,v
retrieving revision 1.17
diff -u -r1.17 Makefile.am
--- src/libOggFLAC++/Makefile.am 25 Jan 2005 04:18:38 -0000 1.17
+++ src/libOggFLAC++/Makefile.am 30 Jan 2005 05:23:55 -0000
@@ -29,7 +29,6 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
lib_LTLIBRARIES = libOggFLAC++.la
-CXXFLAGS = @CXXFLAGS@
m4datadir = $(datadir)/aclocal
m4data_DATA = libOggFLAC++.m4
Index: src/metaflac/Makefile.am
===================================================================
RCS file: /cvsroot/flac/flac/src/metaflac/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- src/metaflac/Makefile.am 25 Jan 2005 04:18:38 -0000 1.19
+++ src/metaflac/Makefile.am 30 Jan 2005 05:23:55 -0000
@@ -16,7 +16,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
bin_PROGRAMS = metaflac
-CFLAGS = @CFLAGS@
EXTRA_DIST = \
Makefile.lite \
Index: src/plugin_xmms/Makefile.am
===================================================================
RCS file: /cvsroot/flac/flac/src/plugin_xmms/Makefile.am,v
retrieving revision 1.28
diff -u -r1.28 Makefile.am
--- src/plugin_xmms/Makefile.am 25 Jan 2005 04:18:40 -0000 1.28
+++ src/plugin_xmms/Makefile.am 30 Jan 2005 05:23:55 -0000
@@ -29,7 +29,7 @@
plugin.h \
tag.h
-CFLAGS = @CFLAGS@ @XMMS_CFLAGS@
+AM_CFLAGS = @XMMS_CFLAGS@
INCLUDES = -I$(top_srcdir)/src
if FLaC__INSTALL_XMMS_PLUGIN_LOCALLY
xmmsinputplugindir = $(HOME)/.xmms/Plugins
Index: src/test_grabbag/cuesheet/Makefile.am
===================================================================
RCS file: /cvsroot/flac/flac/src/test_grabbag/cuesheet/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- src/test_grabbag/cuesheet/Makefile.am 25 Jan 2005 04:18:41 -0000 1.8
+++ src/test_grabbag/cuesheet/Makefile.am 30 Jan 2005 05:23:55 -0000
@@ -19,8 +19,6 @@
Makefile.lite \
test_cuesheet.dsp
-CFLAGS = @CFLAGS@
-
noinst_PROGRAMS = test_cuesheet
test_cuesheet_SOURCES = \
main.c
Index: src/test_libFLAC/Makefile.am
===================================================================
RCS file: /cvsroot/flac/flac/src/test_libFLAC/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- src/test_libFLAC/Makefile.am 25 Jan 2005 04:18:41 -0000 1.16
+++ src/test_libFLAC/Makefile.am 30 Jan 2005 05:23:56 -0000
@@ -19,7 +19,6 @@
Makefile.lite \
test_libFLAC.dsp
-CFLAGS = @CFLAGS@
INCLUDES = -I$(top_srcdir)/src/libFLAC/include
noinst_PROGRAMS = test_libFLAC
Index: src/test_libFLAC++/Makefile.am
===================================================================
RCS file: /cvsroot/flac/flac/src/test_libFLAC++/Makefile.am,v
retrieving revision 1.17
diff -u -r1.17 Makefile.am
--- src/test_libFLAC++/Makefile.am 25 Jan 2005 04:18:42 -0000 1.17
+++ src/test_libFLAC++/Makefile.am 30 Jan 2005 05:23:56 -0000
@@ -15,8 +15,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-CFLAGS = @CFLAGS@
-
EXTRA_DIST = \
Makefile.lite \
README \
Index: src/test_libOggFLAC/Makefile.am
===================================================================
RCS file: /cvsroot/flac/flac/src/test_libOggFLAC/Makefile.am,v
retrieving revision 1.15
diff -u -r1.15 Makefile.am
--- src/test_libOggFLAC/Makefile.am 25 Jan 2005 04:18:43 -0000 1.15
+++ src/test_libOggFLAC/Makefile.am 30 Jan 2005 05:23:56 -0000
@@ -19,7 +19,7 @@
Makefile.lite \
test_libOggFLAC.dsp
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+AM_CFLAGS = @OGG_CFLAGS@
INCLUDES =
noinst_PROGRAMS = test_libOggFLAC
Index: src/test_libOggFLAC++/Makefile.am
===================================================================
RCS file: /cvsroot/flac/flac/src/test_libOggFLAC++/Makefile.am,v
retrieving revision 1.15
diff -u -r1.15 Makefile.am
--- src/test_libOggFLAC++/Makefile.am 25 Jan 2005 04:18:44 -0000 1.15
+++ src/test_libOggFLAC++/Makefile.am 30 Jan 2005 05:23:56 -0000
@@ -20,7 +20,7 @@
README \
test_libOggFLAC++.dsp
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+AM_CFLAGS = @OGG_CFLAGS@
noinst_PROGRAMS = test_libOggFLAC++
test_libOggFLAC___LDADD = \
Index: src/test_seeking/Makefile.am
===================================================================
RCS file: /cvsroot/flac/flac/src/test_seeking/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- src/test_seeking/Makefile.am 25 Jan 2005 04:18:44 -0000 1.3
+++ src/test_seeking/Makefile.am 30 Jan 2005 05:23:56 -0000
@@ -19,7 +19,7 @@
Makefile.lite \
test_seeking.dsp
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+AM_CFLAGS = @OGG_CFLAGS@
INCLUDES =
if FLaC__HAS_OGG
Index: src/test_streams/Makefile.am
===================================================================
RCS file: /cvsroot/flac/flac/src/test_streams/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- src/test_streams/Makefile.am 25 Jan 2005 04:18:44 -0000 1.13
+++ src/test_streams/Makefile.am 30 Jan 2005 05:23:56 -0000
@@ -19,8 +19,6 @@
Makefile.lite \
test_streams.dsp
-CFLAGS = @CFLAGS@
-
noinst_PROGRAMS = test_streams
test_streams_SOURCES = \
main.c
--
+-----------------------------------------------------------+
Erik de Castro Lopo nospam at mega-nerd.com (Yes it's valid)
+-----------------------------------------------------------+
"C++ is an atrocity, the bletcherous scab of the computing world,
responsible for more buffer overflows, more security breaches, more
blue screens of death, more mysterious failures than any other computer
language in the history of the planet Earth." -- Eric Lee Green
More information about the Flac-dev
mailing list