diff options
| author | Stan Seibert <volsung@xiph.org> | 2001-10-27 22:43:54 +0000 |
|---|---|---|
| committer | Stan Seibert <volsung@xiph.org> | 2001-10-27 22:43:54 +0000 |
| commit | 3d9ab21edf76d8e3ffd936b1a66e8f3f34d5ac4a (patch) | |
| tree | cbf559def52c3b8f2e6f0d0e6ee533afdb097388 /ogg.m4 | |
| parent | 86ce3ec6aefa2e68b0c3d17c15552849ca421d54 (diff) | |
| download | ogg-git-3d9ab21edf76d8e3ffd936b1a66e8f3f34d5ac4a.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).
svn path=/trunk/ogg/; revision=2259
Diffstat (limited to 'ogg.m4')
| -rw-r--r-- | ogg.m4 | 22 |
1 files changed, 15 insertions, 7 deletions
@@ -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="" |