diff options
| -rw-r--r-- | Makefile.am | 122 | ||||
| -rw-r--r-- | Makefile.in | 18 | ||||
| -rw-r--r-- | config.h.in | 54 | ||||
| -rwxr-xr-x | configure | 1276 | ||||
| -rw-r--r-- | configure.in | 256 | ||||
| -rw-r--r-- | plugin.c | 198 |
6 files changed, 1087 insertions, 837 deletions
diff --git a/Makefile.am b/Makefile.am index b004b38..cf2ce9d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = gnu CLEANFILES = *~ DRIVERS=@DRIVERS@ +PLUGINS=@PLUGINS@ bin_PROGRAMS = lcd4linux #lib_LTLIBRARIES = liblcd4linux.la @@ -10,10 +11,10 @@ bin_PROGRAMS = lcd4linux AM_CFLAGS = $(X_CFLAGS) -D_GNU_SOURCE -Wall lcd4linux_LDFLAGS = $(X_LIBS) -lcd4linux_LDADD = @DRIVERS@ @DRVLIBS@ +lcd4linux_LDADD = @DRIVERS@ @PLUGINS@ @DRVLIBS@ @PLUGINLIBS@ #lcd4linux_LDADD = liblcd4linux.la @DRVLIBS@ #remove next line for liblcd4linux -lcd4linux_DEPENDENCIES = @DRIVERS@ +lcd4linux_DEPENDENCIES = @DRIVERS@ @PLUGINS@ lcd4linux_SOURCES = \ lcd4linux.c \ @@ -38,24 +39,7 @@ widget_icon.c widget_icon.h \ plugin.c plugin.h \ plugin_math.c \ plugin_string.c \ -plugin_cfg.c \ -plugin_uname.c \ -plugin_loadavg.c \ -plugin_proc_stat.c \ -plugin_cpuinfo.c \ -plugin_meminfo.c \ -plugin_netdev.c \ -plugin_ppp.c \ -plugin_dvb.c \ -plugin_apm.c \ -plugin_i2c_sensors.c \ -plugin_imon.c \ -plugin_exec.c \ -plugin_xmms.c \ -plugin_mysql.c \ -plugin_wireless.c \ -plugin_seti.c \ -plugin_pop3.c +plugin_cfg.c #liblcd4linux_la_DEPENDENCIES = @DRIVERS@ #liblcd4linux_la_LDFLAGS = -version-info 9:12:9 @@ -63,42 +47,66 @@ plugin_pop3.c #liblcd4linux_la_SOURCES = -EXTRA_lcd4linux_SOURCES= \ -drv_generic_text.c drv_generic_text.h \ -drv_generic_graphic.c drv_generic_graphic.h \ -drv_generic_serial.c drv_generic_serial.h \ -drv_generic_parport.c drv_generic_parport.h \ -BeckmannEgle.c \ -drv_Crystalfontz.c \ -drv_Cwlinux.c \ -drv_HD44780.c \ -drv_M50530.c \ -drv_T6963.c \ -drv_USBLCD.c \ -drv_MatrixOrbital.c \ -MilfordInstruments.c \ -PalmPilot.c \ -Raster.c \ -drv_X11.c \ -Text.c \ -font_6x8.h +EXTRA_lcd4linux_SOURCES= \ +drv_generic_text.c \ +drv_generic_text.h \ +drv_generic_graphic.c \ +drv_generic_graphic.h \ +drv_generic_serial.c \ +drv_generic_serial.h \ +drv_generic_parport.c \ +drv_generic_parport.h \ +BeckmannEgle.c \ +drv_Crystalfontz.c \ +drv_Cwlinux.c \ +drv_HD44780.c \ +drv_M50530.c \ +drv_T6963.c \ +drv_USBLCD.c \ +drv_MatrixOrbital.c \ +MilfordInstruments.c \ +PalmPilot.c \ +Raster.c \ +drv_X11.c \ +Text.c \ +font_6x8.h \ + \ +plugin_apm.c \ +plugin_cpuinfo.c \ +plugin_dvb.c \ +plugin_exec.c \ +plugin_i2c_sensors.c \ +plugin_imon.c \ +plugin_loadavg.c \ +plugin_meminfo.c \ +plugin_mysql.c \ +plugin_netdev.c \ +plugin_pop3.c \ +plugin_ppp.c \ +plugin_proc_stat.c \ +plugin_seti.c \ +plugin_uname.c \ +plugin_wireless.c \ +plugin_xmms.c -EXTRA_DIST = \ -lcd4linux.conf.sample \ -lcd4kde.conf \ -lcd4linux.kdelnk \ -lcd4linux.xpm \ -lcd4linux.lsm \ -curses.m4 \ -AUTHORS \ -CREDITS \ -FAQ \ -NEWS \ -TODO \ -README \ -README.Rows \ -README.Tokens \ -README.Drivers \ -README.Plugins \ -README.KDE \ + +EXTRA_DIST = \ +lcd4linux.conf.sample \ +lcd4kde.conf \ +lcd4linux.kdelnk \ +lcd4linux.xpm \ +lcd4linux.lsm \ +curses.m4 \ +AUTHORS \ +CREDITS \ +FAQ \ +NEWS \ +TODO \ +README \ +README.Rows \ +README.Tokens \ +README.Drivers \ +README.Plugins \ +README.KDE \ plugin_sample.c + diff --git a/Makefile.in b/Makefile.in index 2dd938b..8121b6d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -73,12 +73,14 @@ LN_S = @LN_S@ LTLIB = @LTLIB@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ +PLUGINLIBS = @PLUGINLIBS@ RANLIB = @RANLIB@ VERSION = @VERSION@ AUTOMAKE_OPTIONS = gnu CLEANFILES = *~ DRIVERS = @DRIVERS@ +PLUGINS = @PLUGINS@ bin_PROGRAMS = lcd4linux #lib_LTLIBRARIES = liblcd4linux.la @@ -86,12 +88,12 @@ bin_PROGRAMS = lcd4linux AM_CFLAGS = $(X_CFLAGS) -D_GNU_SOURCE -Wall lcd4linux_LDFLAGS = $(X_LIBS) -lcd4linux_LDADD = @DRIVERS@ @DRVLIBS@ +lcd4linux_LDADD = @DRIVERS@ @PLUGINS@ @DRVLIBS@ @PLUGINLIBS@ #lcd4linux_LDADD = liblcd4linux.la @DRVLIBS@ #remove next line for liblcd4linux -lcd4linux_DEPENDENCIES = @DRIVERS@ +lcd4linux_DEPENDENCIES = @DRIVERS@ @PLUGINS@ -lcd4linux_SOURCES = lcd4linux.c cfg.c cfg.h debug.c debug.h drv.c drv.h evaluator.c evaluator.h hash.c hash.h layout.c layout.h lock.c lock.h pid.c pid.h timer.c timer.h thread.c thread.h udelay.c udelay.h qprintf.c qprintf.h widget.c widget.h widget_text.c widget_text.h widget_bar.c widget_bar.h widget_icon.c widget_icon.h plugin.c plugin.h plugin_math.c plugin_string.c plugin_cfg.c plugin_uname.c plugin_loadavg.c plugin_proc_stat.c plugin_cpuinfo.c plugin_meminfo.c plugin_netdev.c plugin_ppp.c plugin_dvb.c plugin_apm.c plugin_i2c_sensors.c plugin_imon.c plugin_exec.c plugin_xmms.c plugin_mysql.c plugin_wireless.c plugin_seti.c plugin_pop3.c +lcd4linux_SOURCES = lcd4linux.c cfg.c cfg.h debug.c debug.h drv.c drv.h evaluator.c evaluator.h hash.c hash.h layout.c layout.h lock.c lock.h pid.c pid.h timer.c timer.h thread.c thread.h udelay.c udelay.h qprintf.c qprintf.h widget.c widget.h widget_text.c widget_text.h widget_bar.c widget_bar.h widget_icon.c widget_icon.h plugin.c plugin.h plugin_math.c plugin_string.c plugin_cfg.c #liblcd4linux_la_DEPENDENCIES = @DRIVERS@ @@ -100,10 +102,10 @@ lcd4linux_SOURCES = lcd4linux.c cfg.c cfg.h deb #liblcd4linux_la_SOURCES = -EXTRA_lcd4linux_SOURCES = drv_generic_text.c drv_generic_text.h drv_generic_graphic.c drv_generic_graphic.h drv_generic_serial.c drv_generic_serial.h drv_generic_parport.c drv_generic_parport.h BeckmannEgle.c drv_Crystalfontz.c drv_Cwlinux.c drv_HD44780.c drv_M50530.c drv_T6963.c drv_USBLCD.c drv_MatrixOrbital.c MilfordInstruments.c PalmPilot.c Raster.c drv_X11.c Text.c font_6x8.h +EXTRA_lcd4linux_SOURCES = drv_generic_text.c drv_generic_text.h drv_generic_graphic.c drv_generic_graphic.h drv_generic_serial.c drv_generic_serial.h drv_generic_parport.c drv_generic_parport.h BeckmannEgle.c drv_Crystalfontz.c drv_Cwlinux.c drv_HD44780.c drv_M50530.c drv_T6963.c drv_USBLCD.c drv_MatrixOrbital.c MilfordInstruments.c PalmPilot.c Raster.c drv_X11.c Text.c font_6x8.h plugin_apm.c plugin_cpuinfo.c plugin_dvb.c plugin_exec.c plugin_i2c_sensors.c plugin_imon.c plugin_loadavg.c plugin_meminfo.c plugin_mysql.c plugin_netdev.c plugin_pop3.c plugin_ppp.c plugin_proc_stat.c plugin_seti.c plugin_uname.c plugin_wireless.c plugin_xmms.c -EXTRA_DIST = lcd4linux.conf.sample lcd4kde.conf lcd4linux.kdelnk lcd4linux.xpm lcd4linux.lsm curses.m4 AUTHORS CREDITS FAQ NEWS TODO README README.Rows README.Tokens README.Drivers README.Plugins README.KDE plugin_sample.c +EXTRA_DIST = lcd4linux.conf.sample lcd4kde.conf lcd4linux.kdelnk lcd4linux.xpm lcd4linux.lsm curses.m4 AUTHORS CREDITS FAQ NEWS TODO README README.Rows README.Tokens README.Drivers README.Plugins README.KDE plugin_sample.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -123,11 +125,7 @@ X_PRE_LIBS = @X_PRE_LIBS@ lcd4linux_OBJECTS = lcd4linux.o cfg.o debug.o drv.o evaluator.o hash.o \ layout.o lock.o pid.o timer.o thread.o udelay.o qprintf.o widget.o \ widget_text.o widget_bar.o widget_icon.o plugin.o plugin_math.o \ -plugin_string.o plugin_cfg.o plugin_uname.o plugin_loadavg.o \ -plugin_proc_stat.o plugin_cpuinfo.o plugin_meminfo.o plugin_netdev.o \ -plugin_ppp.o plugin_dvb.o plugin_apm.o plugin_i2c_sensors.o \ -plugin_imon.o plugin_exec.o plugin_xmms.o plugin_mysql.o \ -plugin_wireless.o plugin_seti.o plugin_pop3.o +plugin_string.o plugin_cfg.o CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) diff --git a/config.h.in b/config.h.in index d9530e5..b248f0d 100644 --- a/config.h.in +++ b/config.h.in @@ -58,9 +58,6 @@ /* Define to 1 if you have the <malloc.h> header file. */ #undef HAVE_MALLOC_H -/* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE - /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H @@ -230,6 +227,57 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* apm plugin */ +#undef PLUGIN_APM + +/* cpuinfo plugin */ +#undef PLUGIN_CPUINFO + +/* dvb plugin */ +#undef PLUGIN_DVB + +/* exec plugin */ +#undef PLUGIN_EXEC + +/* i2c sensors plugin */ +#undef PLUGIN_I2C_SENSORS + +/* imon plugin */ +#undef PLUGIN_IMON + +/* loadavg plugin */ +#undef PLUGIN_LOADAVG + +/* meminfo plugin */ +#undef PLUGIN_MEMINFO + +/* mysql plugin */ +#undef PLUGIN_MYSQL + +/* netdev plugin */ +#undef PLUGIN_NETDEV + +/* POP3 plugin */ +#undef PLUGIN_POP3 + +/* ppp plugin */ +#undef PLUGIN_PPP + +/* proc_stat plugin */ +#undef PLUGIN_PROC_STAT + +/* seti plugin */ +#undef PLUGIN_SETI + +/* uname plugin */ +#undef PLUGIN_UNAME + +/* wireless plugin */ +#undef PLUGIN_WIRELESS + +/* xmms plugin */ +#undef PLUGIN_XMMS + /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE @@ -311,7 +311,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP LN_S RANLIB ac_ct_RANLIB CURSES_LIBS CURSES_INCLUDEDIR EGREP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DRIVERS DRVLIBS LIBOBJS POW_LIB LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP LN_S RANLIB ac_ct_RANLIB CURSES_LIBS CURSES_INCLUDEDIR EGREP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DRIVERS DRVLIBS PLUGINS PLUGINLIBS LIBOBJS POW_LIB LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -878,6 +878,9 @@ Optional Packages: BeckmannEgle, CrystalFontz, Curses, Cwlinux, HD44780, M50530, T6963, USBLCD, MatrixOrbital, MilfordInstruments, PalmPilot, PNG, PPM, X11 + --with-plugins=<list> choose which plugins to compile. + type --with-plugins=list for a list + of avaible plugins Some influential environment variables: CXX C++ compiler command @@ -3918,7 +3921,7 @@ echo "${ECHO_T}Please note that some screen refreshs may fail" >&6 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 ncurses_version=unknown cat > conftest.$ac_ext <<EOF -#line 3921 "configure" +#line 3924 "configure" #include "confdefs.h" #ifdef RENAMED_NCURSES #include <curses.h> @@ -5738,6 +5741,8 @@ done # drivers +# Drivers conf part + echo "$as_me:$LINENO: checking which drivers to compile" >&5 echo $ECHO_N "checking which drivers to compile... $ECHO_C" >&6 @@ -6049,6 +6054,821 @@ fi + +# plugins +# Plugins conf part + +echo "$as_me:$LINENO: checking which plugins to compile" >&5 +echo $ECHO_N "checking which plugins to compile... $ECHO_C" >&6 + +# Check whether --with-plugins or --without-plugins was given. +if test "${with_plugins+set}" = set; then + withval="$with_plugins" + plugins=$withval +else + plugins=all + +fi; + +plugins=`echo $plugins|sed 's/,/ /g'` + +for plugin in $plugins; do + + case $plugin in + !*) + val="no" + driver=`echo $plugin|cut -c 2-` + ;; + *) + val="yes" + ;; + esac + + case "$plugin" in + list) + echo "$as_me:$LINENO: result: TO BE DONE..." >&5 +echo "${ECHO_T}TO BE DONE..." >&6 + { { echo "$as_me:$LINENO: error: run ./configure --with-plugins=..." >&5 +echo "$as_me: error: run ./configure --with-plugins=..." >&2;} + { (exit 1); exit 1; }; } + ;; + all) + PLUGIN_APM="yes" + PLUGIN_CPUINFO="yes" + PLUGIN_DVB="yes" + PLUGIN_EXEC="yes" + PLUGIN_I2C_SENSORS="yes" + PLUGIN_IMON="yes" + PLUGIN_LOADAVG="yes" + PLUGIN_MEMINFO="yes" + PLUGIN_MYSQL="yes" + PLUGIN_NETDEV="yes" + PLUGIN_POP3="yes" + PLUGIN_PPP="yes" + PLUGIN_PROC_STAT="yes" + PLUGIN_SETI="yes" + PLUGIN_UNAME="yes" + PLUGIN_WIRELESS="yes" + PLUGIN_XMMS="yes" + ;; + apm) + PLUGIN_APM=$val + ;; + cpuinfo) + PLUGIN_CPUINFO=$val + ;; + dvb) + PLUGIN_DVB=$val + ;; + exec) + PLUGIN_EXEC=$val + ;; + i2c_sensors) + PLUGIN_I2C_SENSORS=$val + ;; + imon) + PLUGIN_IMON=$val + ;; + loadavg) + PLUGIN_LOADAVG=$val + ;; + meminfo) + PLUGIN_MEMINFO=$val + ;; + mysql) + PLUGIN_MYSQL=$val + ;; + netdev) + PLUGIN_NETDEV=$val + ;; + pop3) + PLUGIN_POP3=$val + ;; + ppp) + PLUGIN_PPP=$val + ;; + proc_stat) + PLUGIN_PROC_STAT=$val + ;; + seti) + PLUGIN_SETI=$val + ;; + uname) + PLUGIN_UNAME=$val + ;; + wireless) + PLUGIN_WIRELESS=$val + ;; + xmms) + PLUGIN_XMMS=$val + ;; + *) + { { echo "$as_me:$LINENO: error: Unknown plugin '$plugin'" >&5 +echo "$as_me: error: Unknown plugin '$plugin'" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +done + +echo "$as_me:$LINENO: result: done" >&5 +echo "${ECHO_T}done" >&6 +if test "$PLUGIN_APM" = "yes"; then + PLUGINS="$PLUGINS plugin_apm.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_APM 1 +_ACEOF + +fi +if test "$PLUGIN_CPUINFO" = "yes"; then + PLUGINS="$PLUGINS plugin_cpuinfo.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_CPUINFO 1 +_ACEOF + +fi +if test "$PLUGIN_DVB" = "yes"; then + +for ac_header in linux/dvb/frontend.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 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); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------- ## +## Report this to reinelt@eunet.at ## +## ------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + has_dvb_header=true +else + has_dvb_header=false +fi + +done + + if test "$has_dvb_header" = true; then + PLUGINS="$PLUGINS plugin_dvb.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_DVB 1 +_ACEOF + + else + { echo "$as_me:$LINENO: WARNING: linux/dvb/frontend.h header not found: dvb driver disabled" >&5 +echo "$as_me: WARNING: linux/dvb/frontend.h header not found: dvb driver disabled" >&2;} + fi +fi +if test "$PLUGIN_EXEC" = "yes"; then + PLUGINS="$PLUGINS plugin_exec.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_EXEC 1 +_ACEOF + +fi +if test "$PLUGIN_I2C_SENSORS" = "yes"; then + PLUGINS="$PLUGINS plugin_i2c_sensors.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_I2C_SENSORS 1 +_ACEOF + +fi +if test "$PLUGIN_IMON" = "yes"; then + PLUGINS="$PLUGINS plugin_imon.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_IMON 1 +_ACEOF + +fi +if test "$PLUGIN_LOADAVG" = "yes"; then + PLUGINS="$PLUGINS plugin_loadavg.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_LOADAVG 1 +_ACEOF + +fi +if test "$PLUGIN_MEMINFO" = "yes"; then + PLUGINS="$PLUGINS plugin_meminfo.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_MEMINFO 1 +_ACEOF + +fi +if test "$PLUGIN_MYSQL" = "yes"; then + +for ac_header in mysql/mysql.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 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); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------- ## +## Report this to reinelt@eunet.at ## +## ------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + has_mysql_header=true +else + has_mysql_header=false +fi + +done + + if test "$has_mysql_header" = true; then + echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient" >&5 +echo $ECHO_N "checking for mysql_init in -lmysqlclient... $ECHO_C" >&6 +if test "${ac_cv_lib_mysqlclient_mysql_init_+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmysqlclient $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char mysql_init (); +int +main () +{ +mysql_init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mysqlclient_mysql_init_=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_mysqlclient_mysql_init_=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_init_" >&5 +echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_init_" >&6 +if test $ac_cv_lib_mysqlclient_mysql_init_ = yes; then + has_mysql_lib=true +else + has_mysql_lib=false +fi + + if test "$has_mysql_lib" = true; then + PLUGINS="$PLUGINS plugin_mysql.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_MYSQL 1 +_ACEOF + + PLUGINLIBS="$PLUGINLIBS -lmysqlclient" + else + { echo "$as_me:$LINENO: WARNING: mysqlclient lib not found: mysql driver disabled" >&5 +echo "$as_me: WARNING: mysqlclient lib not found: mysql driver disabled" >&2;} + fi + else + { echo "$as_me:$LINENO: WARNING: mysql/mysql.h header not found: mysql driver disabled" >&5 +echo "$as_me: WARNING: mysql/mysql.h header not found: mysql driver disabled" >&2;} + fi +fi +if test "$PLUGIN_NETDEV" = "yes"; then + PLUGINS="$PLUGINS plugin_netdev.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_NETDEV 1 +_ACEOF + +fi +if test "$PLUGIN_POP3" = "yes"; then + PLUGINS="$PLUGINS plugin_pop3.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_POP3 1 +_ACEOF + +fi +if test "$PLUGIN_PPP" = "yes"; then + +for ac_header in net/if_ppp.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 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); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------- ## +## Report this to reinelt@eunet.at ## +## ------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + has_ppp_header=true +else + has_ppp_header=false +fi + +done + + if test "$has_ppp_header" = true; then + PLUGINS="$PLUGINS plugin_ppp.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_PPP 1 +_ACEOF + + else + { echo "$as_me:$LINENO: WARNING: net/if_ppp.h header not found: ppp driver disabled" >&5 +echo "$as_me: WARNING: net/if_ppp.h header not found: ppp driver disabled" >&2;} + fi +fi +if test "$PLUGIN_PROC_STAT" = "yes"; then + PLUGINS="$PLUGINS plugin_proc_stat.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_PROC_STAT 1 +_ACEOF + +fi +if test "$PLUGIN_SETI" = "yes"; then + PLUGINS="$PLUGINS plugin_seti.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_SETI 1 +_ACEOF + +fi +if test "$PLUGIN_UNAME" = "yes"; then + PLUGINS="$PLUGINS plugin_uname.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_UNAME 1 +_ACEOF + +fi +if test "$PLUGIN_WIRELESS" = "yes"; then + PLUGINS="$PLUGINS plugin_wireless.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_WIRELESS 1 +_ACEOF + +fi +if test "$PLUGIN_XMMS" = "yes"; then + PLUGINS="$PLUGINS plugin_xmms.o" + +cat >>confdefs.h <<\_ACEOF +#define PLUGIN_XMMS 1 +_ACEOF + +fi + +#if test "$PLUGIN_" = "yes"; then +# PLUGINS="$PLUGINS plugin_.o" +# AC_DEFINE(PLUGIN_,1,[plugin]) +#fi + +if test "$PLUGINS" = ""; then + { { echo "$as_me:$LINENO: error: You should include at least one plugin..." >&5 +echo "$as_me: error: You should include at least one plugin..." >&2;} + { (exit 1); exit 1; }; } +#else +# AC_MSG_ERROR($PLUGINS) +fi + + + + + # Checks for header files. echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 @@ -7072,304 +7892,6 @@ fi done -for ac_header in linux/dvb/frontend.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------- ## -## Report this to reinelt@eunet.at ## -## ------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -for ac_header in net/if_ppp.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------- ## -## Report this to reinelt@eunet.at ## -## ------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - for ac_header in asm/msr.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -7519,155 +8041,6 @@ fi done -for ac_header in mysql/mysql.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------- ## -## Report this to reinelt@eunet.at ## -## ------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - # Checks for typedefs, structures, and compiler characteristics. echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 @@ -9543,8 +9916,7 @@ fi - -for ac_func in dup2 gethostbyname gettimeofday memmove memset pow putenv regcomp select socket sqrt strcasecmp strchr strdup strerror strncasecmp strndup strpbrk strrchr strstr strtol uname +for ac_func in dup2 gethostbyname gettimeofday memset pow putenv regcomp select socket sqrt strcasecmp strchr strdup strerror strncasecmp strndup strpbrk strrchr strstr strtol uname do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -10304,6 +10676,8 @@ s,@X_LIBS@,$X_LIBS,;t t s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t s,@DRIVERS@,$DRIVERS,;t t s,@DRVLIBS@,$DRVLIBS,;t t +s,@PLUGINS@,$PLUGINS,;t t +s,@PLUGINLIBS@,$PLUGINLIBS,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@POW_LIB@,$POW_LIB,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t diff --git a/configure.in b/configure.in index 2839627..dd8bfab 100644 --- a/configure.in +++ b/configure.in @@ -36,255 +36,10 @@ AC_PATH_XTRA AC_CHECK_HEADERS(gd/gd.h gd.h, [has_gd=true], [has_gd=false]) # drivers -AC_MSG_CHECKING([which drivers to compile]) -AC_ARG_WITH( - drivers, - [ --with-drivers=<list> compile driver for displays in <list>,] - [ drivers may be separated with commas,] - [ 'all' (default) compiles all available drivers,] - [ drivers may be excluded with 'all,!<driver>',] - [ (try 'all,\!<driver>' if your shell complains...)] - [ possible drivers are:] - [ BeckmannEgle, CrystalFontz, Curses, Cwlinux,] - [ HD44780, M50530, T6963, USBLCD, MatrixOrbital,] - [ MilfordInstruments, PalmPilot, PNG, PPM, X11], - drivers=$withval, - drivers=all -) +sinclude(drivers.m4) -drivers=`echo $drivers|sed 's/,/ /g'` - -for driver in $drivers; do - - case $driver in - !*) - val="no" - driver=`echo $driver|cut -c 2-` - ;; - *) - val="yes" - ;; - esac - - case "$driver" in - all) - BECKMANNEGLE="yes" - CRYSTALFONTZ="yes" - CURSES="yes" - CWLINUX="yes" - HD44780="yes" - M50530="yes" - T6963="yes" - USBLCD="yes" - MATRIXORBITAL="yes" - MILINST="yes" - PALMPILOT="yes" - PNG="yes" - PPM="yes" - X11="yes" - ;; - BeckmannEgle) - BECKMANNEGLE=$val - ;; - CrystalFontz) - CRYSTALFONTZ=$val - ;; - Curses) - CURSES=$val - ;; - Cwlinux) - CWLINUX=$val - ;; - HD44780) - HD44780=$val - ;; - M50530) - M50530=$val - ;; - T6963) - T6963=$val - ;; - USBLCD) - USBLCD=$val - ;; - MatrixOrbital) - MATRIXORBITAL=$val - ;; - MilfordInstruments) - MILINST=$val - ;; - PalmPilot) - PALMPILOT=$val - ;; - PNG) - PNG=$val - ;; - PPM) - PPM=$val - ;; - X11) - X11=$val - ;; - *) - AC_MSG_ERROR([Unknown driver '$driver']) - ;; - esac -done - -AC_MSG_RESULT([done]) - -PARPORT="no" -SERIAL="no" -TEXT="no" -GRAPHIC="no" - -if test "$BECKMANNEGLE" = "yes"; then -# DRIVERS="$DRIVERS BeckmannEgle.lo" -# DRIVERS="$DRIVERS BeckmannEgle.o" - AC_DEFINE(WITH_BECKMANNEGLE,1,[Beckmann&Egle driver]) -fi - -if test "$CRYSTALFONTZ" = "yes"; then - TEXT="yes" - SERIAL="yes" -# DRIVERS="$DRIVERS drv_Crystalfontz.lo" - DRIVERS="$DRIVERS drv_Crystalfontz.o" - AC_DEFINE(WITH_CRYSTALFONTZ,1,[Crystalfontz driver]) -fi - -if test "$CURSES" = "yes"; then - if test "$has_curses" = true; then -# DRIVERS="$DRIVERS Text.lo" -# DRIVERS="$DRIVERS Text.o" - DRVLIBS="$DRVLIBS $CURSES_LIBS" - CPPFLAGS="$CPPFLAGS $CURSES_INCLUDES" - AC_DEFINE(WITH_TEXT,1,[Curses driver]) - else - AC_MSG_WARN(curses not found: Curses driver disabled) - fi -fi - -if test "$CWLINUX" = "yes"; then - TEXT="yes" - SERIAL="yes" -# DRIVERS="$DRIVERS drv_Cwlinux.lo" - DRIVERS="$DRIVERS drv_Cwlinux.o" - AC_DEFINE(WITH_CWLINUX,1,[CwLinux driver]) -fi - -if test "$HD44780" = "yes"; then - TEXT="yes" - PARPORT="yes" -# DRIVERS="$DRIVERS drv_HD44780.lo" - DRIVERS="$DRIVERS drv_HD44780.o" - AC_DEFINE(WITH_HD44780,1,[HD44780 driver]) -fi - -if test "$M50530" = "yes"; then - TEXT="yes" - PARPORT="yes" -# DRIVERS="$DRIVERS drv_M50530.lo" - DRIVERS="$DRIVERS drv_M50530.o" - AC_DEFINE(WITH_M50530,1,[M50530 driver]) -fi - -if test "$T6963" = "yes"; then - GRAPHIC="yes" - PARPORT="yes" -# DRIVERS="$DRIVERS drv_T6963.lo" - DRIVERS="$DRIVERS drv_T6963.o" - AC_DEFINE(WITH_T6963,1,[T6963 driver]) -fi - -if test "$USBLCD" = "yes"; then - TEXT="yes" - SERIAL="yes" -# DRIVERS="$DRIVERS drv_USBLCD.lo" - DRIVERS="$DRIVERS drv_USBLCD.o" - AC_DEFINE(WITH_USBLCD,1,[USBLCD driver]) -fi - -if test "$MATRIXORBITAL" = "yes"; then - SERIAL="yes" -# DRIVERS="$DRIVERS drv_MatrixOrbital.lo" - DRIVERS="$DRIVERS drv_MatrixOrbital.o" - AC_DEFINE(WITH_MATRIXORBITAL,1,[MatrixOrbital driver]) -fi - -if test "$MILINST" = "yes"; then -# DRIVERS="$DRIVERS MilfordInstruments.lo" -# DRIVERS="$DRIVERS MilfordInstruments.o" - AC_DEFINE(WITH_MILINST,1,[Milford Instruments driver]) -fi - -if test "$PALMPILOT" = "yes"; then -# DRIVERS="$DRIVERS PalmPilot.lo" -# DRIVERS="$DRIVERS PalmPilot.o" - AC_DEFINE(WITH_PALMPILOT,1,[PalmPilot driver]) -fi - -if test "$PNG" = "yes"; then - if test "$has_gd" = "true"; then - GRAPHIC="yes" - AC_DEFINE(WITH_PNG,1,[ driver]) - DRVLIBS="$DRVLIBS -lgd" - else - AC_MSG_WARN(gd.h not found: PNG driver disabled) - fi -fi - -if test "$PPM" = "yes"; then - if test "$has_gd" = "true"; then - GRAPHIC="yes" - AC_DEFINE(WITH_PPM,1,[ driver]) - else - AC_MSG_WARN(gd.h not found: PNG driver disabled) - fi -fi - -if test "$X11" = "yes"; then - if test "$no_x" = "yes"; then - AC_MSG_WARN(X11 headers or libraries not available: X11 driver disabled) - else - GRAPHIC="yes" -# DRIVERS="$DRIVERS drv_X11.lo" - DRIVERS="$DRIVERS drv_X11.o" - DRVLIBS="$DRVLIBS -L$ac_x_libraries -lX11" - AC_DEFINE(WITH_X11,1,[X11 driver]) - fi -fi - -if test "$DRIVERS" = ""; then - AC_MSG_ERROR([You should include at least one driver...]) -fi - -# generic text driver -if test "$TEXT" = "yes"; then -# DRIVERS="$DRIVERS drv_generic_text.lo" - DRIVERS="$DRIVERS drv_generic_text.o" -fi - -# generic graphic driver -if test "$GRAPHIC" = "yes"; then -: -# DRIVERS="$DRIVERS - DRIVERS="$DRIVERS drv_generic_graphic.o" -fi - -# generic parport driver -if test "$PARPORT" = "yes"; then -# DRIVERS="$DRIVERS drv_generic_parport.lo" - DRIVERS="$DRIVERS drv_generic_parport.o" -fi - -# generic serial driver -if test "$SERIAL" = "yes"; then -# DRIVERS="$DRIVERS drv_generic_serial.lo" - DRIVERS="$DRIVERS drv_generic_serial.o" -fi - -AC_SUBST(DRIVERS) -AC_SUBST(DRVLIBS) +# plugins +sinclude(plugins.m4) # Checks for header files. AC_HEADER_STDC @@ -293,10 +48,7 @@ AC_HEADER_SYS_WAIT AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h syslog.h termios.h unistd.h]) AC_CHECK_HEADERS(sys/io.h asm/io.h) AC_CHECK_HEADERS(linux/parport.h linux/ppdev.h) -AC_CHECK_HEADERS(linux/dvb/frontend.h) -AC_CHECK_HEADERS(net/if_ppp.h) AC_CHECK_HEADERS(asm/msr.h) -AC_CHECK_HEADERS(mysql/mysql.h) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -325,7 +77,7 @@ AC_FUNC_SELECT_ARGTYPES AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_STRTOD -AC_CHECK_FUNCS([dup2 gethostbyname gettimeofday memmove memset pow putenv regcomp select socket sqrt strcasecmp strchr strdup strerror strncasecmp strndup strpbrk strrchr strstr strtol uname]) +AC_CHECK_FUNCS([dup2 gethostbyname gettimeofday memset pow putenv regcomp select socket sqrt strcasecmp strchr strdup strerror strncasecmp strndup strpbrk strrchr strstr strtol uname]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT @@ -1,4 +1,4 @@ -/* $Id: plugin.c,v 1.26 2004/04/08 11:59:26 reinelt Exp $ +/* $Id: plugin.c,v 1.27 2004/04/09 06:09:55 reinelt Exp $ * * plugin handler for the Evaluator * @@ -22,8 +22,8 @@ * * * $Log: plugin.c,v $ - * Revision 1.26 2004/04/08 11:59:26 reinelt - * added plugin_pop3 from Javi + * Revision 1.27 2004/04/09 06:09:55 reinelt + * big configure rework from Xavier * * Revision 1.25 2004/04/07 08:29:05 hejl * New plugin for wireless info @@ -161,97 +161,167 @@ // Prototypes -int plugin_init_math (void); -int plugin_init_string (void); -int plugin_init_cfg (void); -int plugin_init_uname (void); -int plugin_init_loadavg (void); -int plugin_init_proc_stat (void); -int plugin_init_cpuinfo (void); -int plugin_init_meminfo (void); -int plugin_init_netdev (void); -int plugin_init_ppp (void); -int plugin_init_dvb (void); -int plugin_init_apm (void); -int plugin_init_i2c_sensors (void); -int plugin_init_exec (void); -int plugin_init_xmms (void); -int plugin_init_imon(void); -int plugin_init_mysql(void); -int plugin_init_seti(void); -int plugin_init_wireless(void); -int plugin_init_pop3(void); - - -void plugin_exit_math (void); +int plugin_init_math (void); +void plugin_exit_math (void); +int plugin_init_string (void); void plugin_exit_string (void); -void plugin_exit_cfg (void); -void plugin_exit_uname (void); -void plugin_exit_loadavg (void); -void plugin_exit_proc_stat (void); +int plugin_init_cfg (void); +void plugin_exit_cfg (void); + +int plugin_init_apm (void); +void plugin_exit_apm (void); +int plugin_init_cpuinfo (void); void plugin_exit_cpuinfo (void); -void plugin_exit_meminfo (void); -void plugin_exit_netdev (void); -void plugin_exit_ppp (void); +int plugin_init_dvb (void); void plugin_exit_dvb (void); -void plugin_exit_apm (void); -void plugin_exit_i2c_sensors (void); +int plugin_init_exec (void); void plugin_exit_exec (void); -void plugin_exit_xmms (void); +int plugin_init_i2c_sensors (void); +void plugin_exit_i2c_sensors (void); +int plugin_init_imon(void); void plugin_exit_imon(void); +int plugin_init_loadavg (void); +void plugin_exit_loadavg (void); +int plugin_init_meminfo (void); +void plugin_exit_meminfo (void); +int plugin_init_mysql(void); void plugin_exit_mysql(void); +int plugin_init_netdev (void); +void plugin_exit_netdev (void); +int plugin_init_pop3 (void); +void plugin_exit_pop3 (void); +int plugin_init_ppp (void); +void plugin_exit_ppp (void); +int plugin_init_proc_stat (void); +void plugin_exit_proc_stat (void); +int plugin_init_seti(void); void plugin_exit_seti(void); +int plugin_init_uname (void); +void plugin_exit_uname (void); +int plugin_init_wireless(void); void plugin_exit_wireless(void); -void plugin_exit_pop3(void); +int plugin_init_xmms (void); +void plugin_exit_xmms (void); + int plugin_init (void) { plugin_init_math(); plugin_init_string(); plugin_init_cfg(); - plugin_init_uname(); - plugin_init_loadavg(); - plugin_init_proc_stat(); + +#ifdef PLUGIN_APM + plugin_init_apm(); +#endif +#ifdef PLUGIN_CPUINFO plugin_init_cpuinfo(); - plugin_init_meminfo(); - plugin_init_netdev(); - plugin_init_ppp(); +#endif +#ifdef PLUGIN_DVB plugin_init_dvb(); - plugin_init_apm(); - plugin_init_i2c_sensors(); +#endif +#ifdef PLUGIN_EXEC plugin_init_exec(); - plugin_init_xmms(); +#endif +#ifdef PLUGIN_I2C_SENSORS + plugin_init_i2c_sensors(); +#endif +#ifdef PLUGIN_IMON plugin_init_imon(); +#endif +#ifdef PLUGIN_LOADAVG + plugin_init_loadavg(); +#endif +#ifdef PLUGIN_MEMINFO + plugin_init_meminfo(); +#endif +#ifdef PLUGIN_MYSQL plugin_init_mysql(); +#endif +#ifdef PLUGIN_NETDEV + plugin_init_netdev(); +#endif +#ifdef PLUGIN_POP3 + plugin_init_pop3(); +#endif +#ifdef PLUGIN_PPP + plugin_init_ppp(); +#endif +#ifdef PLUGIN_PROC_STAT + plugin_init_proc_stat(); +#endif +#ifdef PLUGIN_SETI plugin_init_seti(); +#endif +#ifdef PLUGIN_UNAME + plugin_init_uname(); +#endif +#ifdef PLUGIN_WIRELESS plugin_init_wireless(); - plugin_init_pop3(); - +#endif +#ifdef PLUGIN_XMMS + plugin_init_xmms(); +#endif return 0; } void plugin_exit(void) { - plugin_exit_math(); - plugin_exit_string(); - plugin_exit_cfg(); - plugin_exit_uname(); - plugin_exit_loadavg(); - plugin_exit_proc_stat(); +#ifdef PLUGIN_APM + plugin_exit_apm(); +#endif +#ifdef PLUGIN_CPUINFO plugin_exit_cpuinfo(); +#endif +#ifdef PLUGIN_DVB + plugin_exit_dvb(); +#endif +#ifdef PLUGIN_EXEC + plugin_exit_exec(); +#endif +#ifdef PLUGIN_I2C_SENSORS + plugin_exit_i2c_sensors(); +#endif +#ifdef PLUGIN_IMON + plugin_exit_imon(); +#endif +#ifdef PLUGIN_LOADAVG + plugin_exit_loadavg(); +#endif +#ifdef PLUGIN_MEMINFO plugin_exit_meminfo(); +#endif +#ifdef PLUGIN_MYSQL + plugin_exit_mysql(); +#endif +#ifdef PLUGIN_NETDEV plugin_exit_netdev(); +#endif +#ifdef PLUGIN_POP3 + plugin_exit_pop3(); +#endif +#ifdef PLUGIN_PPP plugin_exit_ppp(); - plugin_exit_dvb(); - plugin_exit_apm(); - plugin_exit_i2c_sensors(); - plugin_exit_exec(); - plugin_exit_xmms(); - plugin_exit_imon(); - plugin_exit_mysql(); - plugin_exit_seti(); +#endif +#ifdef PLUGIN_PROC_STAT + plugin_exit_proc_stat(); +#endif +#ifdef PLUGIN_SETI + plugin_exit_seti(); +#endif +#ifdef PLUGIN_UNAME + plugin_exit_uname(); +#endif +#ifdef PLUGIN_WIRELESS plugin_exit_wireless(); - plugin_exit_pop3(); - +#endif +#ifdef PLUGIN_XMMS + plugin_exit_xmms(); +#endif + + plugin_exit_cfg(); + plugin_exit_string(); + plugin_exit_math(); + + DeleteFunctions(); DeleteVariables(); } |