[xiph-cvs] cvs commit: vorbis-tools/ogg123 Makefile.am

[Jeff Squyres]

jsquyres    01/02/19 14:27:53

  Modified:    .        configure.in
               ogg123   Makefile.am
  Log:
  Some systems need -lsocket -lnsl to call functions like connect(),
  gethostbyname(), etc.  Added a configure test to check for these
  libraries.  If they are found, put them in the shell variable
  SOCKET_LIBS.  Otherwise, SOCKET_LIBS will be empty.
  
  AC_SUBST the SOCKET_LIBS variable/macro.
  
  ogg123/Makefile.am adds @SOCKET_LIBS@ to the ogg123_LDADD line so that
  they will be linked in properly.

Revision  Changes    Path
1.16      +4 -0      vorbis-tools/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/configure.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- configure.in	2001/01/30 10:42:47	1.15
+++ configure.in	2001/02/19 22:27:52	1.16
@@ -59,6 +59,9 @@
 AM_PATH_OGG(,AC_MSG_ERROR(Ogg needed!))
 AM_PATH_VORBIS(,AC_MSG_ERROR(Vorbis needed!))
 AM_PATH_AO(,AC_MSG_ERROR(libao needed!))
+SOCKET_LIBS=
+AC_CHECK_LIB(socket, socket, SOCKET_LIBS="-lsocket")
+AC_CHECK_LIB(nsl, gethostbyname, SOCKET_LIBS="-lnsl $SOCKET_LIBS")
 
 dnl --------------------------------------------------
 dnl Check for library functions
@@ -72,5 +75,6 @@
 
 AC_SUBST(DEBUG)
 AC_SUBST(PROFILE)
+AC_SUBST(SOCKET_LIBS)
 
 AC_OUTPUT(Makefile oggenc/Makefile oggenc/man/Makefile ogg123/Makefile vorbiscomment/Makefile debian/Makefile)

1.13      +2 -1      vorbis-tools/ogg123/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.am	2001/01/30 10:42:48	1.12
+++ Makefile.am	2001/02/19 22:27:52	1.13
@@ -10,7 +10,8 @@
 
 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@
 
-ogg123_LDADD = @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@
+ogg123_LDADD = @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \
+		@SOCKET_LIBS@
 
 ogg123_SOURCES = ogg123.c ao_interface.c buffer.c ogg123.h buffer.h getopt.c getopt1.c getopt.h
 

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