[xiph-cvs] cvs commit: libshout HACKING configure.in

[Brendan]

brendan     03/03/07 21:45:22

  Modified:    .        HACKING configure.in
  Log:
  Mike points out that courtesy of Mike we can all skip this step.

Revision  Changes    Path
1.3       +0 -3      libshout/HACKING

Index: HACKING
===================================================================
RCS file: /usr/local/cvsroot/libshout/HACKING,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HACKING	7 Mar 2003 23:28:42 -0000	1.2
+++ HACKING	8 Mar 2003 02:45:22 -0000	1.3
@@ -18,9 +18,6 @@
    favorite flavor of CVS documentation; information on the xiph.org
    CVS repository can be found at http://www.xiph.org/cvs.html.
 
-   This module requires submodules to compile.  Checkout 'net',
-   'thread', 'avl', 'http', and 'timing' under the ./src directory.
-
 2. [re-]generate files such as "configure" and "Makefile.in" with the
    GNU autoconf/automake tools.  Run the "autogen.sh" script to
    perform this step.  

<p><p>1.18      +25 -15    libshout/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/libshout/configure.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- configure.in	8 Mar 2003 00:46:58 -0000	1.17
+++ configure.in	8 Mar 2003 02:45:22 -0000	1.18
@@ -1,22 +1,20 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/shout.c)
 
-LIBSHOUT_MAJOR=2
-LIBSHOUT_MINOR=0
-LIBSHOUT_MICRO=0
-
-AC_DEFINE_UNQUOTED([LIBSHOUT_MAJOR], [$LIBSHOUT_MAJOR], ["Shout library major version"])
-AC_DEFINE_UNQUOTED([LIBSHOUT_MINOR], [$LIBSHOUT_MINOR], ["Shout library minor version"])
-AC_DEFINE_UNQUOTED([LIBSHOUT_MICRO], [$LIBSHOUT_MICRO], ["Shout library patch version"])
+m4_define(libshout_major, 2)
+m4_define(libshout_minor, 0)
+m4_define(libshout_micro, 0)
+m4_define(libshout_version,
+  m4_if(libshout_micro, 0, libshout_major.libshout_minor,
+   libshout_major.libshout_minor.libshout_micro))
+
+AC_DEFINE([LIBSHOUT_MAJOR], libshout_major, ["Shout library major version"])
+AC_DEFINE([LIBSHOUT_MINOR], libshout_minor, ["Shout library minor version"])
+AC_DEFINE([LIBSHOUT_MICRO], libshout_micro, ["Shout library patch version"])
 
-if test "$LIBSHOUT_MICRO" != 0
-then
-  VERSION=$LIBSHOUT_MAJOR.$LIBSHOUT_MINOR.$LIBSHOUT_MICRO
-else
-  VERSION=$LIBSHOUT_MAJOR.$LIBSHOUT_MINOR
-fi
+VERSION=libshout_version
 
-AM_INIT_AUTOMAKE(libshout,$VERSION)
+AM_INIT_AUTOMAKE([libshout], libshout_version)
 
 AC_PROG_CC
 AM_PROG_LIBTOOL
@@ -111,6 +109,16 @@
 
 XIPH_PATH_OGG
 XIPH_PATH_VORBIS
+LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS"
+XIPH_CFLAGS="$XIPH_CFLAGS $VORBIS_CFLAGS $OGG_CFLAGS"
+
+# Build shout-config
+SHOUT_VERSION="$VERSION"
+SHOUT_LIBS="-lshout"
+SHOUT_LIBDEPS="$LIBS"
+SHOUT_CFLAGS="$XIPH_CFLAGS"
+AC_CONFIG_LIBCONFIG_IN_STATIC
+AC_CONFIG_LIBCONFIG_IN([shout])
 
 dnl Make substitutions
 
@@ -122,4 +130,6 @@
 AC_SUBST(PROFILE)
 AC_SUBST(XIPH_CFLAGS)
 
-AC_OUTPUT(Makefile include/Makefile include/shout/Makefile src/Makefile src/net/Makefile src/timing/Makefile src/thread/Makefile src/avl/Makefile src/httpp/Makefile examples/Makefile)
+AC_OUTPUT([Makefile include/Makefile include/shout/Makefile src/Makefile src/net/Makefile
+  src/timing/Makefile src/thread/Makefile src/avl/Makefile src/httpp/Makefile examples/Makefile
+  shout-config])

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