[xiph-cvs] cvs commit: icecast configure.in

[Michael Smith]

msmith      03/01/13 05:48:44

  Modified:    src      Makefile.am
               .        configure.in
  Log:
  Patch for freebsd to set gcc options for pthreads correctly, from
  "Nigel Weeks" <nigel at e-easy.com.au>

Revision  Changes    Path
1.11      +1 -1      icecast/src/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.am	24 Sep 2002 08:16:23 -0000	1.10
+++ Makefile.am	13 Jan 2003 10:48:43 -0000	1.11
@@ -16,7 +16,7 @@
 icecast_LDADD = net/libicenet.la thread/libicethread.la httpp/libicehttpp.la\
                 log/libicelog.la avl/libiceavl.la timing/libicetiming.la
 
-LIBS = @LIBS@ @XSLT_LIBS@ -lpthread @SOCKET_LIBS@ @XML_LIBS@ @OGG_LIBS@ @VORBIS_LIBS@
+LIBS = @LIBS@ @XSLT_LIBS@ @SOCKET_LIBS@ @XML_LIBS@ @OGG_LIBS@ @VORBIS_LIBS@
 CFLAGS = -g @CFLAGS@ @XML_CFLAGS@ @XSLT_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@
 
 INCLUDES = -I$(srcdir)/net -I$(srcdir)/thread -I$(srcdir)/avl -I$(srcdir)/httpp \

<p><p>1.17      +16 -4     icecast/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/icecast/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- configure.in	22 Nov 2002 13:13:04 -0000	1.16
+++ configure.in	13 Jan 2003 10:48:43 -0000	1.17
@@ -36,23 +36,35 @@
                 DEBUG="-g -Wall -fsigned-char -D_REENTRANT -D_GNU_SOURCE"
                 CFLAGS="-O20 -ffast-math -fsigned-char -D_REENTRANT -D_GNU_SOURCE"
                 PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char -D_REENTRANT -D_GNU_SOURCE"
+        		LIBS=" $LIBS -lpthread"
                 ;;
         sparc-sun-solaris*)
                 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" 
-		SOCKET_LIBS="-lnsl -lsocket -lresolv"
+		        SOCKET_LIBS="-lnsl -lsocket -lresolv"
+        		LIBS=" $LIBS -lpthread"
                 ;;
         *-pc-solaris*)
                 DEBUG="-g -Wall -fsigned-char -D_REENTRANT"
                 CFLAGS="-O20 -ffast-math -fsigned-char -D_REENTRANT"
                 PROFILE="-pg -g -O20 -fsigned-char -D_REENTRANT" 
-		SOCKET_LIBS="-lnsl -lsocket -lresolv"
+		        SOCKET_LIBS="-lnsl -lsocket -lresolv"
+        		LIBS=" $LIBS -lpthread"
+		;;
+        *freebsd*)
+                DEBUG="-g -Wall -fsigned-char -D_REENTRANT"
+                CFLAGS="-O20 -fsigned-char -D_REENTRANT"
+                PROFILE="-O20 -g -pg -fsigned-char -D_REENTRANT" 
+        		LIBS=" $LIBS -pthread"
+		ogg_prefix="/usr/local"
+		vorbis_prefix="/us/local"
                 ;;
         *)
                 DEBUG="-g -Wall -fsigned-char -D_REENTRANT"
                 CFLAGS="-O20 -fsigned-char -D_REENTRANT"
                 PROFILE="-O20 -g -pg -fsigned-char -D_REENTRANT" 
+		        LIBS=" $LIBS -lpthread"
                 ;;
         esac
 fi
@@ -145,8 +157,8 @@
   AC_MSG_ERROR([xml-config could not be found])
 fi
 
-AM_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
-AM_PATH_VORBIS(, AC_MSG_ERROR(must have Vorbis installed!))
+AM_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!(Perhaps you need --with-ogg-prefix=/usr/local)))
+AM_PATH_VORBIS(, AC_MSG_ERROR(must have Vorbis installed!(Perhaps you need --with-vorbis-prefix=/usr/local)))
 
 dnl Make substitutions
 

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