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

[Jack Moffitt]

jack        01/10/21 08:25:46

  Modified:    .        configure.in
               src      Makefile.am
  Log:
  Fix lib handling.

Revision  Changes    Path
1.7       +8 -4      icecast/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/icecast/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configure.in	2001/10/21 15:12:23	1.6
+++ configure.in	2001/10/21 15:25:45	1.7
@@ -9,6 +9,8 @@
 
 dnl Set some options based on environment
 
+SOCKET_LIBS=
+
 if test -z "$GCC"; then
         case $host in 
         *-*-irix*)
@@ -20,7 +22,7 @@
                 DEBUG="-v -g -D_REENTRANT"
                 CFLAGS="-xO4 -fast -w -fsimple -native -xcg92 -D_REENTRANT"
                 PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc -D_REENTRANT"
-		SUN_LIBS="-lnsl -lsocket -lresolv"
+		SOCKET_LIBS="-lnsl -lsocket -lresolv"
                 ;;
         *)
                 DEBUG="-g -D_REENTRANT"
@@ -39,7 +41,7 @@
                 DEBUG="-g -Wall -fsigned-char -mv8 -D_REENTRANT"
                 CFLAGS="-O20 -ffast-math -fsigned-char -mv8 -D_REENTRANT"
                 PROFILE="-pg -g -O20 -fsigned-char -mv8 -D_REENTRANT" 
-		SUN_LIBS="-lnsl -lsocket -lresolv"
+		SOCKET_LIBS="-lnsl -lsocket -lresolv"
                 ;;
         *)
                 DEBUG="-g -Wall -fsigned-char -D_REENTRANT"
@@ -103,9 +105,11 @@
 AM_PATH_VORBIS(, AC_MSG_ERROR(must have Vorbis installed!))
 
 dnl Make substitutions
-
-LIBS="$LIBS $SUN_LIBS $XML_LIBS $OGG_LIBS $VORBIS_LIBS"
 
+AC_SUBST(XML_LIBS)
+AC_SUBST(OGG_LIBS)
+AC_SUBST(VORBIS_LIBS)
+AC_SUBST(SOCKET_LIBS)
 AC_SUBST(LIBTOOL_DEPS)
 AC_SUBST(OPT)
 AC_SUBST(LIBS)

1.3       +2 -1      icecast/src/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	2001/10/20 21:29:16	1.2
+++ Makefile.am	2001/10/21 15:25:45	1.3
@@ -14,7 +14,8 @@
 
 icecast_LDADD = net/libicenet.la thread/libicethread.la httpp/libicehttpp.la\
                 log/libicelog.la avl/libiceavl.la timing/libicetiming.la
-LIBS = -lpthread
+
+LIBS = -lpthread @SOCKET_LIBS@ @XML_LIBS@ @OGG_LIBS@ @VORBIS_LIBS@
 
 INCLUDES = -I$(srcdir)/net -I$(srcdir)/thread -I$(srcdir)/avl -I$(srcdir)/httpp \
         -I$(srcdir)/log -I$(srcdir)/timing

--- >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.