From 1c133d93514914c2592d94d385d3b71f7667e5eb Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 11 Jul 2007 12:17:31 +0000 Subject: remove file, its autotools output file and does not belong in CVS --- config.h | 275 ----------------------------------------------------------- config.h.in | 2 +- configure | 34 ++++++-- configure.ac | 20 ++++- 4 files changed, 43 insertions(+), 288 deletions(-) delete mode 100644 config.h diff --git a/config.h b/config.h deleted file mode 100644 index 9634b76c..00000000 --- a/config.h +++ /dev/null @@ -1,275 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* klogd functionality is integrated. */ -#define FEATURE_KLOGD 1 - -/* Regular expressions support enabled. */ -#define FEATURE_REGEXP 1 - -/* Define to 1 if you have the `alarm' function. */ -#define HAVE_ALARM 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_ARPA_INET_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_ARPA_NAMESER_H 1 - -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -/* #undef HAVE_DOPRNT */ - -/* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define to 1 if you have the `fork' function. */ -#define HAVE_FORK 1 - -/* Define to 1 if you have the `gethostbyname' function. */ -#define HAVE_GETHOSTBYNAME 1 - -/* Define to 1 if you have the `gethostname' function. */ -#define HAVE_GETHOSTNAME 1 - -/* Define to 1 if you have the `gettimeofday' function. */ -#define HAVE_GETTIMEOFDAY 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LOCALE_H 1 - -/* Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. */ -#define HAVE_MALLOC 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `memset' function. */ -#define HAVE_MEMSET 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_NETDB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_NETINET_IN_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_PATHS_H 1 - -/* Define to 1 if your system has a GNU libc compatible `realloc' function, - and to 0 otherwise. */ -#define HAVE_REALLOC 1 - -/* Define to 1 if you have the `regcomp' function. */ -#define HAVE_REGCOMP 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_RESOLV_H 1 - -/* Define to 1 if you have the `select' function. */ -#define HAVE_SELECT 1 - -/* Define to 1 if you have the `setsid' function. */ -#define HAVE_SETSID 1 - -/* Define to 1 if you have the `socket' function. */ -#define HAVE_SOCKET 1 - -/* Define to 1 if `stat' has the bug that it succeeds when given the - zero-length file name argument. */ -/* #undef HAVE_STAT_EMPTY_STRING_BUG */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDIO_EXT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strcasecmp' function. */ -#define HAVE_STRCASECMP 1 - -/* Define to 1 if you have the `strchr' function. */ -#define HAVE_STRCHR 1 - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strndup' function. */ -#define HAVE_STRNDUP 1 - -/* Define to 1 if you have the `strrchr' function. */ -#define HAVE_STRRCHR 1 - -/* Define to 1 if you have the `strstr' function. */ -#define HAVE_STRSTR 1 - -/* Define to 1 if you have the `strtol' function. */ -#define HAVE_STRTOL 1 - -/* Define to 1 if you have the `strtoul' function. */ -#define HAVE_STRTOUL 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYSLOG_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_FILE_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_IOCTL_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_SELECT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_SOCKET_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have that is POSIX.1 compatible. */ -#define HAVE_SYS_WAIT_H 1 - -/* Define to 1 if you have the `uname' function. */ -#define HAVE_UNAME 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UTMP_H 1 - -/* Define to 1 if you have the `vfork' function. */ -#define HAVE_VFORK 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_VFORK_H */ - -/* Define to 1 if you have the `vprintf' function. */ -#define HAVE_VPRINTF 1 - -/* Define to 1 if you have the `wait3' system call. Deprecated, you should no - longer depend upon `wait3'. */ -#define HAVE_WAIT3 1 - -/* Define to 1 if `fork' works. */ -#define HAVE_WORKING_FORK 1 - -/* Define to 1 if `vfork' works. */ -#define HAVE_WORKING_VFORK 1 - -/* Define to 1 if `lstat' dereferences a symlink specified with a trailing - slash. */ -#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 - -/* Defined if debug mode is disabled. */ -#define NDEBUG 1 - -/* Defined when large file support is disabled. */ -/* #undef NOLARGEFILE */ - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -/* #undef NO_MINUS_C_MINUS_O */ - -/* Name of package */ -#define PACKAGE "rsyslog" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "rsyslog@lists.adiscon.com." - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "rsyslog" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "rsyslog 1.16.0" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "rsyslog" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "1.16.0" - -/* Define as the return type of signal handlers (`int' or `void'). */ -#define RETSIGTYPE void - -/* Define to the type of arg 1 for `select'. */ -#define SELECT_TYPE_ARG1 int - -/* Define to the type of args 2, 3 and 4 for `select'. */ -#define SELECT_TYPE_ARG234 (fd_set *) - -/* Define to the type of arg 5 for `select'. */ -#define SELECT_TYPE_ARG5 (struct timeval *) - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Why there is this macro */ -#define SYSLOG_INET 1 - -/* Define to 1 if you can safely include both and . */ -#define TIME_WITH_SYS_TIME 1 - -/* Define to 1 if your declares `struct tm'. */ -/* #undef TM_IN_SYS_TIME */ - -/* Define if you want to enable zlib support */ -#define USE_NETZIP 1 - -/* Multithreading support enabled. */ -#define USE_PTHREADS 1 - -/* Version number of package */ -#define VERSION "1.16.0" - -/* MySql database support enabled */ -/* #undef WITH_DB */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to rpl_malloc if the replacement function should be used. */ -/* #undef malloc */ - -/* Define to `long int' if does not define. */ -/* #undef off_t */ - -/* Define to `int' if does not define. */ -/* #undef pid_t */ - -/* Define to rpl_realloc if the replacement function should be used. */ -/* #undef realloc */ - -/* Define to `unsigned int' if does not define. */ -/* #undef size_t */ - -/* Define to `int' if does not define. */ -/* #undef ssize_t */ - -/* Define as `fork' if `vfork' does not work. */ -/* #undef vfork */ - -/* Define to empty if the keyword `volatile' does not work. Warning: valid - code using `volatile' can become incorrect without. Disable with care. */ -/* #undef volatile */ diff --git a/config.h.in b/config.h.in index 944c7fae..9ae34957 100644 --- a/config.h.in +++ b/config.h.in @@ -224,7 +224,7 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Why there is this macro */ +/* network support is integrated. */ #undef SYSLOG_INET /* Define to 1 if you can safely include both and . */ diff --git a/configure b/configure index 9c574093..7a9287c5 100755 --- a/configure +++ b/configure @@ -1295,6 +1295,7 @@ Optional Features: --enable-zlib Enable zlib compression support [default=yes] --enable-pthreads Enable multithreading via pthreads [default=yes] --enable-klogd Integrated klogd functionality [default=yes] + --enable-inet Enable networking support [default=yes] --enable-debug Enable debug mode [default=no] Some influential environment variables: @@ -6785,14 +6786,6 @@ done -# Ugly stuff - -cat >>confdefs.h <<\_ACEOF -#define SYSLOG_INET 1 -_ACEOF - - - # Large file support # Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then @@ -7193,6 +7186,30 @@ _ACEOF fi +# inet +# Check whether --enable-inet was given. +if test "${enable_inet+set}" = set; then + enableval=$enable_inet; case "${enableval}" in + yes) enable_inet="yes" ;; + no) enable_inet="no" ;; + *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-inet" >&5 +echo "$as_me: error: bad value ${enableval} for --enable-inet" >&2;} + { (exit 1); exit 1; }; } ;; + esac +else + enable_inet="yes" + +fi + +if test "$enable_inet" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define SYSLOG_INET 1 +_ACEOF + +fi + + # debug # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then @@ -8564,5 +8581,6 @@ 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" diff --git a/configure.ac b/configure.ac index 49943f31..881776c5 100644 --- a/configure.ac +++ b/configure.ac @@ -42,10 +42,6 @@ AC_FUNC_WAIT3 AC_CHECK_FUNCS([setsid alarm gethostbyname gethostname gettimeofday memset regcomp select socket strcasecmp strchr strerror strndup strrchr strstr strtol strtoul uname]) -# Ugly stuff -AC_DEFINE(SYSLOG_INET, 1, [Why there is this macro]) - - # Large file support AC_ARG_ENABLE(largefile, [AC_HELP_STRING([--enable-largefile],[Enable large file support @<:@default=yes@:>@])], @@ -148,6 +144,21 @@ if test "$enable_klogd" = "yes"; then AC_DEFINE(FEATURE_KLOGD, 1, [klogd functionality is integrated.]) fi +# inet +AC_ARG_ENABLE(inet, + [AC_HELP_STRING([--enable-inet],[Enable networking support @<:@default=yes@:>@])], + [case "${enableval}" in + yes) enable_inet="yes" ;; + no) enable_inet="no" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-inet) ;; + esac], + [enable_inet="yes"] +) +if test "$enable_inet" = "yes"; then + AC_DEFINE(SYSLOG_INET, 1, [network support is integrated.]) +fi + + # debug AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug],[Enable debug mode @<:@default=no@:>@])], @@ -174,5 +185,6 @@ 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