From 815875377a5f1913c21d911c38d2d9ec0b25e530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BChler?= Date: Thu, 9 Apr 2009 16:51:50 +0000 Subject: [PATCH] Rename configure.in to configure.ac, with small cleanups (fixes #1932) * This should remove the need for calling ./autogen.sh after svn up git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2435 152afb58-edef-0310-8abb-c4023f1b3aa9 --- NEWS | 1 + configure.in => configure.ac | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) rename configure.in => configure.ac (96%) diff --git a/NEWS b/NEWS index c63adf69..9f814fe0 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,7 @@ NEWS * Strip trailing dot from "Host:" header * Remove the optional port info from SERVER_NAME (thx Mr_Bond) * Fix mod_proxy RoundRobin (off by one problem if only one backend is up) + * Rename configure.in to configure.ac, with small cleanups (fixes #1932) - 1.4.22 - 2009-03-07 * Fix wrong lua type for CACHE_MISS/CACHE_HIT in mod_cml (fixes #533) diff --git a/configure.in b/configure.ac similarity index 96% rename from configure.in rename to configure.ac index cee2fa36..dd50219f 100644 --- a/configure.in +++ b/configure.ac @@ -1,17 +1,14 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT(lighttpd, 1.4.23, jan@kneschke.de) +AC_INIT([lighttpd], [1.4.23], [jan@kneschke.de]) AC_CONFIG_SRCDIR([src/server.c]) +AC_CONFIG_HEADER([config.h]) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE -AC_CONFIG_HEADER([config.h]) - -AM_MAINTAINER_MODE - # Checks for programs. AC_PROG_CC AM_PROG_CC_C_O @@ -538,8 +535,21 @@ AC_CHECK_LIB(fcgi, FCGI_Accept, [ AM_CONDITIONAL(CHECK_WITH_FASTCGI, test "x$fastcgi_found" = xyes) +# check for extra compiler options (warning options) if test "${GCC}" = "yes"; then - CFLAGS="${CFLAGS} -Wall -W -Wshadow -pedantic -std=gnu99" + CFLAGS="${CFLAGS} -Wall -W -Wshadow -pedantic -std=gnu99" +fi + +AC_ARG_ENABLE(extra-warnings, + AC_HELP_STRING([--enable-extra-warnings],[enable extra warnings (gcc specific)]), + [case "${enableval}" in + yes) extrawarnings=true ;; + no) extrawarnings=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-extra-warnings) ;; + esac],[extrawarnings=false]) + +if test x$extrawarnings = xtrue; then + CFLAGS="${CFLAGS} -g -O2 -g2 -Wall -Wmissing-declarations -Wdeclaration-after-statement -Wno-pointer-sign -Wcast-align -Winline -Wsign-compare -Wnested-externs -Wpointer-arith -Wl,--as-needed -Wformat-security" fi dnl build version-id