From 905701450908404add59ef5fb98055b23f820572 Mon Sep 17 00:00:00 2001 From: Nathan Bryant Date: Thu, 26 Jul 2001 21:43:46 +0000 Subject: [PATCH] - move to autoconf 2.52 - random warning fix - check for db 3.3 --- citadel/ChangeLog | 6 ++++++ citadel/Makefile.in | 2 +- citadel/{configure.in => configure.ac} | 17 ++++++++++------- citadel/parsedate.y | 13 +++++++++++++ 4 files changed, 30 insertions(+), 8 deletions(-) rename citadel/{configure.in => configure.ac} (95%) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index 83b124163..5e4f64243 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,4 +1,9 @@ $Log$ + Revision 580.7 2001/07/26 21:43:46 nbryant + - move to autoconf 2.52 + - random warning fix + - check for db 3.3 + Revision 580.6 2001/07/24 13:17:54 ajc * New UI for mailing list setup * rooms.c: code cleanup @@ -2583,3 +2588,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant Fri Jul 10 1998 Art Cancro * Initial CVS import + diff --git a/citadel/Makefile.in b/citadel/Makefile.in index fbc02c0fd..8606508aa 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -332,7 +332,7 @@ Makefile: $(srcdir)/Makefile.in config.status config.status: $(srcdir)/configure $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4 +$(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4 cd $(srcdir) && $(AUTOCONF) weekly: $(srcdir)/weekly.in config.status diff --git a/citadel/configure.in b/citadel/configure.ac similarity index 95% rename from citadel/configure.in rename to citadel/configure.ac index 6a146ded0..3c425ae64 100644 --- a/citadel/configure.in +++ b/citadel/configure.ac @@ -1,7 +1,8 @@ dnl Process this file with autoconf to produce a configure script. dnl $Id$ -AC_PREREQ(2.13) -AC_INIT(citserver.c) +AC_PREREQ(2.52) +AC_INIT([Citadel/UX]) +AC_CONFIG_SRCDIR([citserver.c]) AC_PREFIX_DEFAULT(/usr/local/citadel) if test "$prefix" = NONE; then AC_DEFINE_UNQUOTED(BBSDIR, "$ac_default_prefix") @@ -17,10 +18,10 @@ AC_ARG_ENABLE(threaded-client, [ --disable-threaded-client AC_ARG_WITH(pam, [ --with-pam use PAM if present (see PAM.txt before you try this)]) AC_ARG_WITH(kthread, [ --with-kthread use kernel threads (on FreeBSD) (not recommended yet)]) -AC_ARG_WITH(gdbm, [ --with-gdbm[=DIR] use GDBM [DIR=/usr/local]]) -AC_ARG_WITH(db, [ --with-db[=DIR] use Sleepycat DB 3.1 [DIR=/usr/local/BerkeleyDB.3.1]]) +AC_ARG_WITH(gdbm, [ --with-gdbm@<:@=DIR@:>@ use GDBM @<:@DIR=/usr/local@:>@]) +AC_ARG_WITH(db, [ --with-db@<:@=DIR@:>@ use Sleepycat DB 3.x @<:@DIR=/usr/local/BerkeleyDB.3.@<:@123@:>@@:>@]) -if test "x$with_gdbm" != xno -a "x$with_gdbm" != xyeso -a "$with_gdbm"; then +if test "x$with_gdbm" != xno -a "x$with_gdbm" != xyes -a "$with_gdbm"; then db_dir="$with_gdbm" with_gdbm=yes else @@ -33,6 +34,7 @@ if test "x$with_db" != xno -a "x$with_db" != xyes -a "$with_db"; then else test -d /usr/local/BerkeleyDB.3.1 && db_dir=/usr/local/BerkeleyDB.3.1 test -d /usr/local/BerkeleyDB.3.2 && db_dir=/usr/local/BerkeleyDB.3.2 + test -d /usr/local/BerkeleyDB.3.3 && db_dir=/usr/local/BerkeleyDB.3.3 fi if test "x$with_gdbm" = xyes -a "x$with_db" = xyes; then @@ -231,7 +233,7 @@ AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT test "$db_dir" && CPPFLAGS="$CPPFLAGS -I$db_dir/include" -AC_CHECK_HEADERS(curses.h dl.h dlfcn.h fcntl.h limits.h termios.h strings.h sys/ioctl.h sys/select.h sys/time.h syslog.h unistd.h utmp.h utmpx.h paths.h) +AC_CHECK_HEADERS(curses.h dl.h dlfcn.h fcntl.h limits.h termios.h sys/ioctl.h sys/select.h sys/time.h syslog.h unistd.h utmp.h utmpx.h paths.h) dnl some systems require -pthread, -D_REENTRANT, etc to be passed to cc if we dnl include pthread.h: @@ -359,4 +361,5 @@ AC_SUBST(CL_LIBOBJS) AC_SUBST(CX) AC_SUBST(DATABASE) AC_CONFIG_HEADER(sysdep.h) -AC_OUTPUT(Makefile weekly) +AC_CONFIG_FILES([Makefile weekly]) +AC_OUTPUT diff --git a/citadel/parsedate.y b/citadel/parsedate.y index b710129c0..b68ca4c24 100644 --- a/citadel/parsedate.y +++ b/citadel/parsedate.y @@ -18,6 +18,9 @@ /* SUPPRESS 593 on yyerrlab *//* Label was not used */ /* SUPPRESS 593 on yynewstate *//* Label was not used */ /* SUPPRESS 595 on yypvt *//* Automatic variable may be used before set */ + +#include "sysdep.h" + #include #include #include @@ -34,6 +37,16 @@ # endif #endif +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H +# include +# endif +# include +#endif +#if HAVE_STRINGS_H +# include +#endif + #include "parsedate.h" int date_lex(void); -- 2.39.2