summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9>2013-09-13 11:17:49 +0000
committerstbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9>2013-09-13 11:17:49 +0000
commit83abe5bc6cec539455ec311f39a13c56d000bd60 (patch)
tree9396499bb63ba6fff60a23d624dd8239b733ac97
parentb8048a9824bd6d8e69a1f75918ac104f924a767a (diff)
downloadlighttpd-83abe5bc6cec539455ec311f39a13c56d000bd60.tar.gz
configure.ac: remove old stuff, add some new to fix warnings in automake 1.12
From: Stefan Bühler <stbuehler@web.de> git-svn-id: svn://svn.lighttpd.net/lighttpd/trunk@2905 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r--configure.ac11
1 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 751c32cf..01ba9bd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,12 @@ dnl AC_PROG_CXX
AC_PROG_LN_S
AC_PROG_MAKE_SET
+dnl AM_PROG_AR is needed for some linker stuff
+dnl AC_USE_SYSTEM_EXTENSIONS requires autoconf 2.60
+m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_USE_SYSTEM_EXTENSIONS])
+dnl AM_PROG_AR requires automake 1.11 (and uses AC_COMPILE_IFELSE which wants AC_USE_SYSTEM_EXTENSIONS)
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+
dnl check environment
AC_AIX
AC_ISC_POSIX
@@ -34,11 +40,8 @@ AM_CONDITIONAL(NO_RDYNAMIC, test x$NO_RDYNAMIC = xyes)
AC_EXEEXT
-dnl more automake stuff
-AM_C_PROTOTYPES
-
dnl libtool
-AC_DISABLE_STATIC
+AC_DISABLE_STATIC
AC_ENABLE_SHARED
AC_LIBTOOL_DLOPEN