Commit fab2dd41 authored by conrad's avatar conrad

update acinclude.m4 to latest ogg.m4. Patch from Ivo Gonçalves


git-svn-id: http://svn.annodex.net/liboggz/trunk@3447 8158c8cd-e7e1-0310-9fa4-c5954c97daef
parent 1535dbf7
...@@ -9,23 +9,29 @@ AC_DEFUN([XIPH_PATH_OGG], ...@@ -9,23 +9,29 @@ AC_DEFUN([XIPH_PATH_OGG],
[dnl [dnl
dnl Get the cflags and libraries dnl Get the cflags and libraries
dnl dnl
AC_ARG_WITH(ogg,[ --with-ogg=PFX Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="") AC_ARG_WITH(ogg,AC_HELP_STRING([--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-libraries,AC_HELP_STRING([--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_includes="$withval", ogg_includes="") AC_ARG_WITH(ogg-includes,AC_HELP_STRING([--with-ogg-includes=DIR],[Directory where libogg header files are installed (optional)]), ogg_includes="$withval", ogg_includes="")
AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run a test Ogg program],, enable_oggtest=yes) AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--disable-oggtest],[Do not try to compile and run a test Ogg program]),, enable_oggtest=yes)
if test "x$ogg_libraries" != "x" ; then if test "x$ogg_libraries" != "x" ; then
OGG_LIBS="-L$ogg_libraries" OGG_LIBS="-L$ogg_libraries"
elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then
OGG_LIBS=""
elif test "x$ogg_prefix" != "x" ; then elif test "x$ogg_prefix" != "x" ; then
OGG_LIBS="-L$ogg_prefix/lib" OGG_LIBS="-L$ogg_prefix/lib"
elif test "x$prefix" != "xNONE" ; then elif test "x$prefix" != "xNONE" ; then
OGG_LIBS="-L$prefix/lib" OGG_LIBS="-L$prefix/lib"
fi fi
OGG_LIBS="$OGG_LIBS -logg" if test "x$ogg_prefix" != "xno" ; then
OGG_LIBS="$OGG_LIBS -logg"
fi
if test "x$ogg_includes" != "x" ; then if test "x$ogg_includes" != "x" ; then
OGG_CFLAGS="-I$ogg_includes" OGG_CFLAGS="-I$ogg_includes"
elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then
OGG_CFLAGS=""
elif test "x$ogg_prefix" != "x" ; then elif test "x$ogg_prefix" != "x" ; then
OGG_CFLAGS="-I$ogg_prefix/include" OGG_CFLAGS="-I$ogg_prefix/include"
elif test "x$prefix" != "xNONE"; then elif test "x$prefix" != "xNONE"; then
...@@ -33,7 +39,12 @@ AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run ...@@ -33,7 +39,12 @@ AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run
fi fi
AC_MSG_CHECKING(for Ogg) AC_MSG_CHECKING(for Ogg)
no_ogg="" if test "x$ogg_prefix" = "xno" ; then
no_ogg="disabled"
enable_oggtest="no"
else
no_ogg=""
fi
if test "x$enable_oggtest" = "xyes" ; then if test "x$enable_oggtest" = "xyes" ; then
...@@ -62,9 +73,12 @@ int main () ...@@ -62,9 +73,12 @@ int main ()
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
if test "x$no_ogg" = "x" ; then if test "x$no_ogg" = "xdisabled" ; then
AC_MSG_RESULT(no)
ifelse([$2], , :, [$2])
elif test "x$no_ogg" = "x" ; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
ifelse([$1], , :, [$1]) ifelse([$1], , :, [$1])
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
if test -f conf.oggtest ; then if test -f conf.oggtest ; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment