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

[Brendan]

brendan     03/01/12 23:30:26

  Modified:    .        configure.in autogen.sh
               src      Makefile.am
  Log:
  Version libshout to avoid conflicts with libshout2, minor portability tweaks.
  This configure.in is likely not very portable though.

Revision  Changes    Path
1.9       +14 -4     libshout/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/libshout/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure.in	7 Jan 2003 03:19:37 -0000	1.8
+++ configure.in	13 Jan 2003 04:30:26 -0000	1.9
@@ -1,7 +1,18 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/shout.c)
 
-AM_INIT_AUTOMAKE(libshout,2.0)
+LIBSHOUT_MAJOR=2
+LIBSHOUT_MINOR=0
+LIBSHOUT_MICRO=0
+
+if test "$LIBSHOUT_MICRO" != 0
+then
+  VERSION=$LIBSHOUT_MAJOR.$LIBSHOUT_MINOR.$LIBSHOUT_MICRO
+else
+  VERSION=$LIBSHOUT_MAJOR.$LIBSHOUT_MINOR
+fi
+
+AM_INIT_AUTOMAKE(libshout,$VERSION)
 
 AC_PROG_CC
 AM_PROG_LIBTOOL
@@ -84,9 +95,8 @@
   AC_CHECK_SIZEOF(long)
   AC_CHECK_SIZEOF(long long)
 ])
-AC_CHECK_TYPE(socklen_t, ,
-  AC_DEFINE(socklen_t, int, [Define if you lack the socklen_t type])
-)
+
+AC_CHECK_TYPE([socklen_t], int)
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS(nanosleep)

<p><p>1.3       +2 -2      libshout/autogen.sh

Index: autogen.sh
===================================================================
RCS file: /usr/local/cvsroot/libshout/autogen.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- autogen.sh	11 Jul 2002 03:55:52 -0000	1.2
+++ autogen.sh	13 Jan 2003 04:30:26 -0000	1.3
@@ -50,8 +50,8 @@
 
 echo "  aclocal $ACLOCAL_FLAGS"
 aclocal $ACLOCAL_FLAGS
-#echo "  autoheader"
-#autoheader
+echo "  autoheader"
+autoheader
 echo "  libtoolize --automake"
 libtoolize --automake
 echo "  automake --add-missing"

<p><p>1.5       +2 -1      libshout/src/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/libshout/src/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am	16 Aug 2002 14:22:16 -0000	1.4
+++ Makefile.am	13 Jan 2003 04:30:26 -0000	1.5
@@ -5,12 +5,13 @@
 SUBDIRS = avl net timing httpp thread
 
 lib_LTLIBRARIES = libshout.la
+libshout_la_LDFLAGS = -version-info 3:0:0
 
 noinst_HEADERS = shout_private.h util.h
 libshout_la_SOURCES = shout.c util.c vorbis.c mp3.c
 
 libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
-		httpp/libicehttpp.la thread/libicethread.la
+		httpp/libicehttpp.la thread/libicethread.la -logg -lvorbis
 
 INCLUDES = -I$(top_srcdir)/include/shout -I$(srcdir)/net -I$(srcdir)/timing -I$(srcdir)/avl -I$(srcdir)/thread -I$(srcdir)/httpp
 

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