From db12f164908b439470a536fba8860b665b29a2a1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 21 Sep 2009 08:04:38 -0700 Subject: [PATCH] Update configure.ac for recent autoconf. --- ChangeLog | 4 ++++ configure.ac | 18 +++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b535e0..c00ae18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-09-21 Ulrich Drepper + + * configure.ac: Update for more modern autoconf. + 2009-08-26 Roland McGrath * configure.ac (zip_LIBS): Check for liblzma too. diff --git a/configure.ac b/configure.ac index f1118c6..4387fea 100644 --- a/configure.ac +++ b/configure.ac @@ -16,14 +16,13 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software Foundation, dnl Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. dnl -AC_INIT([Red Hat elfutils],[0.142.90],[http://bugzilla.redhat.com/bugzilla/], - [elfutils]) +AC_INIT([Red Hat elfutils],[0.142.90],[http://bugzilla.redhat.com/bugzilla/],[elfutils]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_FILES([config/Makefile]) AC_COPYRIGHT([Copyright (C) 1996-2009 Red Hat, Inc.]) -AC_PREREQ(2.59) dnl Minimum Autoconf version required. +AC_PREREQ(2.63) dnl Minimum Autoconf version required. dnl We use GNU make extensions; automake 1.10 defaults to -Wportability. AM_INIT_AUTOMAKE([gnits 1.8 -Wno-portability dist-bzip2 no-dist-gzip]) @@ -146,7 +145,7 @@ if test "x$enable_mudflap" = xyes; then # Check whether the compiler support -fmudflap. old_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fmudflap" - AC_TRY_COMPILE([], [], use_mudflap=yes, use_mudflap=fail) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[use_mudflap=yes],[use_mudflap=fail]) CFLAGS="$old_CFLAGS" fi]) if test "$use_mudflap" = fail; then @@ -157,15 +156,13 @@ AM_CONDITIONAL(MUDFLAP, test "$use_mudflap" = yes) dnl enable debugging of branch prediction. use_debugpred=0 AC_ARG_ENABLE([debugpred], -AC_HELP_STRING([--enable-debugpred], -[build binaries with support to debug branch prediction]), +AS_HELP_STRING([--enable-debugpred],[build binaries with support to debug branch prediction]), [use_debugpred=1], [use_debugpred=0]) AC_SUBST([DEBUGPRED], $use_debugpred) dnl Enable gprof suport. AC_ARG_ENABLE([gprof], -AC_HELP_STRING([--enable-gprof], -[build binaries with gprof support]), [use_gprof=yes], [use_gprof=no]) +AS_HELP_STRING([--enable-gprof],[build binaries with gprof support]), [use_gprof=yes], [use_gprof=no]) if test "$use_gprof" = yes; then CFLAGS="$CFLAGS -pg" LDFLAGS="$LDFLAGS -pg" @@ -174,8 +171,7 @@ AM_CONDITIONAL(GPROF, test "$use_gprof" = yes) # Enable gcov suport. AC_ARG_ENABLE([gcov], -AC_HELP_STRING([--enable-gcov], -[build binaries with gcov support]), [use_gcov=yes], [use_gcov=no]) +AS_HELP_STRING([--enable-gcov],[build binaries with gcov support]), [use_gcov=yes], [use_gcov=no]) if test "$use_gcov" = yes; then CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage" LDFLAGS="$LDFLAGS -fprofile-arcs" @@ -186,7 +182,7 @@ AM_CONDITIONAL(BUILD_STATIC, [dnl test "$use_mudflap" = yes -o "$use_gprof" = yes -o "$use_gcov" = yes]) AC_ARG_ENABLE([tests-rpath], -AC_HELP_STRING([--enable-tests-rpath], [build $ORIGIN-using rpath into tests]), +AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]), [tests_use_rpath=yes], [tests_use_rpath=no]) AM_CONDITIONAL(TESTS_RPATH, test "$tests_use_rpath" = yes) -- 2.7.4