From 88bbc402201c8bf088d310a9048bf38b77fb2f8e Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 26 Sep 2007 10:24:14 +0000 Subject: applied patch provided by varmojfekoj to support building ommysql in its own way (now also resides in a plugin subdirectory) --- configure.ac | 47 ++++++++--------------------------------------- 1 file changed, 8 insertions(+), 39 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index bc2ab7cf..f3c05740 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.61) AC_INIT([rsyslog],[1.19.8],[rsyslog@lists.adiscon.com.]) -AM_INIT_AUTOMAKE(rsyslog, 1.19.8) +AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([syslogd.c]) AC_CONFIG_HEADER([config.h]) @@ -13,7 +13,6 @@ AM_PROG_CC_C_O if test "$GCC" = "yes" then CFLAGS="$CFLAGS -W -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute -g" fi -AC_PROG_LIBTOOL AC_CANONICAL_HOST case "${host}" in @@ -30,12 +29,13 @@ esac # Checks for libraries. AC_CHECK_LIB(rt,clock_gettime,,,) +AC_CHECK_LIB(dl,dlopen,,,) # Checks for header files. AC_HEADER_RESOLV AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([arpa/inet.h fcntl.h locale.h netdb.h netinet/in.h paths.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h utmp.h]) +AC_CHECK_HEADERS([arpa/inet.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h utmp.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -44,6 +44,9 @@ AC_TYPE_OFF_T AC_TYPE_PID_T AC_TYPE_SIZE_T AC_TYPE_SSIZE_T +AC_TYPE_MODE_T +AC_TYPE_UID_T +AC_TYPE_UINT8_T AC_HEADER_TIME AC_STRUCT_TM AC_C_VOLATILE @@ -57,6 +60,7 @@ $ac_includes_default AC_CHECK_MEMBERS([struct sockaddr.sa_len],,,[$sa_includes]) # Checks for library functions. +AC_FUNC_CHOWN AC_FUNC_FORK AC_PROG_GCC_TRADITIONAL AC_FUNC_MALLOC @@ -66,7 +70,7 @@ AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_VPRINTF AC_FUNC_WAIT3 -AC_CHECK_FUNCS([setsid alarm gethostbyname gethostname gettimeofday memset regcomp select socket strcasecmp strchr strerror strerror_r strndup strnlen strrchr strstr strtol strtoul uname ttyname_r]) +AC_CHECK_FUNCS([alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setid socket strcasecmp strchr strdup strerror strerror_r strndup strnlen strrchr strstr strtol strtoul uname ttyname_r]) # Large file support @@ -83,40 +87,6 @@ if test "$enable_largefile" = "no"; then AC_DEFINE(NOLARGEFILE, 1, [Defined when large file support is disabled.]) fi -# SQL support -AC_ARG_ENABLE(mysql, - [AS_HELP_STRING([--enable-mysql],[Enable MySql database support @<:@default=no@:>@])], - [case "${enableval}" in - yes) enable_mysql="yes" ;; - no) enable_mysql="no" ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-mysql) ;; - esac], - [enable_mysql=yes] -) -AS_IF([test "x$enable_mysql" != "xno"], - [AC_CHECK_HEADERS( - [mysql/mysql.h], - [ -#TODO: re-enable -# AC_CHECK_LIB( -# [mysqlclient], -# [mysql_init], -# [ - AC_DEFINE([WITH_DB], [1], [MySql database support enabled]) - mysql_includes=`mysql_config --cflags` - mysql_libs=`mysql_config --libs` -# ], -# [AC_MSG_FAILURE([MySQL is missing])], -# [-lmysqlclient] -# ) - ], - [AC_MSG_FAILURE([MySQL is missing])] - )] -) -AM_CONDITIONAL(enable_mysql, test x$enable_mysql = xyes) -AC_SUBST(mysql_includes) -AC_SUBST(mysql_libs) - # Regular expressions AC_ARG_ENABLE(regexp, [AS_HELP_STRING([--enable-regexp],[Enable regular expressions support @<:@default=yes@:>@])], @@ -274,7 +244,6 @@ echo "Multithreading support enabled: $enable_pthreads" echo "Klogd functionality enabled: $enable_klogd" echo "Regular expressions support enabled: $enable_regexp" echo "Zlib compression support enabled: $enable_zlib" -echo "MySql support enabled: $enable_mysql" echo "Large file support enabled: $enable_largefile" echo "Networking support enabled: $enable_inet" echo "Debug mode enabled: $enable_debug" -- cgit