dnl Process this file with autoconf to produce a configure script.
dnl $Id$
-AC_INIT([WebCit],m4_esyscmd_s([grep CLIENT_VERSION webcit.h | sed 's/[^0-9]*//g']),[http://uncensored.citadel.org])
+AC_INIT([WebCit],[m4_esyscmd_s(grep CLIENT_VERSION webcit.h | sed 's/[^0-9]*//g')],[http://uncensored.citadel.org])
AC_SUBST(PROG_SUBDIRS)
AC_DEFINE(PROG_SUBDIRS, [], [Program dirs])
AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
dnl Make sure we see all GNU and Solaris extensions.
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
AC_CHECK_PROG(SED, sed, sed, no)
AC_PREFIX_DEFAULT(/usr/local/webcit)
AC_SEARCH_LIBS(connect, socket)
dnl Checks for header files.
-AC_HEADER_STDC
+m4_warn([obsolete],
+[The preprocessor macro `STDC_HEADERS' is obsolete.
+ Except in unusual embedded environments, you can safely include all
+ ISO C90 headers unconditionally.])dnl
+# Autoupdate added the next two lines to ensure that your configure
+# script's behavior did not change. They are probably safe to remove.
+AC_CHECK_INCLUDES_DEFAULT
+AC_PROG_EGREP
+
dnl AC_HEADER_SYS_WAIT
AC_CHECK_FUNCS(crypt gethostbyname connect flock getpwnam_r getpwuid_r getloadavg)
AC_CACHE_CHECK(
[for call semantics from getpwuid_r],
ac_cv_call_getpwuid_r,
- [AC_TRY_COMPILE([#include <sys/types.h>
-#include <pwd.h>],
- [
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#include <pwd.h>]], [[
struct passwd pw, *pwp;
char pwbuf[64];
uid_t uid;
getpwuid_r(uid, &pw, pwbuf, sizeof(pwbuf), &pwp);
- ],
- ac_cv_call_getpwuid_r=yes,
- ac_cv_call_getpwuid_r=no)
+ ]])],[ac_cv_call_getpwuid_r=yes],[ac_cv_call_getpwuid_r=no])
])
if test $ac_cv_call_getpwuid_r = no; then
AC_CHECK_SIZEOF(long, 0)
AC_CHECK_SIZEOF(long unsigned int, 0)
AC_CHECK_SIZEOF(size_t, 0)
-dnl AC_HEADER_TIME
+dnl m4_warn([obsolete],
+[Update your code to rely only on HAVE_SYS_TIME_H,
+then remove this warning and the obsolete code below it.
+All current systems provide time.h; it need not be checked for.
+Not all systems provide sys/time.h, but those that do, all allow
+you to include it and time.h simultaneously.])dnl
+AC_CHECK_HEADERS_ONCE([sys/time.h])
+# Obsolete code to be removed.
+if test $ac_cv_header_sys_time_h = yes; then
+ AC_DEFINE([TIME_WITH_SYS_TIME],[1],[Define to 1 if you can safely include both <sys/time.h>
+ and <time.h>. This macro is obsolete.])
+fi
+# End of obsolete code.
+
dnl Checks for library functions.
-AC_TYPE_SIGNAL
+m4_warn([obsolete],
+[your code may safely assume C89 semantics that RETSIGTYPE is void.
+Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl
+AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE(
+[AC_LANG_PROGRAM([#include <sys/types.h>
+#include <signal.h>
+],
+ [return *(signal (0, 0)) (0) == 1;])],
+ [ac_cv_type_signal=int],
+ [ac_cv_type_signal=void])])
+AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers
+ (`int' or `void').])
+
dnl AC_FUNC_VPRINTF
AC_REPLACE_FUNCS(snprintf)
AC_CHECK_HEADER(CUnit/CUnit.h, [AC_DEFINE(ENABLE_TESTS, [], [whether we should compile the test-suite])])
ok_iconv=no, ok_iconv=yes)
AC_MSG_CHECKING(Checking to see if your system supports iconv)
-AC_TRY_RUN([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <iconv.h>
main() {
iconv_t ic = (iconv_t)(-1) ;
iconv_close(ic);
exit(0);
}
- ],
- [
+ ]])],[
ok_iconv=yes
AC_MSG_RESULT([yes])
- ],
- [
+ ],[
ok_iconv=no
AC_MSG_RESULT([no])
- ]
-)
+
+],[])
dnl Check for iconv in external libiconv
if test "$ok_iconv" = no; then
AC_MSG_CHECKING(Checking for an external libiconv)
OLD_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -liconv"
- AC_TRY_RUN([
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <iconv.h>
main() {
iconv_t ic = (iconv_t)(-1) ;
ic = iconv_open("UTF-8", "us-ascii");
iconv_close(ic);
}
- ],
- [
+ ]])],[
ok_iconv=yes
AC_MSG_RESULT([yes])
- ],
- [
+ ],[
ok_iconv=no
LDFLAGS="$OLD_LDFLAGS"
AC_MSG_RESULT([no])
- ]
- )
+
+ ],[])
fi
if test "$ok_iconv" != "no"; then
AC_MSG_RESULT(webcit will be built with character set conversion.)
)
AC_MSG_CHECKING([whether your system likes memcpy + HKEY])
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#define _GNU_SOURCE
#include <ctype.h>
#include <errno.h>
#include <sys/types.h>
#include "lib/libcitadel.h"
-],
-[
+]], [[
char foo[22];
memcpy(foo, HKEY("foo"));
-],
- [
+]])],[
AC_MSG_RESULT([yes])
- ],
- [
+ ],[
AC_DEFINE(UNDEF_MEMCPY, [], [whether we need to undefine memcpy])
AC_MSG_RESULT([no])
- ]
-)
+
+])
dnl Checks for the Expat XML parser.
AC_CHECK_HEADER(expat.h,
# Basic test to check for compatible version and correct linking
# *does not* test for RSA - that comes later.
- AC_TRY_RUN(
- [
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <string.h>
#include <openssl/rand.h>
int main(void)
RAND_add(a, sizeof(a), sizeof(a));
return(RAND_status() <= 0);
}
- ],
- [
+ ]])],[
found_crypto=1
break;
- ], []
- )
+ ],[
+ ],[])
if test ! -z "$found_crypto" ; then
break;
if test "$abs_srcdir" != "$abs_builddir"; then
CFLAGS="$CFLAGS -I $abs_builddir"
fi
-AC_CONFIG_HEADER(sysdep.h)
-AC_OUTPUT(Makefile po/webcit/Makefile)
+AC_CONFIG_HEADERS([sysdep.h])
+AC_CONFIG_FILES([Makefile po/webcit/Makefile])
+AC_OUTPUT
if test "$abs_srcdir" != "$abs_builddir"; then
ln -s $abs_srcdir/static $abs_builddir
projects / citadel.git / commitdiff