From e28a9c25c143635ffe8a1f9cee1d377a69a4f923 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 16 Dec 2008 22:35:25 +0100 Subject: Module koennen per configure (de)aktiviert werden --- Makefile.in | 1 + config.h.in | 12 ++ configure | 359 ++++++++++++++++++++++++++++++--- configure.ac | 28 +++ libltdl/Makefile.in | 1 + m4/ax_lib_mysql.m4 | 6 +- src/Client/Makefile.in | 1 + src/Client/Requests/Makefile.in | 1 + src/Common/Backends/Makefile.in | 1 + src/Common/Makefile.in | 1 + src/Common/RequestHandlers/Makefile.in | 1 + src/Common/Requests/Makefile.in | 1 + src/Core/Backends/Makefile.in | 1 + src/Core/Makefile.in | 1 + src/Core/RequestHandlers/Makefile.in | 1 + src/Core/Requests/Makefile.in | 1 + src/Daemon/Backends/Makefile.in | 1 + src/Daemon/Makefile.in | 1 + src/Daemon/RequestHandlers/Makefile.in | 1 + src/Daemon/Requests/Makefile.in | 1 + src/Makefile.am | 21 +- src/Makefile.in | 12 +- src/Net/Makefile.in | 1 + src/Net/Packets/Makefile.in | 1 + src/modules/Makefile.am | 25 ++- src/modules/Makefile.in | 62 ++++-- 26 files changed, 486 insertions(+), 57 deletions(-) diff --git a/Makefile.in b/Makefile.in index cac5cb8..bdd2c33 100644 --- a/Makefile.in +++ b/Makefile.in @@ -184,6 +184,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/config.h.in b/config.h.in index a642aba..a1f354c 100644 --- a/config.h.in +++ b/config.h.in @@ -108,6 +108,9 @@ /* Define to 1 if you have the `opendir' function. */ #undef HAVE_OPENDIR +/* Define to 1 if you have the `posix_spawnp' function. */ +#undef HAVE_POSIX_SPAWNP + /* Define if libtool can extract symbol lists from object files. */ #undef HAVE_PRELOADED_SYMBOLS @@ -198,6 +201,15 @@ /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL +/* Define to 1 if you have the file `AC_File'. */ +#undef HAVE__PROC_LOADAVG + +/* Define to 1 if you have the file `AC_File'. */ +#undef HAVE__PROC_MEMINFO + +/* Define to 1 if you have the file `AC_File'. */ +#undef HAVE__PROC_UPTIME + /* Define if the OS needs help to load dependent libraries for dlopen(). */ #undef LTDL_DLOPEN_DEPLIBS diff --git a/configure b/configure index 261dd35..0be12ef 100755 --- a/configure +++ b/configure @@ -852,6 +852,7 @@ am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S +have_df LIBTOOL build build_cpu @@ -910,6 +911,12 @@ MYSQL_LDFLAGS GSSAPI_LIBS READLINE_LIBS LIBOBJS +SYSTEMBACKEND_POSIX_TRUE +SYSTEMBACKEND_POSIX_FALSE +SYSTEMBACKEND_PROC_TRUE +SYSTEMBACKEND_PROC_FALSE +USERBACKEND_MYSQL_TRUE +USERBACKEND_MYSQL_FALSE LTLIBOBJS ltdl_LIBOBJS ltdl_LTLIBOBJS' @@ -1533,6 +1540,12 @@ Optional Packages: --with-ltdl-lib=DIR use the libltdl.la installed in DIR --with-mysql=[ARG] use MySQL client library [default=yes], optionally specify path to mysql_config + --with-systembackend-posix + enable POSIX system backend [default=yes] + --with-systembackend-proc + enable /proc system backend + --with-userbackend-mysql + enable MySQL user backend [default=yes] Some influential environment variables: CXX C++ compiler command @@ -4407,6 +4420,44 @@ echo "${ECHO_T}no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi +# Extract the first word of "df", so it can be a program name with args. +set dummy df; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_have_df+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$have_df"; then + ac_cv_prog_have_df="$have_df" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_have_df="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_have_df" && ac_cv_prog_have_df="no" +fi +fi +have_df=$ac_cv_prog_have_df +if test -n "$have_df"; then + { echo "$as_me:$LINENO: result: $have_df" >&5 +echo "${ECHO_T}$have_df" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + ORIG_LIBS=$LIBS @@ -5179,13 +5230,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5182: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5233: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5185: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5236: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5188: output\"" >&5) + (eval echo "\"\$as_me:5239: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6285,7 +6336,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6288 "configure"' > conftest.$ac_ext + echo '#line 6339 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8610,11 +8661,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8613: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8664: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8617: \$? = $ac_status" >&5 + echo "$as_me:8668: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8934,11 +8985,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8937: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8988: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8941: \$? = $ac_status" >&5 + echo "$as_me:8992: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9039,11 +9090,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9042: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9093: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9046: \$? = $ac_status" >&5 + echo "$as_me:9097: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9094,11 +9145,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9097: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9148: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9101: \$? = $ac_status" >&5 + echo "$as_me:9152: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11855,7 +11906,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11858 "configure" +#line 11909 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11955,7 +12006,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11958 "configure" +#line 12009 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13958,11 +14009,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13961: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14012: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13965: \$? = $ac_status" >&5 + echo "$as_me:14016: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14057,11 +14108,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14060: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14111: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14064: \$? = $ac_status" >&5 + echo "$as_me:14115: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14109,11 +14160,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14112: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14163: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14116: \$? = $ac_status" >&5 + echo "$as_me:14167: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15992,7 +16043,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 15995 "configure" +#line 16046 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17510,10 +17561,10 @@ fi fi - if test "$MYSQL_CONFIG" != "no"; then - { echo "$as_me:$LINENO: checking for MySQL libraries" >&5 + { echo "$as_me:$LINENO: checking for MySQL libraries" >&5 echo $ECHO_N "checking for MySQL libraries... $ECHO_C" >&6; } + if test "$MYSQL_CONFIG" != "no"; then MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`" MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`" @@ -20020,6 +20071,236 @@ fi done +with_systembackend_proc=no + +{ echo "$as_me:$LINENO: checking for /proc/uptime" >&5 +echo $ECHO_N "checking for /proc/uptime... $ECHO_C" >&6; } +if test "${ac_cv_file__proc_uptime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "/proc/uptime"; then + ac_cv_file__proc_uptime=yes +else + ac_cv_file__proc_uptime=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__proc_uptime" >&5 +echo "${ECHO_T}$ac_cv_file__proc_uptime" >&6; } +if test $ac_cv_file__proc_uptime = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE__PROC_UPTIME 1 +_ACEOF + +with_systembackend_proc=yes +fi +{ echo "$as_me:$LINENO: checking for /proc/meminfo" >&5 +echo $ECHO_N "checking for /proc/meminfo... $ECHO_C" >&6; } +if test "${ac_cv_file__proc_meminfo+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "/proc/meminfo"; then + ac_cv_file__proc_meminfo=yes +else + ac_cv_file__proc_meminfo=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__proc_meminfo" >&5 +echo "${ECHO_T}$ac_cv_file__proc_meminfo" >&6; } +if test $ac_cv_file__proc_meminfo = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE__PROC_MEMINFO 1 +_ACEOF + +with_systembackend_proc=yes +fi +{ echo "$as_me:$LINENO: checking for /proc/loadavg" >&5 +echo $ECHO_N "checking for /proc/loadavg... $ECHO_C" >&6; } +if test "${ac_cv_file__proc_loadavg+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "/proc/loadavg"; then + ac_cv_file__proc_loadavg=yes +else + ac_cv_file__proc_loadavg=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__proc_loadavg" >&5 +echo "${ECHO_T}$ac_cv_file__proc_loadavg" >&6; } +if test $ac_cv_file__proc_loadavg = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE__PROC_LOADAVG 1 +_ACEOF + +with_systembackend_proc=yes +fi + + + +# Check whether --with-systembackend_posix was given. +if test "${with_systembackend_posix+set}" = set; then + withval=$with_systembackend_posix; +fi + + +# Check whether --with-systembackend_proc was given. +if test "${with_systembackend_proc+set}" = set; then + withval=$with_systembackend_proc; +fi + + +# Check whether --with-userbackend_mysql was given. +if test "${with_userbackend_mysql+set}" = set; then + withval=$with_userbackend_mysql; +fi + + + +for ac_func in posix_spawnp +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +else + with_systembackend_posix=no +fi +done + +if test x"$have_df" = xno; then + with_systembackend_posix=no +fi + +if test x"$found_mysql" = xno; then + with_userbackend_mysql=no +fi + + + + if test x"$with_systembackend_posix" != xno; then + SYSTEMBACKEND_POSIX_TRUE= + SYSTEMBACKEND_POSIX_FALSE='#' +else + SYSTEMBACKEND_POSIX_TRUE='#' + SYSTEMBACKEND_POSIX_FALSE= +fi + + if test x"$with_systembackend_proc" != xno; then + SYSTEMBACKEND_PROC_TRUE= + SYSTEMBACKEND_PROC_FALSE='#' +else + SYSTEMBACKEND_PROC_TRUE='#' + SYSTEMBACKEND_PROC_FALSE= +fi + + if test x"$with_userbackend_mysql" != xno; then + USERBACKEND_MYSQL_TRUE= + USERBACKEND_MYSQL_FALSE='#' +else + USERBACKEND_MYSQL_TRUE='#' + USERBACKEND_MYSQL_FALSE= +fi + + + ac_config_files="$ac_config_files Makefile libltdl/Makefile src/Makefile src/Client/Makefile src/Client/Requests/Makefile src/Common/Makefile src/Common/Backends/Makefile src/Common/Requests/Makefile src/Common/RequestHandlers/Makefile src/Core/Makefile src/Core/Backends/Makefile src/Core/Requests/Makefile src/Core/RequestHandlers/Makefile src/Daemon/Makefile src/Daemon/Backends/Makefile src/Daemon/Requests/Makefile src/Daemon/RequestHandlers/Makefile src/Net/Makefile src/Net/Packets/Makefile src/modules/Makefile" @@ -20192,6 +20473,27 @@ echo "$as_me: error: conditional \"INCLUDED_LTDL\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${SYSTEMBACKEND_POSIX_TRUE}" && test -z "${SYSTEMBACKEND_POSIX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"SYSTEMBACKEND_POSIX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"SYSTEMBACKEND_POSIX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${SYSTEMBACKEND_PROC_TRUE}" && test -z "${SYSTEMBACKEND_PROC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"SYSTEMBACKEND_PROC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"SYSTEMBACKEND_PROC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${USERBACKEND_MYSQL_TRUE}" && test -z "${USERBACKEND_MYSQL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"USERBACKEND_MYSQL\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"USERBACKEND_MYSQL\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -21179,6 +21481,7 @@ am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim CPP!$CPP$ac_delim LN_S!$LN_S$ac_delim +have_df!$have_df$ac_delim LIBTOOL!$LIBTOOL$ac_delim build!$build$ac_delim build_cpu!$build_cpu$ac_delim @@ -21189,7 +21492,6 @@ host_cpu!$host_cpu$ac_delim host_vendor!$host_vendor$ac_delim host_os!$host_os$ac_delim SED!$SED$ac_delim -GREP!$GREP$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -21231,6 +21533,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim FGREP!$FGREP$ac_delim LD!$LD$ac_delim @@ -21278,12 +21581,18 @@ MYSQL_LDFLAGS!$MYSQL_LDFLAGS$ac_delim GSSAPI_LIBS!$GSSAPI_LIBS$ac_delim READLINE_LIBS!$READLINE_LIBS$ac_delim LIBOBJS!$LIBOBJS$ac_delim +SYSTEMBACKEND_POSIX_TRUE!$SYSTEMBACKEND_POSIX_TRUE$ac_delim +SYSTEMBACKEND_POSIX_FALSE!$SYSTEMBACKEND_POSIX_FALSE$ac_delim +SYSTEMBACKEND_PROC_TRUE!$SYSTEMBACKEND_PROC_TRUE$ac_delim +SYSTEMBACKEND_PROC_FALSE!$SYSTEMBACKEND_PROC_FALSE$ac_delim +USERBACKEND_MYSQL_TRUE!$USERBACKEND_MYSQL_TRUE$ac_delim +USERBACKEND_MYSQL_FALSE!$USERBACKEND_MYSQL_FALSE$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim ltdl_LIBOBJS!$ltdl_LIBOBJS$ac_delim ltdl_LTLIBOBJS!$ltdl_LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index c80e6b8..5c93f41 100644 --- a/configure.ac +++ b/configure.ac @@ -17,6 +17,7 @@ AC_PROG_CPP AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET +AC_CHECK_PROG(have_df, [df], yes, no) ORIG_LIBS=$LIBS @@ -64,6 +65,33 @@ AC_FUNC_REALLOC AC_TYPE_SIGNAL AC_CHECK_FUNCS([dup2 gethostname memmove memset socket strcasecmp strchr strdup strerror strrchr strtol]) +with_systembackend_proc=no + +AC_CHECK_FILES([/proc/uptime /proc/meminfo /proc/loadavg], with_systembackend_proc=yes) + +AC_ARG_WITH([systembackend_posix], [AS_HELP_STRING([--with-systembackend-posix], + [enable POSIX system backend @<:@default=yes@:>@])]) +AC_ARG_WITH([systembackend_proc], [AS_HELP_STRING([--with-systembackend-proc], + [enable /proc system backend])]) +AC_ARG_WITH([userbackend_mysql], [AS_HELP_STRING([--with-userbackend-mysql], + [enable MySQL user backend @<:@default=yes@:>@])]) + +AC_CHECK_FUNCS([posix_spawnp], , [with_systembackend_posix=no]) +if test x"$have_df" = xno; then + with_systembackend_posix=no +fi + +if test x"$found_mysql" = xno; then + with_userbackend_mysql=no +fi + + + +AM_CONDITIONAL(SYSTEMBACKEND_POSIX, test x"$with_systembackend_posix" != xno) +AM_CONDITIONAL(SYSTEMBACKEND_PROC, test x"$with_systembackend_proc" != xno) +AM_CONDITIONAL(USERBACKEND_MYSQL, test x"$with_userbackend_mysql" != xno) + + AC_CONFIG_FILES([ Makefile libltdl/Makefile diff --git a/libltdl/Makefile.in b/libltdl/Makefile.in index a5a1f86..5e99a6a 100644 --- a/libltdl/Makefile.in +++ b/libltdl/Makefile.in @@ -256,6 +256,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/m4/ax_lib_mysql.m4 b/m4/ax_lib_mysql.m4 index a7dce39..a8ca178 100644 --- a/m4/ax_lib_mysql.m4 +++ b/m4/ax_lib_mysql.m4 @@ -77,10 +77,10 @@ AC_DEFUN([AX_LIB_MYSQL], if test -z "$MYSQL_CONFIG" -o test; then AC_PATH_PROG([MYSQL_CONFIG], [mysql_config], [no]) fi - + + AC_MSG_CHECKING([for MySQL libraries]) + if test "$MYSQL_CONFIG" != "no"; then - AC_MSG_CHECKING([for MySQL libraries]) - MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`" MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`" diff --git a/src/Client/Makefile.in b/src/Client/Makefile.in index cf94831..3d3ddda 100644 --- a/src/Client/Makefile.in +++ b/src/Client/Makefile.in @@ -189,6 +189,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/src/Client/Requests/Makefile.in b/src/Client/Requests/Makefile.in index cbea164..bba3c7f 100644 --- a/src/Client/Requests/Makefile.in +++ b/src/Client/Requests/Makefile.in @@ -180,6 +180,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/src/Common/Backends/Makefile.in b/src/Common/Backends/Makefile.in index 0afc996..220394c 100644 --- a/src/Common/Backends/Makefile.in +++ b/src/Common/Backends/Makefile.in @@ -176,6 +176,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/src/Common/Makefile.in b/src/Common/Makefile.in index 6762adb..6f8de60 100644 --- a/src/Common/Makefile.in +++ b/src/Common/Makefile.in @@ -191,6 +191,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/src/Common/RequestHandlers/Makefile.in b/src/Common/RequestHandlers/Makefile.in index df796e8..5b8b578 100644 --- a/src/Common/RequestHandlers/Makefile.in +++ b/src/Common/RequestHandlers/Makefile.in @@ -179,6 +179,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/src/Common/Requests/Makefile.in b/src/Common/Requests/Makefile.in index 29668a1..631bb21 100644 --- a/src/Common/Requests/Makefile.in +++ b/src/Common/Requests/Makefile.in @@ -179,6 +179,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/src/Core/Backends/Makefile.in b/src/Core/Backends/Makefile.in index 2f09fc7..ba6fe71 100644 --- a/src/Core/Backends/Makefile.in +++ b/src/Core/Backends/Makefile.in @@ -174,6 +174,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/src/Core/Makefile.in b/src/Core/Makefile.in index 4a157bc..0718c95 100644 --- a/src/Core/Makefile.in +++ b/src/Core/Makefile.in @@ -189,6 +189,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/src/Core/RequestHandlers/Makefile.in b/src/Core/RequestHandlers/Makefile.in index 97e6ea9..980ffd4 100644 --- a/src/Core/RequestHandlers/Makefile.in +++ b/src/Core/RequestHandlers/Makefile.in @@ -181,6 +181,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/src/Core/Requests/Makefile.in b/src/Core/Requests/Makefile.in index f2d5042..da413f4 100644 --- a/src/Core/Requests/Makefile.in +++ b/src/Core/Requests/Makefile.in @@ -179,6 +179,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/src/Daemon/Backends/Makefile.in b/src/Daemon/Backends/Makefile.in index aa79134..7ab8ef9 100644 --- a/src/Daemon/Backends/Makefile.in +++ b/src/Daemon/Backends/Makefile.in @@ -161,6 +161,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/src/Daemon/Makefile.in b/src/Daemon/Makefile.in index d27c780..7b55449 100644 --- a/src/Daemon/Makefile.in +++ b/src/Daemon/Makefile.in @@ -187,6 +187,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/src/Daemon/RequestHandlers/Makefile.in b/src/Daemon/RequestHandlers/Makefile.in index a8ec16f..0030ecc 100644 --- a/src/Daemon/RequestHandlers/Makefile.in +++ b/src/Daemon/RequestHandlers/Makefile.in @@ -178,6 +178,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/src/Daemon/Requests/Makefile.in b/src/Daemon/Requests/Makefile.in index 977caf4..807904d 100644 --- a/src/Daemon/Requests/Makefile.in +++ b/src/Daemon/Requests/Makefile.in @@ -178,6 +178,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/src/Makefile.am b/src/Makefile.am index a1726dc..6abbbe1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,11 +1,28 @@ SUBDIRS = Common Client Core Daemon Net modules +daemon_modules = +core_modules = + +if SYSTEMBACKEND_POSIX +daemon_modules += -dlpreopen modules/SystemBackendPosix.la +core_modules += -dlpreopen modules/SystemBackendPosix.la +endif + +if SYSTEMBACKEND_PROC +daemon_modules += -dlpreopen modules/SystemBackendProc.la +core_modules += -dlpreopen modules/SystemBackendProc.la +endif + +if USERBACKEND_MYSQL +core_modules += -dlopen modules/UserBackendMysql.la" +endif + bin_PROGRAMS = mad madc mad-core mad_SOURCES = mad.cpp mad_LDADD = Daemon/libdaemon.la Common/libcommon.la Net/libnet.la \ $(sigc_LIBS) $(GnuTLS_LIBS) @LIBLTDL@ -mad_LDFLAGS = -export-dynamic -dlpreopen modules/SystemBackendPosix.la -dlpreopen modules/SystemBackendProc.la +mad_LDFLAGS = -export-dynamic $(daemon_modules) madc_SOURCES = madc.cpp madc_LDADD = Client/libclient.la Common/libcommon.la Net/libnet.la \ @@ -14,4 +31,4 @@ madc_LDADD = Client/libclient.la Common/libcommon.la Net/libnet.la \ mad_core_SOURCES = mad-core.cpp mad_core_LDADD = Core/libcore.la Common/libcommon.la Net/libnet.la \ $(sigc_LIBS) $(GnuTLS_LIBS) $(GSSAPI_LIBS) @LIBLTDL@ -mad_core_LDFLAGS = -export-dynamic -dlpreopen modules/SystemBackendPosix.la -dlpreopen modules/SystemBackendProc.la -dlopen modules/UserBackendMysql.la +mad_core_LDFLAGS = -export-dynamic $(core_modules) diff --git a/src/Makefile.in b/src/Makefile.in index c10ce6a..5b4e33c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -32,6 +32,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@SYSTEMBACKEND_POSIX_TRUE@am__append_1 = -dlpreopen modules/SystemBackendPosix.la +@SYSTEMBACKEND_POSIX_TRUE@am__append_2 = -dlpreopen modules/SystemBackendPosix.la +@SYSTEMBACKEND_PROC_TRUE@am__append_3 = -dlpreopen modules/SystemBackendProc.la +@SYSTEMBACKEND_PROC_TRUE@am__append_4 = -dlpreopen modules/SystemBackendProc.la +@USERBACKEND_MYSQL_TRUE@am__append_5 = -dlopen modules/UserBackendMysql.la" bin_PROGRAMS = mad$(EXEEXT) madc$(EXEEXT) mad-core$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -206,6 +211,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -240,11 +246,13 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = Common Client Core Daemon Net modules +daemon_modules = $(am__append_1) $(am__append_3) +core_modules = $(am__append_2) $(am__append_4) $(am__append_5) mad_SOURCES = mad.cpp mad_LDADD = Daemon/libdaemon.la Common/libcommon.la Net/libnet.la \ $(sigc_LIBS) $(GnuTLS_LIBS) @LIBLTDL@ -mad_LDFLAGS = -export-dynamic -dlpreopen modules/SystemBackendPosix.la -dlpreopen modules/SystemBackendProc.la +mad_LDFLAGS = -export-dynamic $(daemon_modules) madc_SOURCES = madc.cpp madc_LDADD = Client/libclient.la Common/libcommon.la Net/libnet.la \ $(sigc_LIBS) $(GnuTLS_LIBS) $(READLINE_LIBS) @@ -253,7 +261,7 @@ mad_core_SOURCES = mad-core.cpp mad_core_LDADD = Core/libcore.la Common/libcommon.la Net/libnet.la \ $(sigc_LIBS) $(GnuTLS_LIBS) $(GSSAPI_LIBS) @LIBLTDL@ -mad_core_LDFLAGS = -export-dynamic -dlpreopen modules/SystemBackendPosix.la -dlpreopen modules/SystemBackendProc.la -dlopen modules/UserBackendMysql.la +mad_core_LDFLAGS = -export-dynamic $(core_modules) all: all-recursive .SUFFIXES: diff --git a/src/Net/Makefile.in b/src/Net/Makefile.in index af404c3..8247f32 100644 --- a/src/Net/Makefile.in +++ b/src/Net/Makefile.in @@ -189,6 +189,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/src/Net/Packets/Makefile.in b/src/Net/Packets/Makefile.in index 14a649d..b5c92c4 100644 --- a/src/Net/Packets/Makefile.in +++ b/src/Net/Packets/Makefile.in @@ -180,6 +180,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index a40da15..5e12a5d 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am @@ -1,17 +1,34 @@ madlibdir = ${libdir}/mad moddir = ${madlibdir}/modules -mod_LTLIBRARIES = SystemBackendPosix.la SystemBackendProc.la UserBackendMysql.la +default_ldflags = -module -avoid-version -export-dynamic + +EXTRA_LTLIBTRARIES = SystemBackendPosix.la SystemBackendProc.la UserBackendMysql.la + +mod_LTLIBRARIES = +noinst_LTLIBRARIES = + +if SYSTEMBACKEND_POSIX +noinst_LTLIBRARIES += SystemBackendPosix.la +endif + +if SYSTEMBACKEND_PROC +noinst_LTLIBRARIES += SystemBackendProc.la +endif + +if USERBACKEND_MYSQL +mod_LTLIBRARIES += UserBackendMysql.la +endif SystemBackendPosix_la_SOURCES = SystemBackendPosix.cpp SystemBackendPosix_la_LIBADD = $(sigc_LIBS) -SystemBackendPosix_la_LDFLAGS = -module -avoid-version -export-dynamic -static -export-symbols-regex '^SystemBackendPosix_LTX_' +SystemBackendPosix_la_LDFLAGS = $(default_ldflags) -static -export-symbols-regex '^SystemBackendPosix_LTX_' SystemBackendProc_la_SOURCES = SystemBackendProc.cpp -SystemBackendProc_la_LDFLAGS = -module -avoid-version -export-dynamic -static -export-symbols-regex '^SystemBackendProc_LTX_' +SystemBackendProc_la_LDFLAGS = $(default_ldflags) -static -export-symbols-regex '^SystemBackendProc_LTX_' UserBackendMysql_la_SOURCES = UserBackendMysql.cpp UserBackendMysql_la_LIBADD = $(MYSQL_LDFLAGS) -UserBackendMysql_la_LDFLAGS = -module -avoid-version -export-dynamic -export-symbols-regex '^UserBackendMysql_LTX_' +UserBackendMysql_la_LDFLAGS = $(default_ldflags) -export-symbols-regex '^UserBackendMysql_LTX_' noinst_HEADERS = SystemBackendPosix.h SystemBackendProc.h UserBackendMysql.h diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in index 86ab52b..59909ee 100644 --- a/src/modules/Makefile.in +++ b/src/modules/Makefile.in @@ -33,6 +33,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@SYSTEMBACKEND_POSIX_TRUE@am__append_1 = SystemBackendPosix.la +@SYSTEMBACKEND_PROC_TRUE@am__append_2 = SystemBackendProc.la +@USERBACKEND_MYSQL_TRUE@am__append_3 = UserBackendMysql.la subdir = src/modules DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -56,7 +59,7 @@ am__vpath_adj = case $$p in \ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(moddir)" modLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(mod_LTLIBRARIES) +LTLIBRARIES = $(mod_LTLIBRARIES) $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = SystemBackendPosix_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_SystemBackendPosix_la_OBJECTS = SystemBackendPosix.lo @@ -64,18 +67,22 @@ SystemBackendPosix_la_OBJECTS = $(am_SystemBackendPosix_la_OBJECTS) SystemBackendPosix_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(SystemBackendPosix_la_LDFLAGS) $(LDFLAGS) -o $@ +@SYSTEMBACKEND_POSIX_TRUE@am_SystemBackendPosix_la_rpath = SystemBackendProc_la_LIBADD = am_SystemBackendProc_la_OBJECTS = SystemBackendProc.lo SystemBackendProc_la_OBJECTS = $(am_SystemBackendProc_la_OBJECTS) SystemBackendProc_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(SystemBackendProc_la_LDFLAGS) $(LDFLAGS) -o $@ +@SYSTEMBACKEND_PROC_TRUE@am_SystemBackendProc_la_rpath = UserBackendMysql_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_UserBackendMysql_la_OBJECTS = UserBackendMysql.lo UserBackendMysql_la_OBJECTS = $(am_UserBackendMysql_la_OBJECTS) UserBackendMysql_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(UserBackendMysql_la_LDFLAGS) $(LDFLAGS) -o $@ +@USERBACKEND_MYSQL_TRUE@am_UserBackendMysql_la_rpath = -rpath \ +@USERBACKEND_MYSQL_TRUE@ $(moddir) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@ -204,6 +211,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +have_df = @have_df@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -239,15 +247,18 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ madlibdir = ${libdir}/mad moddir = ${madlibdir}/modules -mod_LTLIBRARIES = SystemBackendPosix.la SystemBackendProc.la UserBackendMysql.la +default_ldflags = -module -avoid-version -export-dynamic +EXTRA_LTLIBTRARIES = SystemBackendPosix.la SystemBackendProc.la UserBackendMysql.la +mod_LTLIBRARIES = $(am__append_3) +noinst_LTLIBRARIES = $(am__append_1) $(am__append_2) SystemBackendPosix_la_SOURCES = SystemBackendPosix.cpp SystemBackendPosix_la_LIBADD = $(sigc_LIBS) -SystemBackendPosix_la_LDFLAGS = -module -avoid-version -export-dynamic -static -export-symbols-regex '^SystemBackendPosix_LTX_' +SystemBackendPosix_la_LDFLAGS = $(default_ldflags) -static -export-symbols-regex '^SystemBackendPosix_LTX_' SystemBackendProc_la_SOURCES = SystemBackendProc.cpp -SystemBackendProc_la_LDFLAGS = -module -avoid-version -export-dynamic -static -export-symbols-regex '^SystemBackendProc_LTX_' +SystemBackendProc_la_LDFLAGS = $(default_ldflags) -static -export-symbols-regex '^SystemBackendProc_LTX_' UserBackendMysql_la_SOURCES = UserBackendMysql.cpp UserBackendMysql_la_LIBADD = $(MYSQL_LDFLAGS) -UserBackendMysql_la_LDFLAGS = -module -avoid-version -export-dynamic -export-symbols-regex '^UserBackendMysql_LTX_' +UserBackendMysql_la_LDFLAGS = $(default_ldflags) -export-symbols-regex '^UserBackendMysql_LTX_' noinst_HEADERS = SystemBackendPosix.h SystemBackendProc.h UserBackendMysql.h all: all-am @@ -309,12 +320,21 @@ clean-modLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done SystemBackendPosix.la: $(SystemBackendPosix_la_OBJECTS) $(SystemBackendPosix_la_DEPENDENCIES) - $(SystemBackendPosix_la_LINK) -rpath $(moddir) $(SystemBackendPosix_la_OBJECTS) $(SystemBackendPosix_la_LIBADD) $(LIBS) + $(SystemBackendPosix_la_LINK) $(am_SystemBackendPosix_la_rpath) $(SystemBackendPosix_la_OBJECTS) $(SystemBackendPosix_la_LIBADD) $(LIBS) SystemBackendProc.la: $(SystemBackendProc_la_OBJECTS) $(SystemBackendProc_la_DEPENDENCIES) - $(SystemBackendProc_la_LINK) -rpath $(moddir) $(SystemBackendProc_la_OBJECTS) $(SystemBackendProc_la_LIBADD) $(LIBS) + $(SystemBackendProc_la_LINK) $(am_SystemBackendProc_la_rpath) $(SystemBackendProc_la_OBJECTS) $(SystemBackendProc_la_LIBADD) $(LIBS) UserBackendMysql.la: $(UserBackendMysql_la_OBJECTS) $(UserBackendMysql_la_DEPENDENCIES) - $(UserBackendMysql_la_LINK) -rpath $(moddir) $(UserBackendMysql_la_OBJECTS) $(UserBackendMysql_la_LIBADD) $(LIBS) + $(UserBackendMysql_la_LINK) $(am_UserBackendMysql_la_rpath) $(UserBackendMysql_la_OBJECTS) $(UserBackendMysql_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -460,7 +480,7 @@ maintainer-clean-generic: clean: clean-am clean-am: clean-generic clean-libtool clean-modLTLIBRARIES \ - mostlyclean-am + clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -519,18 +539,18 @@ uninstall-am: uninstall-modLTLIBRARIES .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-modLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-modLTLIBRARIES install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-modLTLIBRARIES + clean-libtool clean-modLTLIBRARIES clean-noinstLTLIBRARIES \ + ctags distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-modLTLIBRARIES install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-modLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -- cgit v1.2.3