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

[Jack Moffitt]

jack        01/10/21 08:58:57

  Modified:    .        configure.in
               src      Makefile.am
  Log:
  CFLAGS weren't being handled at all in most cases.  Fixed.  This should
  allow ices to build with local installations of vorbis, libshout, libxml,
  etc.

Revision  Changes    Path
1.9       +9 -1      ices/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ices/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure.in	2001/10/21 15:35:14	1.8
+++ configure.in	2001/10/21 15:58:56	1.9
@@ -103,12 +103,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
@@ -124,6 +128,10 @@
 AC_SUBST(SOCKET_LIBS)
 AC_SUBST(XML_LIBS)
 AC_SUBST(SHOUT_LIBS)
+AC_SUBST(OGG_CFLAGS)
+AC_SUBST(VORBIS_CFLAGS)
+AC_SUBST(SHOUT_CLFAGS)
+AC_SUBST(XML_CFLAGS)
 AC_SUBST(LIBTOOL_DEPS)
 AC_SUBST(OPT)
 AC_SUBST(LIBS)

1.4       +3 -1      ices/src/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ices/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	2001/10/21 15:35:14	1.3
+++ Makefile.am	2001/10/21 15:58:56	1.4
@@ -26,8 +26,10 @@
 ices_LDADD = net/libicenet.la thread/libicethread.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@\
        @VORBISENC_LIBS@ @SHOUT_LIBS@
+
+CFLAGS = @CFLAGS@ @XML_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ @SHOUT_CFLAGS@
 
 INCLUDES = -Inet -Ithread -Iavl -Ilog -Itiming $(OSS_CFLAGS) $(SUN_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.