Store git version string to a C file, not a header.

[srvx.git] / configure.in

diff --git a/configure.in b/configure.in
index 588be8abd0d3ebf3ea3edfd26562d4f49dc07fc0..c275ea09828103d6b6125bfe6698f20a27b7c1ec 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to create a configure script.
 
 dnl General initialization.
 AC_PREREQ(2.59)
-AC_INIT([srvx],[1.3.1],[srvx-bugs@lists.sourceforge.net])
+AC_INIT([srvx],[1.4],[srvx-bugs@lists.sourceforge.net])
 CODENAME=surge
 AC_CONFIG_HEADERS(src/config.h)
 AC_CONFIG_SRCDIR(src/opserv.c)
@@ -14,7 +14,7 @@ AM_MAINTAINER_MODE
 dnl Compiler/runtime feature checks.
 AC_TYPE_SIGNAL
 AC_C_CONST
-AC_C_INLINE
+dnl "const" *should* be in the -Werror section, but that breaks Linux. gg gcc.
 
 dnl Checks for programs.
 AC_PROG_AWK
@@ -25,9 +25,9 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_GCC_TRADITIONAL
 
-dnl Look for a GNU Arch program
-AC_CHECK_PROGS(GNU_ARCH, [baz tla])
-AM_CONDITIONAL(HAS_GNU_ARCH, test z$GNU_ARCH != z)
+dnl Look for a git client
+AC_CHECK_PROGS(GIT, [git])
+AM_CONDITIONAL(HAS_GIT, test z$GIT != z)
 
 dnl nice that unixes can all follow a standard.
 case $target in
@@ -83,7 +83,7 @@ AC_CHECK_MEMBER([struct addrinfo.ai_flags],
 #include <netdb.h>])
 
 dnl We have fallbacks in case these are missing, so just check for them.
-AC_CHECK_FUNCS(freeaddrinfo getaddrinfo getnameinfo getpagesize memcpy memset strdup strerror strsignal localtime_r setrlimit getopt getopt_long regcomp regexec regfree sysconf inet_aton epoll_create select gettimeofday,,)
+AC_CHECK_FUNCS(freeaddrinfo getaddrinfo gai_strerror getnameinfo getpagesize memcpy memset strdup strerror strsignal localtime_r setrlimit getopt getopt_long regcomp regexec regfree sysconf inet_aton epoll_create select gettimeofday times GetProcessTimes,,)
 
 dnl Check for the fallbacks for functions missing above.
 if test $ac_cv_func_gettimeofday = no; then
@@ -134,6 +134,12 @@ int getpeername (int $arg2 *, $t *);]], [[$t len;
 dnl Can only check with -Werror, but the rest of configure doesn't like -Werror
 OLD_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS -W -Wall -Werror"
+if test "z$USE_MAINTAINER_MODE" = zyes ; then
+  CFLAGS="$CFLAGS -ansi"
+fi
+
+dnl Check for post-C89 keywords
+AC_C_INLINE
 
 dnl Now figure out how to printf() a time_t
 AC_MSG_CHECKING(for time_t format)
@@ -230,18 +236,33 @@ AC_ARG_WITH(protocol,
 [],
 [withval="p10"])
 if test "x$withval" = "xp10" ; then
-  AC_MSG_RESULT(P10)
+  AC_MSG_RESULT([P10])
   AC_DEFINE(WITH_PROTOCOL_P10, 1, [Define if using the P10 dialect of IRC])
   MODULE_OBJS="$MODULE_OBJS proto-p10.\$(OBJEXT)"
-  PROTO_FILES=proto-p10.c
 elif test "x$withval" = "xbahamut" ; then
-  AC_MSG_RESULT(Bahamut)
+  AC_MSG_RESULT([Bahamut])
   AC_DEFINE(WITH_PROTOCOL_BAHAMUT, 1, [Define if using the Bahamut dialect of IRC])
   MODULE_OBJS="$MODULE_OBJS proto-bahamut.\$(OBJEXT)"
+elif test -r "${srcdir}/src/proto-${withval}.c" ; then
+  AC_MSG_RESULT([$withval])
+  MODULE_OBJS="$MODULE_OBJS proto-${withval}.\$(OBJEXT)"
 else
   AC_MSG_ERROR([Unknown IRC dialect $withval])
 fi
 
+AC_MSG_CHECKING(how to send mail)
+AC_ARG_WITH(mail,
+[  --with-mail=name        How to send mail; one of:
+                          sendmail (the default)],
+[],
+[withval="sendmail"])
+if test -r "${srcdir}/src/mail-${withval}.c" ; then
+  AC_MSG_RESULT([$withval])
+  MODULE_OBJS="$MODULE_OBJS mail-${withval}.\$(OBJEXT)"
+else
+  AC_MSG_ERROR([Unknown mail method $withval])
+fi
+
 AC_MSG_CHECKING([I/O multiplexing backends])
 IOMUXES=""
 
@@ -342,7 +363,7 @@ fi
 MY_SUBDIRS="$MY_SUBDIRS src"
 CFLAGS="$CFLAGS $ANSI_SRC -W -Wall"
 if test "z$USE_MAINTAINER_MODE" = zyes ; then
-  CFLAGS="$CFLAGS -Werror"
+  CFLAGS="$CFLAGS -Werror -ansi"
 fi
 
 AC_DEFINE_UNQUOTED(CODENAME, "${CODENAME}", [Code name for this release])