diff options
author | laforge <laforge> | 2000-11-20 19:36:25 +0000 |
---|---|---|
committer | laforge <laforge> | 2000-11-20 19:36:25 +0000 |
commit | 96ca143575807314342bf50528bf8f5acb8dd0ef (patch) | |
tree | 9e5fd376e56c924f1bc9d19e636accc91634b3b9 | |
parent | 7181f929279bea55c8554a86b5cdec9d0c09a7cc (diff) |
mysql autoconf detection
-rw-r--r-- | Makefile.in | 10 | ||||
-rw-r--r-- | Rules.make.in | 13 | ||||
-rw-r--r-- | aclocal.m4 | 130 | ||||
-rw-r--r-- | conffile/Makefile.in | 2 | ||||
-rwxr-xr-x | configure | 219 | ||||
-rw-r--r-- | configure.in | 78 | ||||
-rw-r--r-- | doc/Makefile.in | 2 | ||||
-rw-r--r-- | extensions/Makefile.in | 8 | ||||
-rw-r--r-- | libipulog.old/Makefile.in | 2 | ||||
-rw-r--r-- | libipulog/Makefile.in | 2 | ||||
-rw-r--r-- | mysql/Makefile.in | 26 | ||||
-rw-r--r-- | mysql/ulogd_MYSQL.c (renamed from extensions/ulogd_MYSQL.c) | 4 |
12 files changed, 419 insertions, 77 deletions
diff --git a/Makefile.in b/Makefile.in index 54a8416..05570e7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -5,9 +5,10 @@ CFLAGS+=-I@top_srcdir@/libipulog/include -I@top_srcdir@/conffile SUBDIRS=conffile libipulog extensions doc -prefix=@prefix@ -exec_prefix=@exec_prefix@ -sysconfdir=@sysconfdir@ +ifeq (x@MYSQLINCLUDES@,x) +else +SUBDIRS+=mysql +endif # Normally You should not need to change anything below @@ -29,8 +30,7 @@ distclean: clean rm -f Makefile config.cache config.log config.status Rules.make install: all - @INSTALL@ -m 755 -d @libdir@/ulogd - @INSTALL@ -m 644 extensions/*.so @libdir@/ulogd + @for d in $(SUBDIRS); do if ! make -C $$d $@; then exit 1; fi; done @INSTALL@ -m 755 ulogd @sbindir@/ulogd @INSTALL@ -m 600 ulogd.conf @sysconfdir@/ulogd.conf diff --git a/Rules.make.in b/Rules.make.in index 6c40d98..ac8e0c9 100644 --- a/Rules.make.in +++ b/Rules.make.in @@ -1,5 +1,11 @@ # +prefix=@prefix@ +exec_prefix=@exec_prefix@ +sysconfdir=@sysconfdir@ + +ULOGD_LIB_PATH=@libdir@/ulogd + CC=@CC@ CFLAGS=@CFLAGS@ @CPPFLAGS@ CFLAGS+=$(INCIPULOG) $(INCCONFFILE) @@ -19,6 +25,7 @@ LIBIPULOG=@top_srcdir@/libipulog ULOGD_SL:=BASE OPRINT PWSNIFF LOGEMU # mysql output support -ULOGD_SL+=MYSQL -MYSQL_CFLAGS= -MYSQL_LDFLAGS=-L/usr/lib/mysql -lmysqlclient +#ULOGD_SL+=MYSQL +MYSQL_CFLAGS=-I@MYSQLINCLUDES@ +MYSQL_LDFLAGS=@DATABASE_LIB_DIR@ @DATABASE_LIB@ + diff --git a/aclocal.m4 b/aclocal.m4 new file mode 100644 index 0000000..368464b --- /dev/null +++ b/aclocal.m4 @@ -0,0 +1,130 @@ +dnl aclocal.m4 generated automatically by aclocal 1.4 + +dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. + +dnl aclocal.m4 generated automatically by aclocal 1.4 + +dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. + +# Do all the work for Automake. This macro actually does too much -- +# some checks are only needed if your package does certain things. +# But this isn't really a big deal. + +# serial 1 + +dnl Usage: +dnl AM_INIT_AUTOMAKE(package,version, [no-define]) + +AC_DEFUN(AM_INIT_AUTOMAKE, +[AC_REQUIRE([AC_PROG_INSTALL]) +PACKAGE=[$1] +AC_SUBST(PACKAGE) +VERSION=[$2] +AC_SUBST(VERSION) +dnl test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +fi +ifelse([$3],, +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) +AC_REQUIRE([AM_SANITY_CHECK]) +AC_REQUIRE([AC_ARG_PROGRAM]) +dnl FIXME This is truly gross. +missing_dir=`cd $ac_aux_dir && pwd` +AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) +AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) +AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) +AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) +AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) +AC_REQUIRE([AC_PROG_MAKE_SET])]) + +# +# Check to make sure that the build environment is sane. +# + +AC_DEFUN(AM_SANITY_CHECK, +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftestfile +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` + if test "[$]*" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftestfile` + fi + if test "[$]*" != "X $srcdir/configure conftestfile" \ + && test "[$]*" != "X conftestfile $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "[$]2" = conftestfile + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +rm -f conftest* +AC_MSG_RESULT(yes)]) + +dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) +dnl The program must properly implement --version. +AC_DEFUN(AM_MISSING_PROG, +[AC_MSG_CHECKING(for working $2) +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +# Redirect stdin to placate older versions of autoconf. Sigh. +if ($2 --version) < /dev/null > /dev/null 2>&1; then + $1=$2 + AC_MSG_RESULT(found) +else + $1="$3/missing $2" + AC_MSG_RESULT(missing) +fi +AC_SUBST($1)]) + + +# Define a conditional. + +AC_DEFUN(AM_CONDITIONAL, +[AC_SUBST($1_TRUE) +AC_SUBST($1_FALSE) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi]) + diff --git a/conffile/Makefile.in b/conffile/Makefile.in index b91723e..746a46b 100644 --- a/conffile/Makefile.in +++ b/conffile/Makefile.in @@ -14,3 +14,5 @@ clean: distclean: rm -f Makefile + +install: all @@ -11,6 +11,8 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help +--with-mysql=<directory> use mysql backend in <directoty>" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -523,7 +525,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:527: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:529: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -552,7 +554,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:556: checking for $ac_word" >&5 +echo "configure:558: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -582,7 +584,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:586: checking for $ac_word" >&5 +echo "configure:588: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -633,7 +635,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:637: checking for $ac_word" >&5 +echo "configure:639: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -665,7 +667,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:669: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:671: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -676,12 +678,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 680 "configure" +#line 682 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -707,12 +709,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:711: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:713: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:716: checking whether we are using GNU C" >&5 +echo "configure:718: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -721,7 +723,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -740,7 +742,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:744: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:746: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -802,7 +804,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:806: checking for a BSD compatible install" >&5 +echo "configure:808: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -856,7 +858,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:860: checking for dlopen in -ldl" >&5 +echo "configure:862: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -864,7 +866,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 868 "configure" +#line 870 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -875,7 +877,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -908,12 +910,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:912: checking for $ac_hdr that defines DIR" >&5 +echo "configure:914: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 917 "configure" +#line 919 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -921,7 +923,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -946,7 +948,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:950: checking for opendir in -ldir" >&5 +echo "configure:952: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -954,7 +956,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 958 "configure" +#line 960 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -965,7 +967,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -987,7 +989,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:991: checking for opendir in -lx" >&5 +echo "configure:993: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -995,7 +997,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 999 "configure" +#line 1001 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1006,7 +1008,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:1010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1029,7 +1031,7 @@ fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1033: checking how to run the C preprocessor" >&5 +echo "configure:1035: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1044,13 +1046,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1048 "configure" +#line 1050 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1061,13 +1063,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1065 "configure" +#line 1067 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1078,13 +1080,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1082 "configure" +#line 1084 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1109,12 +1111,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1113: checking for ANSI C header files" >&5 +echo "configure:1115: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1118 "configure" +#line 1120 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1122,7 +1124,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1139,7 +1141,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1143 "configure" +#line 1145 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1157,7 +1159,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1161 "configure" +#line 1163 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1178,7 +1180,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1182 "configure" +#line 1184 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1189,7 +1191,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1216,17 +1218,17 @@ for ac_hdr in fcntl.h unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1220: checking for $ac_hdr" >&5 +echo "configure:1222: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1225 "configure" +#line 1227 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1254,12 +1256,12 @@ done echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1258: checking for working const" >&5 +echo "configure:1260: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1263 "configure" +#line 1265 "configure" #include "confdefs.h" int main() { @@ -1308,7 +1310,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:1312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1329,12 +1331,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1333: checking for size_t" >&5 +echo "configure:1335: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1338 "configure" +#line 1340 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1362,12 +1364,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:1366: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:1368: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1371 "configure" +#line 1373 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -1375,7 +1377,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:1379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -1397,12 +1399,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:1401: checking for vprintf" >&5 +echo "configure:1403: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1406 "configure" +#line 1408 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vprintf(); below. */ @@ -1425,7 +1427,7 @@ vprintf(); ; return 0; } EOF -if { (eval echo configure:1429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -1449,12 +1451,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:1453: checking for _doprnt" >&5 +echo "configure:1455: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1458 "configure" +#line 1460 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char _doprnt(); below. */ @@ -1477,7 +1479,7 @@ _doprnt(); ; return 0; } EOF -if { (eval echo configure:1481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -1504,12 +1506,12 @@ fi for ac_func in socket strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1508: checking for $ac_func" >&5 +echo "configure:1510: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1513 "configure" +#line 1515 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1532,7 +1534,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1557,6 +1559,95 @@ fi done +DATABASE_DIR="" +DATABASE_LIB="" +DATABASE_LIB_DIR="" + +DATABASE_DRIVERS="" + +# Check whether --with-mysql or --without-mysql was given. +if test "${with_mysql+set}" = set; then + withval="$with_mysql" + +if test $withval != yes +then + dir=$withval +else + dir="/usr/local" +fi +mysqldir="" +echo $ac_n "checking for MySQL files""... $ac_c" 1>&6 +echo "configure:1581: checking for MySQL files" >&5 +for d in $dir /usr /usr/local /usr/local/mysql /opt/mysql /opt/packages/mysql +do + if test -f $d/lib/mysql/libmysqlclient.a + then + echo "$ac_t""found mysql in $d" 1>&6 + mysqldir=$d + mysqldir_suffix=/mysql + break + fi + if test -f $d/lib/libmysqlclient.a + then + echo "$ac_t""found mysql in $d" 1>&6 + mysqldir=$d + mysqldir_suffix= + break + fi +done + +if test x$mysqldir = x +then + echo "configure: warning: MySQL backend not used" 1>&2 +else + cat >> confdefs.h <<\EOF +#define HAVE_MYSQL 1 +EOF + + MYSQLINCLUDES=${mysqldir}/include${mysqldir_suffix} + MYSQLLIBS=${mysqldir}/lib${mysqldir_suffix} + + DATABASE_DIR="${DATABASE_DIR} mysql" + + DATABASE_LIB="${DATABASE_LIB} -lmysqlclient " + DATABASE_LIB_DIR="${DATABASE_LIB_DIR} -L${MYSQLLIBS} " + + DATABASE_DRIVERS="${DATABASE_DRIVERS} ../mysql/mysql_driver.o " + + DB_DEF="${DB_DEF} -DHAVE_MYSQL " + + + + + if test -f $MYSQLLIBS/libmystrings.a + then + DATABASE_LIB="${DATABASE_LIB} -lmystrings " + else + MYSQLEXTRALIBS= + fi +fi + +fi + + + + + + + + + + + +if test x$mysqldir != x; then + HAVE_MYSQL_TRUE= + HAVE_MYSQL_FALSE='#' +else + HAVE_MYSQL_TRUE='#' + HAVE_MYSQL_FALSE= +fi + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1670,7 +1761,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "extensions/Makefile doc/Makefile conffile/Makefile libipulog/Makefile Makefile Rules.make" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "extensions/Makefile doc/Makefile conffile/Makefile libipulog/Makefile mysql/Makefile Makefile Rules.make" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -1708,6 +1799,14 @@ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@CPP@%$CPP%g +s%@MYSQLINCLUDES@%$MYSQLINCLUDES%g +s%@DATABASE_DIR@%$DATABASE_DIR%g +s%@DATABASE_LIB@%$DATABASE_LIB%g +s%@DATABASE_LIB_DIR@%$DATABASE_LIB_DIR%g +s%@DB_DEF@%$DB_DEF%g +s%@DATABASE_DRIVERS@%$DATABASE_DRIVERS%g +s%@HAVE_MYSQL_TRUE@%$HAVE_MYSQL_TRUE%g +s%@HAVE_MYSQL_FALSE@%$HAVE_MYSQL_FALSE%g CEOF EOF @@ -1749,7 +1848,7 @@ EOF cat >> $CONFIG_STATUS <<EOF -CONFIG_FILES=\${CONFIG_FILES-"extensions/Makefile doc/Makefile conffile/Makefile libipulog/Makefile Makefile Rules.make"} +CONFIG_FILES=\${CONFIG_FILES-"extensions/Makefile doc/Makefile conffile/Makefile libipulog/Makefile mysql/Makefile Makefile Rules.make"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/configure.in b/configure.in index e37c4b9..da22cd8 100644 --- a/configure.in +++ b/configure.in @@ -23,4 +23,80 @@ dnl Checks for library functions. AC_FUNC_VPRINTF AC_CHECK_FUNCS(socket strerror) -AC_OUTPUT(extensions/Makefile doc/Makefile conffile/Makefile libipulog/Makefile Makefile Rules.make) +DATABASE_DIR="" +DATABASE_LIB="" +DATABASE_LIB_DIR="" + +DATABASE_DRIVERS="" + +dnl +dnl test for MySQL +dnl +AC_ARG_WITH(mysql, + --with-mysql=<directory> use mysql backend in <directoty>,[ +if test $withval != yes +then + dir=$withval +else + dir="/usr/local" +fi +mysqldir="" +AC_MSG_CHECKING(for MySQL files) +for d in $dir /usr /usr/local /usr/local/mysql /opt/mysql /opt/packages/mysql +do + if test -f $d/lib/mysql/libmysqlclient.a + then + AC_MSG_RESULT(found mysql in $d) + mysqldir=$d + mysqldir_suffix=/mysql + break + fi + if test -f $d/lib/libmysqlclient.a + then + AC_MSG_RESULT(found mysql in $d) + mysqldir=$d + mysqldir_suffix= + break + fi +done + +if test x$mysqldir = x +then + AC_MSG_WARN(MySQL backend not used) +else + AC_DEFINE(HAVE_MYSQL) + MYSQLINCLUDES=${mysqldir}/include${mysqldir_suffix} + MYSQLLIBS=${mysqldir}/lib${mysqldir_suffix} + + DATABASE_DIR="${DATABASE_DIR} mysql" + + DATABASE_LIB="${DATABASE_LIB} -lmysqlclient " + DATABASE_LIB_DIR="${DATABASE_LIB_DIR} -L${MYSQLLIBS} " + + DATABASE_DRIVERS="${DATABASE_DRIVERS} ../mysql/mysql_driver.o " + + DB_DEF="${DB_DEF} -DHAVE_MYSQL " + + + AC_SUBST(MYSQLINCLUDES) + + if test -f $MYSQLLIBS/libmystrings.a + then + DATABASE_LIB="${DATABASE_LIB} -lmystrings " + else + MYSQLEXTRALIBS= + fi +fi +]) + +AC_SUBST(DATABASE_DIR) +AC_SUBST(DATABASE_LIB) +AC_SUBST(DATABASE_LIB_DIR) +AC_SUBST(DB_DEF) + +AC_SUBST(DATABASE_DRIVERS) + +AM_CONDITIONAL(HAVE_MYSQL, test x$mysqldir != x) + + +AC_OUTPUT(extensions/Makefile doc/Makefile conffile/Makefile libipulog/Makefile mysql/Makefile Makefile Rules.make) diff --git a/doc/Makefile.in b/doc/Makefile.in index 2c8fbca..fd7b711 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -44,3 +44,5 @@ clean: distclean: rm -f Makefile + +install: diff --git a/extensions/Makefile.in b/extensions/Makefile.in index bb185b1..5fe385a 100644 --- a/extensions/Makefile.in +++ b/extensions/Makefile.in @@ -17,12 +17,6 @@ $(SHARED_LIBS): %.so: %_sh.o %_sh.o: %.c $(CC) $(SH_CFLAGS) -o $@ -c $< -ulogd_MYSQL.so: ulogd_MYSQL_sh.o - ld -shared $(MYSQL_LDFLAGS) -o $@ $< - -ulogd_MYSQL_sh.o: ulogd_MYSQL.c - $(CC) $(MYSQL_CFLAGS) $(SH_CFLAGS) -o $@ -c $< - clean: rm -f $(SHARED_LIBS) *.o @@ -30,3 +24,5 @@ distclean: rm -f Makefile install: all + @INSTALL@ -m 755 -d $(ULOGD_LIB_PATH) + @INSTALL@ -m 644 *.so $(ULOGD_LIB_PATH) diff --git a/libipulog.old/Makefile.in b/libipulog.old/Makefile.in index a3b16cb..4686b20 100644 --- a/libipulog.old/Makefile.in +++ b/libipulog.old/Makefile.in @@ -17,3 +17,5 @@ clean: distclean: clean rm Makefile + +install: libipulog.a diff --git a/libipulog/Makefile.in b/libipulog/Makefile.in index a3b16cb..4686b20 100644 --- a/libipulog/Makefile.in +++ b/libipulog/Makefile.in @@ -17,3 +17,5 @@ clean: distclean: clean rm Makefile + +install: libipulog.a diff --git a/mysql/Makefile.in b/mysql/Makefile.in new file mode 100644 index 0000000..be8c98a --- /dev/null +++ b/mysql/Makefile.in @@ -0,0 +1,26 @@ +# + +# Normally You should not need to change anything below +# +include @top_srcdir@/Rules.make + +CFLAGS+=-I@top_srcdir@ -I@top_srcdir@/libipulog/include -I@top_srcdir@/conffile +SH_CFLAGS:=$(CFLAGS) -fPIC + +SHARED_LIBS=ulogd_MYSQL.so + +all: $(SHARED_LIBS) + +$(SHARED_LIBS): %.so: %_sh.o + ld -shared $(MYSQL_LDFLAGS) -o $@ $< + +%_sh.o: %.c + $(CC) $(MYSQL_CFLAGS) $(SH_CFLAGS) -o $@ -c $< + +clean: + rm -f $(SHARED_LIBS) *.o + +distclean: + rm -f Makefile + +install: all diff --git a/extensions/ulogd_MYSQL.c b/mysql/ulogd_MYSQL.c index 3777e26..24c1c46 100644 --- a/extensions/ulogd_MYSQL.c +++ b/mysql/ulogd_MYSQL.c @@ -1,11 +1,11 @@ -/* ulogd_MYSQL.c, Version $Revision$ +/* ulogd_MYSQL.c, Version $Revision: 1.1 $ * * ulogd output plugin for logging to a MySQL database * * (C) 2000 by Harald Welte <laforge@gnumonks.org> * This software is distributed under the terms of GNU GPL * - * $Id$ + * $Id: ulogd_MYSQL.c,v 1.1 2000/11/20 11:43:22 laforge Exp $ * **/ |