diff options
| author | W-Mark Kubacki <wmark@hurrikane.de> | 2010-05-25 23:07:35 +0200 |
|---|---|---|
| committer | W-Mark Kubacki <wmark@hurrikane.de> | 2010-05-25 23:07:35 +0200 |
| commit | 35364e13de7f992baaed35916dc1ef8a0b4d3edd (patch) | |
| tree | e6cbdc3b5150c0d27c7fd705d79306128a6bcc90 | |
| parent | 21e729d25d8b80f92f154a61fa8ea2b0aa918629 (diff) | |
| download | fcgiwrap-35364e13de7f992baaed35916dc1ef8a0b4d3edd.tar.xz fcgiwrap-35364e13de7f992baaed35916dc1ef8a0b4d3edd.zip | |
fcgiwrap to rely on definitions provided by autoconf/autoreconf
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | fcgiwrap.c | 8 |
5 files changed, 12 insertions, 7 deletions
@@ -1,4 +1,6 @@ *.cache +config.h +config.h.in config.log config.status configure diff --git a/Makefile.in b/Makefile.in index 7a6904b..bd0da97 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,7 +17,7 @@ clean: #>+ 21 distclean: clean -rm -rf config.log config.status autom4te.cache - -rm -f configure Makefile + -rm -f configure Makefile config.h config.h.in #>+ 21 uninstall: @@ -27,7 +27,7 @@ procedure --------- To install:: - autoconf + autoreconf -i ./configure make make install diff --git a/configure.ac b/configure.ac index 24c0a6e..06d1ed4 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(fcgiwrap, 1.0, root@localdomain.pl) +AC_INIT([fcgiwrap], [1.0.1], [root@localdomain.pl]) AM_CFLAGS="-std=gnu99 -Wall -Wextra -Werror -pedantic" if test x"$CFLAGS" = x""; then AM_CFLAGS="$AM_CFLAGS -O2 -g3" @@ -15,6 +15,9 @@ AC_SUBST([AM_CFLAGS]) # Checks for programs. AC_PROG_CC +# Create the config.h. +AC_CONFIG_HEADERS([config.h]) + # Checks for libraries. AC_CHECK_LIB([fcgi], [FCGX_Init],, [AC_MSG_ERROR([FastCGI library is missing])]) @@ -24,8 +24,8 @@ */ #define NO_FCGI_DEFINES -#define FCGIWRAP_VERSION "1.0" +#include "config.h" #include <stdarg.h> #include <fcgi_stdio.h> #include <stdio.h> @@ -628,12 +628,12 @@ int main(int argc, char **argv) switch (c) { case 'h': printf("Usage: %s [OPTION]\nInvokes CGI scripts as FCGI.\n\n" - "fcgiwrap version "FCGIWRAP_VERSION"\n\n" + PACKAGE_NAME" version "PACKAGE_VERSION"\n\n" "Options are:\n" " -c 1..x\t\tNumber of processes to prefork\n" " -h\t\t\tShow this help message and exit\n" - "\nReport bugs to Grzegorz Nosek <root@localdomain.pl>.\n" - "fcgiwrap home page: <http://nginx.localdomain.pl/wiki/FcgiWrap>\n", + "\nReport bugs to Grzegorz Nosek <"PACKAGE_BUGREPORT">.\n" + PACKAGE_NAME" home page: <http://nginx.localdomain.pl/wiki/FcgiWrap>\n", argv[0] ); return 0; |