[xiph-cvs] cvs commit: icecast/src Makefile.am

[Jack Moffitt]

jack        01/10/21 09:13:02

  Modified:    .        Makefile.am configure.in
               src      Makefile.am
  Log:
  Fix broken CFLAGS handling.

Revision  Changes    Path
1.3       +2 -2      icecast/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/icecast/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	2001/09/10 02:55:41	1.2
+++ Makefile.am	2001/10/21 16:13:01	1.3
@@ -10,7 +10,7 @@
 GET = true
 
 debug:
-	$(MAKE) all CFLAGS="@DEBUG@"
+	$(MAKE) all CFLAGS="@DEBUG@ @XML_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@"
 
 profile:
-	$(MAKE) all CFLAGS="@PROFILE@"
+	$(MAKE) all CFLAGS="@PROFILE@ @XML_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@"

1.8       +8 -1      icecast/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/icecast/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure.in	2001/10/21 15:25:45	1.7
+++ configure.in	2001/10/21 16:13:01	1.8
@@ -91,12 +91,16 @@
 if test -n "$XMLCONFIG"
 then
   XML_LIBS="`$XMLCONFIG --libs`"
-  CPPFLAGS="$CPPFLAGS `$XMLCONFIG --cflags`"
+  XML_CFLAGS="`$XMLCONFIG --cflags`"
   save_LIBS="$LIBS"
+  save_CFLAGS="$CFLAGS"
   LIBS="$LIBS $XML_LIBS"
+  CFLAGS="$CFLAGS $XML_CFLAGS"
   AC_CHECK_FUNC(xmlParseFile,, [AC_MSG_ERROR([There was a problem linking with libxml])])
   LIBS="$save_LIBS"
+  CFLAGS="$save_CFLAGS"
   save_LIBS=
+  save_CFLAGS=
 else
   AC_MSG_ERROR([xml-config could not be found])
 fi
@@ -106,6 +110,9 @@
 
 dnl Make substitutions
 
+AC_SUBST(XML_CFLAGS)
+AC_SUBST(OGG_CFLAGS)
+AC_SUBST(VORBIS_CFLAGS)
 AC_SUBST(XML_LIBS)
 AC_SUBST(OGG_LIBS)
 AC_SUBST(VORBIS_LIBS)

1.4       +4 -3      icecast/src/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	2001/10/21 15:25:45	1.3
+++ Makefile.am	2001/10/21 16:13:02	1.4
@@ -15,7 +15,8 @@
 icecast_LDADD = net/libicenet.la thread/libicethread.la httpp/libicehttpp.la\
                 log/libicelog.la avl/libiceavl.la timing/libicetiming.la
 
-LIBS = -lpthread @SOCKET_LIBS@ @XML_LIBS@ @OGG_LIBS@ @VORBIS_LIBS@
+LIBS = @LIBS@ -lpthread @SOCKET_LIBS@ @XML_LIBS@ @OGG_LIBS@ @VORBIS_LIBS@
+CFLAGS = @CFLAGS@ @XML_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@
 
 INCLUDES = -I$(srcdir)/net -I$(srcdir)/thread -I$(srcdir)/avl -I$(srcdir)/httpp \
         -I$(srcdir)/log -I$(srcdir)/timing
@@ -24,8 +25,8 @@
 GET = true
 
 debug:
-        $(MAKE) all CFLAGS="@DEBUG@"
+        $(MAKE) all CFLAGS="@DEBUG@ @XML_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@"
 
 profile:
-        $(MAKE) all CFLAGS="@PROFILE@"
+        $(MAKE) all CFLAGS="@PROFILE@ @XML_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@"
 

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.