summaryrefslogtreecommitdiff
path: root/ogg.m4
diff options
context:
space:
mode:
authorStan Seibert <volsung@xiph.org>2001-10-27 22:43:54 +0000
committerStan Seibert <volsung@xiph.org>2001-10-27 22:43:54 +0000
commit9f6b6075f9146f09f893a4e78c53d0be87b88713 (patch)
treecbf559def52c3b8f2e6f0d0e6ee533afdb097388 /ogg.m4
parent0bd3a468df62611b27770781f8e3f22a0c168102 (diff)
downloadogg-9f6b6075f9146f09f893a4e78c53d0be87b88713.tar.gz
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). git-svn-id: http://svn.xiph.org/trunk/ogg@2259 0101bb08-14d6-0310-b084-bc0e0c8e3800
Diffstat (limited to 'ogg.m4')
-rw-r--r--ogg.m422
1 files changed, 15 insertions, 7 deletions
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=""