Skip to content

Commit c922070

Browse files
Updated ogg.m4 using autoupdate to avoid warnings from autoconf.
This got rid of these messages from autoconf when using XIPH_PATH_OGG from ogg.m4: configure.ac:5: warning: The macro `AC_HELP_STRING' is obsolete. configure.ac:5: You should run autoupdate. ./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from... ../../ogg.m4:8: XIPH_PATH_OGG is expanded from... configure.ac:5: the top level configure.ac:5: warning: The macro `AC_TRY_RUN' is obsolete. configure.ac:5: You should run autoupdate. ./lib/autoconf/general.m4:2997: AC_TRY_RUN is expanded from... ../../ogg.m4:8: XIPH_PATH_OGG is expanded from... configure.ac:5: the top level configure.ac:5: warning: The macro `AC_TRY_LINK' is obsolete. configure.ac:5: You should run autoupdate. ./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from... ../../ogg.m4:8: XIPH_PATH_OGG is expanded from... configure.ac:5: the top level
1 parent 6801da9 commit c922070

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

ogg.m4

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ AC_DEFUN([XIPH_PATH_OGG],
99
[dnl
1010
dnl Get the cflags and libraries
1111
dnl
12-
AC_ARG_WITH(ogg,AC_HELP_STRING([--with-ogg=PFX],[Prefix where libogg is installed (optional)]), ogg_prefix="$withval", ogg_prefix="")
13-
AC_ARG_WITH(ogg-libraries,AC_HELP_STRING([--with-ogg-libraries=DIR],[Directory where libogg library is installed (optional)]), ogg_libraries="$withval", ogg_libraries="")
14-
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="")
15-
AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--disable-oggtest],[Do not try to compile and run a test Ogg program]),, enable_oggtest=yes)
12+
AC_ARG_WITH(ogg,AS_HELP_STRING([--with-ogg=PFX],[Prefix where libogg is installed (optional)]), ogg_prefix="$withval", ogg_prefix="")
13+
AC_ARG_WITH(ogg-libraries,AS_HELP_STRING([--with-ogg-libraries=DIR],[Directory where libogg library is installed (optional)]), ogg_libraries="$withval", ogg_libraries="")
14+
AC_ARG_WITH(ogg-includes,AS_HELP_STRING([--with-ogg-includes=DIR],[Directory where libogg header files are installed (optional)]), ogg_includes="$withval", ogg_includes="")
15+
AC_ARG_ENABLE(oggtest,AS_HELP_STRING([--disable-oggtest],[Do not try to compile and run a test Ogg program]),, enable_oggtest=yes)
1616
1717
if test "x$ogg_libraries" != "x" ; then
1818
OGG_LIBS="-L$ogg_libraries"
@@ -56,7 +56,7 @@ dnl
5656
dnl Now check if the installed Ogg is sufficiently new.
5757
dnl
5858
rm -f conf.oggtest
59-
AC_TRY_RUN([
59+
AC_RUN_IFELSE([AC_LANG_SOURCE([
6060
#include <stdio.h>
6161
#include <stdlib.h>
6262
#include <string.h>
@@ -68,7 +68,7 @@ int main ()
6868
return 0;
6969
}
7070
71-
],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
71+
])],[],[no_ogg=yes],[echo $ac_n "cross compiling; assumed OK... $ac_c"])
7272
CFLAGS="$ac_save_CFLAGS"
7373
LIBS="$ac_save_LIBS"
7474
fi
@@ -87,22 +87,20 @@ int main ()
8787
echo "*** Could not run Ogg test program, checking why..."
8888
CFLAGS="$CFLAGS $OGG_CFLAGS"
8989
LIBS="$LIBS $OGG_LIBS"
90-
AC_TRY_LINK([
90+
AC_LINK_IFELSE([AC_LANG_PROGRAM([
9191
#include <stdio.h>
9292
#include <ogg/ogg.h>
93-
], [ return 0; ],
94-
[ echo "*** The test program compiled, but did not run. This usually means"
93+
], [ return 0; ])],[echo "*** The test program compiled, but did not run. This usually means"
9594
echo "*** that the run-time linker is not finding Ogg or finding the wrong"
9695
echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your"
9796
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
9897
echo "*** to the installed location Also, make sure you have run ldconfig if that"
9998
echo "*** is required on your system"
10099
echo "***"
101100
echo "*** If you have an old version installed, it is best to remove it, although"
102-
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
103-
[ echo "*** The test program failed to compile or link. See the file config.log for the"
101+
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],[echo "*** The test program failed to compile or link. See the file config.log for the"
104102
echo "*** exact error that occurred. This usually means Ogg was incorrectly installed"
105-
echo "*** or that you have moved Ogg since it was installed." ])
103+
echo "*** or that you have moved Ogg since it was installed."])
106104
CFLAGS="$ac_save_CFLAGS"
107105
LIBS="$ac_save_LIBS"
108106
fi

0 commit comments

Comments
 (0)