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

svn path=/trunk/ogg/; revision=2259

3 files changed, 19 insertions, 9 deletions

diff --git a/autogen.sh b/autogen.sh
index 4f92453..e4f9ff5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -47,8 +47,8 @@ fi
 
 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"
diff --git a/configure.in b/configure.in
index 4ca7ec7..1e128c9 100644
--- a/configure.in
+++ b/configure.in
@@ -63,6 +63,8 @@ else
         esac
 fi
 CFLAGS="$CFLAGS $cflags_save"
+DEBUG="$DEBUG $cflags_save"
+PROFILE="$PROFILE $cflags_save"
 LDFLAGS="$LDFLAGS $ldflags_save"
 
 dnl Checks for programs.
diff --git a/ogg.m4 b/ogg.m4
index bf29606..de8c161 100644
--- a/ogg.m4
+++ b/ogg.m4
@@ -9,21 +9,29 @@ AC_DEFUN(AM_PATH_OGG,
 [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=""