diff options
| -rwxr-xr-x | configure | 42 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | plugins.m4 | 20 |
3 files changed, 34 insertions, 34 deletions
@@ -5289,9 +5289,9 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - has_gd=true + has_gd="true";break else - has_gd=false + has_gd="false" fi done @@ -5442,9 +5442,9 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - has_usb=true + has_usb="true" else - has_usb=false + has_usb="false" fi done @@ -5515,9 +5515,9 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - has_i2c=true + has_i2c="true" else - has_i2c=false + has_i2c="false";break fi done @@ -6234,14 +6234,14 @@ 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 + has_dvb_header="true" else - has_dvb_header=false + has_dvb_header="false" fi done - if test "$has_dvb_header" = true; then + if test "$has_dvb_header" = "true"; then PLUGINS="$PLUGINS plugin_dvb.o" cat >>confdefs.h <<\_ACEOF @@ -6422,14 +6422,14 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - has_isdn_header=true + has_isdn_header="true" else - has_isdn_header=false + has_isdn_header="false" fi done - if test "$has_dvb_header" = false; then + if test "$has_dvb_header" = "false"; then { echo "$as_me:$LINENO: WARNING: linux/isdn.h header not found: isdn plugin CPS disabled" >&5 echo "$as_me: WARNING: linux/isdn.h header not found: isdn plugin CPS disabled" >&2;} fi @@ -6601,14 +6601,14 @@ 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 + has_mysql_header="true" else - has_mysql_header=false + has_mysql_header="false" fi done - if test "$has_mysql_header" = true; then + 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 @@ -6673,12 +6673,12 @@ 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 + has_mysql_lib="true" else - has_mysql_lib=false + has_mysql_lib="false" fi - if test "$has_mysql_lib" = true; then + if test "$has_mysql_lib" = "true"; then PLUGINS="$PLUGINS plugin_mysql.o" cat >>confdefs.h <<\_ACEOF @@ -6856,14 +6856,14 @@ 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 + has_ppp_header="true" else - has_ppp_header=false + has_ppp_header="false" fi done - if test "$has_ppp_header" = true; then + if test "$has_ppp_header" = "true"; then PLUGINS="$PLUGINS plugin_ppp.o" cat >>confdefs.h <<\_ACEOF diff --git a/configure.in b/configure.in index 60b161f..1a4c97d 100644 --- a/configure.in +++ b/configure.in @@ -49,13 +49,13 @@ AC_CHECK_CURSES AC_PATH_XTRA # check for gd.h -AC_CHECK_HEADERS(gd/gd.h gd.h, [has_gd=true], [has_gd=false]) +AC_CHECK_HEADERS(gd/gd.h gd.h, [has_gd="true";break], [has_gd="false"]) # check for usb.h -AC_CHECK_HEADERS(usb.h, [has_usb=true], [has_usb=false]) +AC_CHECK_HEADERS(usb.h, [has_usb="true"], [has_usb="false"]) # check for i2c -AC_CHECK_HEADERS(linux/compiler.h linux/i2c.h linux/i2c-dev.h,[has_i2c=true],[has_i2c=false],[ +AC_CHECK_HEADERS(linux/compiler.h linux/i2c.h linux/i2c-dev.h,[has_i2c="true"],[has_i2c="false";break],[ #if HAVE_LINUX_COMPILER_H #include <linux/compiler.h> # endif @@ -154,8 +154,8 @@ if test "$PLUGIN_DISKSTATS" = "yes"; then AC_DEFINE(PLUGIN_DISKSTATS,1,[diskstats plugin]) fi if test "$PLUGIN_DVB" = "yes"; then - AC_CHECK_HEADERS(linux/dvb/frontend.h, [has_dvb_header=true], [has_dvb_header=false]) - if test "$has_dvb_header" = true; then + AC_CHECK_HEADERS(linux/dvb/frontend.h, [has_dvb_header="true"], [has_dvb_header="false"]) + if test "$has_dvb_header" = "true"; then PLUGINS="$PLUGINS plugin_dvb.o" AC_DEFINE(PLUGIN_DVB,1,[dvb plugin]) else @@ -175,8 +175,8 @@ if test "$PLUGIN_IMON" = "yes"; then AC_DEFINE(PLUGIN_IMON,1,[imon plugin]) fi if test "$PLUGIN_ISDN" = "yes"; then - AC_CHECK_HEADERS(linux/isdn.h, [has_isdn_header=true], [has_isdn_header=false]) - if test "$has_dvb_header" = false; then + AC_CHECK_HEADERS(linux/isdn.h, [has_isdn_header="true"], [has_isdn_header="false"]) + if test "$has_dvb_header" = "false"; then AC_MSG_WARN(linux/isdn.h header not found: isdn plugin CPS disabled) fi PLUGINS="$PLUGINS plugin_isdn.o" @@ -191,10 +191,10 @@ if test "$PLUGIN_MEMINFO" = "yes"; then AC_DEFINE(PLUGIN_MEMINFO,1,[meminfo plugin]) fi if test "$PLUGIN_MYSQL" = "yes"; then - AC_CHECK_HEADERS(mysql/mysql.h, [has_mysql_header=true], [has_mysql_header=false]) - if test "$has_mysql_header" = true; then - AC_CHECK_LIB(mysqlclient, mysql_init, [has_mysql_lib=true], [has_mysql_lib=false]) - if test "$has_mysql_lib" = true; then + AC_CHECK_HEADERS(mysql/mysql.h, [has_mysql_header="true"], [has_mysql_header="false"]) + if test "$has_mysql_header" = "true"; then + AC_CHECK_LIB(mysqlclient, mysql_init, [has_mysql_lib="true"], [has_mysql_lib="false"]) + if test "$has_mysql_lib" = "true"; then PLUGINS="$PLUGINS plugin_mysql.o" AC_DEFINE(PLUGIN_MYSQL,1,[mysql plugin]) PLUGINLIBS="$PLUGINLIBS -lmysqlclient" @@ -214,8 +214,8 @@ if test "$PLUGIN_POP3" = "yes"; then AC_DEFINE(PLUGIN_POP3,1,[POP3 plugin]) fi if test "$PLUGIN_PPP" = "yes"; then - AC_CHECK_HEADERS(net/if_ppp.h, [has_ppp_header=true], [has_ppp_header=false]) - if test "$has_ppp_header" = true; then + AC_CHECK_HEADERS(net/if_ppp.h, [has_ppp_header="true"], [has_ppp_header="false"]) + if test "$has_ppp_header" = "true"; then PLUGINS="$PLUGINS plugin_ppp.o" AC_DEFINE(PLUGIN_PPP,1,[ppp plugin]) else |