[xiph-cvs] cvs commit: ogg autogen.sh configure.in ogg.m4

[Stan Seibert]

volsung     01/10/27 15:43:55

  Modified:    .        autogen.sh configure.in ogg.m4
  Log:
  Clearing out my backlog of autoconf updates:
  - CFLAGS propagates to debug and profile targets
  - Clean up AM_PATH_OGG macro as per bug #65 and conversations with jack
  - -I flag to aclocal allows .m4 files in source dir to be searched for autoconf
    macros.  Not currently needed by libogg, but I've included it to be consistent
    with the other libraries (which will need it).

Revision  Changes    Path
1.4       +2 -2      ogg/autogen.sh

Index: autogen.sh
===================================================================
RCS file: /usr/local/cvsroot/ogg/autogen.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autogen.sh	2001/08/23 17:39:54	1.3
+++ autogen.sh	2001/10/27 22:43:54	1.4
@@ -47,8 +47,8 @@
 
 echo "Generating configuration files for $package, please wait...."
 
-echo "  aclocal $ACLOCAL_FLAGS"
-aclocal $ACLOCAL_FLAGS
+echo "  aclocal -I $srcdir $ACLOCAL_FLAGS"
+aclocal -I $srcdir $ACLOCAL_FLAGS
 #echo "  autoheader"
 #autoheader
 echo "  libtoolize --automake"

1.19      +2 -0      ogg/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ogg/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.in	2001/08/13 03:48:22	1.18
+++ configure.in	2001/10/27 22:43:54	1.19
@@ -63,6 +63,8 @@
         esac
 fi
 CFLAGS="$CFLAGS $cflags_save"
+DEBUG="$DEBUG $cflags_save"
+PROFILE="$PROFILE $cflags_save"
 LDFLAGS="$LDFLAGS $ldflags_save"
 
 dnl Checks for programs.

1.6       +15 -7     ogg/ogg.m4

Index: ogg.m4
===================================================================
RCS file: /usr/local/cvsroot/ogg/ogg.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ogg.m4	2001/08/20 21:31:38	1.5
+++ ogg.m4	2001/10/27 22:43:54	1.6
@@ -9,20 +9,28 @@
 [dnl 
 dnl Get the cflags and libraries
 dnl
-AC_ARG_WITH(ogg-prefix,[  --with-ogg-prefix=PFX   Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
+AC_ARG_WITH(ogg,[  --with-ogg=PFX   Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
+AC_ARG_WITH(ogg-libraries,[  --with-ogg-libraries=DIR   Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="")
+AC_ARG_WITH(ogg-includes,[  --with-ogg-includes=DIR   Directory where libogg header files are installed (optional)], ogg_libraries="$withval", ogg_libraries="")
 AC_ARG_ENABLE(oggtest, [  --disable-oggtest       Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
 
-  if test "x$ogg_prefix" != "x"; then
-    ogg_args="$ogg_args --prefix=$ogg_prefix"
-    OGG_CFLAGS="-I$ogg_prefix/include"
+  if test "x$ogg_libraries" != "x" ; then
+    OGG_LIBS="-L$ogg_libraries"
+  elif test "x$ogg_prefix" != "x" ; then
     OGG_LIBS="-L$ogg_prefix/lib"
-  elif test "x$prefix" != "xNONE"; then
-    ogg_args="$ogg_args --prefix=$prefix"
-    OGG_CFLAGS="-I$prefix/include"
+  elif test "x$prefix" != "xNONE" ; then
     OGG_LIBS="-L$prefix/lib"
   fi
 
   OGG_LIBS="$OGG_LIBS -logg"
+
+  if test "x$ogg_includes" != "x" ; then
+    OGG_CFLAGS="-I$ogg_includes"
+  if test "x$ogg_prefix" != "x" ; then
+    OGG_CFLAGS="-I$ogg_prefix/include"
+  elif test "$prefix" != "xNONE"; then
+    OGG_CFLAGS="-I$prefix/include"
+  fi
 
   AC_MSG_CHECKING(for Ogg)
   no_ogg=""

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