#
# ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors
+# Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# -- Initialisation --
AC_PREREQ([2.61])
-AC_INIT([ngIRCd], VERSION_ID,
- [ngircd-ml@ngircd.barton.de], [ngircd], [http://ngircd.barton.de/])
+AC_INIT([ngIRCd],[VERSION_ID],[ngircd-ml@ngircd.barton.de],[ngircd],[http://ngircd.barton.de/])
AC_CONFIG_SRCDIR([src/ngircd/ngircd.c])
AC_CONFIG_HEADER([src/config.h])
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
+AC_PROG_MKDIR_P
AC_PROG_RANLIB
# -- Compiler Features --
AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector])
ssp_old_cflags="$CFLAGS"
CFLAGS="$CFLAGS -fstack-protector-all"
- AC_TRY_LINK(,,, ssp_cc=no)
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],[],[ssp_cc=no])
echo $ssp_cc
CFLAGS="$ssp_old_cflags"
if test "X$ssp_cc" = "Xyes"; then
AC_DEFUN([WORKING_GETADDRINFO],[
AC_CHECK_FUNCS([getaddrinfo],[
AC_MSG_CHECKING([whether getaddrinfo() works])
- AC_TRY_RUN([
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
#include <sys/types.h>
#include <sys/socket.h>
return 1;
return 0;
}
- ],[
+ ]])],[
AC_DEFINE([HAVE_WORKING_GETADDRINFO], 1, [getaddrinfo(0)])
AC_MSG_RESULT(yes)
],[
AC_MSG_RESULT(no)
+ ],[
+ AC_MSG_RESULT(no)
])
])
])
# Required header files
AC_CHECK_HEADERS([ \
- fcntl.h netdb.h netinet/in.h stdlib.h string.h \
- strings.h sys/socket.h sys/time.h unistd.h \
+ fcntl.h \
+ netdb.h \
+ netinet/in.h \
+ stdlib.h \
+ string.h \
+ strings.h \
+ sys/socket.h \
+ sys/time.h \
+ sys/types.h \
+ unistd.h \
],,AC_MSG_ERROR([required C header missing!]))
# Optional header files
AC_CHECK_HEADERS_ONCE([ \
- arpa/inet.h inttypes.h malloc.h netinet/in_systm.h netinet/ip.h \
- stdbool.h stddef.h stdint.h varargs.h \
- ])
+ arpa/inet.h \
+ inttypes.h \
+ malloc.h \
+ netinet/in_systm.h \
+ netinet/ip.h \
+ stdbool.h \
+ stddef.h \
+ stdint.h \
+ varargs.h \
+])
# -- Datatypes --
AC_MSG_CHECKING(whether socklen_t exists)
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <sys/types.h>
#include <sys/socket.h>
- ],[
+ ]],[[
socklen_t a, b;
a = 2; b = 4; a += b;
- ],[
+ ]])],[
AC_DEFINE(HAVE_socklen_t) AC_MSG_RESULT(yes)
],[
AC_MSG_RESULT(no)
])
AC_TYPE_PID_T
-AC_TYPE_SIGNAL
AC_TYPE_SIZE_T
AC_TYPE_SSIZE_T
AC_TYPE_UID_T
# Required functions
AC_CHECK_FUNCS([ \
- alarm dup2 endpwent gethostbyaddr gethostbyname gethostname \
- gettimeofday inet_ntoa memmove memset setsid socket strcasecmp \
- strchr strcspn strerror strncasecmp strrchr strspn strstr \
+ alarm \
+ dup2 \
+ endpwent \
+ gethostbyaddr \
+ gethostbyname \
+ gethostname \
+ gettimeofday \
+ inet_ntoa \
+ memmove \
+ memset \
+ setsid \
+ socket \
+ strcasecmp \
+ strchr \
+ strcspn \
+ strerror \
+ strncasecmp \
+ strrchr \
+ strspn \
+ strstr \
],,
AC_MSG_ERROR([required function missing!]))
# Optional functions
AC_CHECK_FUNCS_ONCE([
- arc4random arc4random_stir gai_strerror getnameinfo inet_aton \
- sigaction sigprocmask snprintf vsnprintf strdup strndup strlcpy strlcat \
- strtok_r unsetenv waitpid])
+ arc4random \
+ arc4random_stir \
+ gai_strerror \
+ getnameinfo \
+ inet_aton \
+ setgroups \
+ sigaction \
+ sigprocmask \
+ snprintf \
+ strdup \
+ strlcat \
+ strlcpy \
+ strndup \
+ strtok_r \
+ unsetenv \
+ vsnprintf \
+ waitpid \
+])
WORKING_GETADDRINFO
LDFLAGS="-L$withval/lib $LDFLAGS"
fi
AC_CHECK_LIB(crypto, BIO_s_mem)
- AC_CHECK_LIB(ssl, SSL_library_init)
- AC_CHECK_FUNCS(SSL_library_init, x_ssl_openssl=yes,
+ AC_CHECK_LIB(ssl, SSL_new)
+ AC_CHECK_FUNCS(SSL_new, x_ssl_openssl=yes,
AC_MSG_ERROR([Can't enable openssl])
)
fi
LDFLAGS="-L$withval/lib $LDFLAGS"
fi
AC_MSG_CHECKING(for hosts_access)
+ saved_LIBS="$LIBS"
LIBS="-lwrap $LIBS"
- AC_TRY_LINK([
+ LIBS_END="-lwrap $LIBS_END"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <sys/types.h>
+#include <sys/socket.h>
#include <tcpd.h>
int allow_severity = 0;
int deny_severity = 0;
- ],[
+ ]],[[
tcpd_warn("link test");
- ],[
+ ]])],[
AC_MSG_RESULT(yes)
AC_DEFINE(TCPWRAP, 1)
x_tcpwrap_on=yes
AC_MSG_RESULT(no)
AC_MSG_ERROR([Can't enable TCP wrappers!])
])
+ LIBS="$saved_LIBS"
fi
]
)
AC_DEFINE_UNQUOTED(HOST_VENDOR, "$host_vendor" )
AC_DEFINE_UNQUOTED(HOST_OS, "$host_os" )
-# Add additional CFLAGS, eventually specified on the command line, but after
-# running this configure script. Useful for "-Werror" for example.
+# Add additional CFLAGS, LDFLAGS and LIBS which were specified on the command
+# line or by some tests from above, but after running this script. Useful for
+# adding "-Werror", for example:
test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END"
+test -n "$LDFLAGS_END" && LDFLAGS="$LDFLAGS $LDFLAGS_END"
+test -n "$LIBS_END" && LIBS="$LIBS $LIBS_END"
# -- Generate files --
# Generate debian/ link if the dpkg command exists
# (read: if we are running on a debian compatible system)
echo "creating Debian-specific links ..."
- test -f debian/rules || ln -s contrib/Debian debian
+ if test ! -f debian/rules -a -f contrib/Debian/rules; then
+ ln -s contrib/Debian debian
+ fi
fi
# -- Result --
projects / ngircd-alex.git / blobdiff