diff options
| author | stbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9> | 2012-11-07 13:07:02 +0000 |
|---|---|---|
| committer | stbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9> | 2012-11-07 13:07:02 +0000 |
| commit | aa5cd5467263f0bf00d9bd59c7c5d7d5bf094ea1 (patch) | |
| tree | c429f5c9841bdf9744b4a51b36f475b792ce6f6f | |
| parent | 1cc639b4225df2af3e9b9045aaa9fe6559f1e4d8 (diff) | |
| download | lighttpd-aa5cd5467263f0bf00d9bd59c7c5d7d5bf094ea1.tar.gz | |
configure.ac: remove old stuff, add some new to fix warnings in automake 1.12 (fixes #2419, thx blino)
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2851 152afb58-edef-0310-8abb-c4023f1b3aa9
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 8 insertions, 4 deletions
@@ -7,6 +7,7 @@ NEWS * Code cleanup with clang/sparse (fixes #2437, thx kibi) * Ignore EPIPE/ECONNRESET after SSL_shutdown * Handle ENAMETOOLONG, return 404 Not Found (fixes #2396, thx dererkazo) + * configure.ac: remove old stuff, add some new to fix warnings in automake 1.12 (fixes #2419, thx blino) - 1.4.31 - 2012-05-31 * [ssl] fix segfault in counting renegotiations for openssl versions without TLSEXT/SNI (thx carpii for reporting) diff --git a/configure.ac b/configure.ac index afdf67fc..b79a9fde 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([-Wall -Wportability -Wno-override -Werror foreign dist-bzip2 tar-ustar]) +AM_INIT_AUTOMAKE([-Wall -Wportability -Wno-override foreign dist-bzip2 tar-ustar]) dnl enable with --enable-silent-rules or make V=0 (needs automake >= 1.11) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) @@ -24,6 +24,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 @@ -38,9 +44,6 @@ AM_CONDITIONAL(NO_RDYNAMIC, test x$NO_RDYNAMIC = xyes) AC_EXEEXT -dnl more automake stuff -AM_C_PROTOTYPES - dnl libtool AC_DISABLE_STATIC AC_ENABLE_SHARED |