aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael <michael@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2008-12-31 06:34:15 +0000
committermichael <michael@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2008-12-31 06:34:15 +0000
commit10ec19da9f09bf767603b86dd44a282b4ddc78f9 (patch)
tree1c3feb113f5ec3312c7c749ddef34c5e979d54e4
parent9798fe8cbee8d9b26fdbd5167f2b46be574ec140 (diff)
downloadlcd4linux-10ec19da9f09bf767603b86dd44a282b4ddc78f9.tar.gz
ported r839 from volker_dev
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@927 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
-rw-r--r--config.h.in3
-rwxr-xr-xconfigure60
-rw-r--r--drivers.m411
-rw-r--r--evaluator.c10
-rw-r--r--plugins.m413
5 files changed, 88 insertions, 9 deletions
diff --git a/config.h.in b/config.h.in
index b1aab44..6ec9872 100644
--- a/config.h.in
+++ b/config.h.in
@@ -347,6 +347,9 @@
/* netdev plugin */
#undef PLUGIN_NETDEV
+/* netinfo plugin */
+#undef PLUGIN_NETINFO
+
/* POP3 plugin */
#undef PLUGIN_POP3
diff --git a/configure b/configure
index a739d5e..f5e6726 100755
--- a/configure
+++ b/configure
@@ -1351,6 +1351,8 @@ Optional Packages:
--with-plugins=<list> choose which plugins to compile.
type --with-plugins=list for a list
of avaible plugins
+ plugins may be excluded with 'all,!<plugin>',
+ (try 'all,\!<plugin>' if your shell complains...)
--with-gnu-ld assume the C compiler uses GNU ld default=no
--with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
--without-libiconv-prefix don't search for libiconv in includedir and libdir
@@ -4445,7 +4447,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 4448 "configure"
+#line 4450 "configure"
#include "confdefs.h"
#ifdef RENAMED_NCURSES
#include <curses.h>
@@ -8525,6 +8527,23 @@ if test "$LIBFTDI" = "yes"; then
DRVLIBS="$DRVLIBS -lftdi"
fi
+if test "$DRIVERS" = ""; then
+ { { echo "$as_me:$LINENO: error: You should include at least one driver..." >&5
+echo "$as_me: error: You should include at least one driver..." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ { echo "$as_me:$LINENO: result: -----------------------------------------
+including drivers:
+ $DRIVERS
+-----------------------------------------
+ " >&5
+echo "${ECHO_T}-----------------------------------------
+including drivers:
+ $DRIVERS
+-----------------------------------------
+ " >&6; }
+fi
+
@@ -8561,8 +8580,14 @@ for plugin in $plugins; do
case "$plugin" in
list)
- { echo "$as_me:$LINENO: result: TO BE DONE..." >&5
-echo "${ECHO_T}TO BE DONE..." >&6; }
+ { echo "$as_me:$LINENO: result: available plugins:
+ apm,cpuinfo,diskstats,dvb,exec,file,gps,i2c_sensors,iconv,imon,isdn,kvv,
+ loadavg,meminfo,mpd,mysql,netdev,netinfo,pop3,ppp,proc_stat,sample,seti,
+ statfs,uname,uptime,wireless,xmms" >&5
+echo "${ECHO_T}available plugins:
+ apm,cpuinfo,diskstats,dvb,exec,file,gps,i2c_sensors,iconv,imon,isdn,kvv,
+ loadavg,meminfo,mpd,mysql,netdev,netinfo,pop3,ppp,proc_stat,sample,seti,
+ statfs,uname,uptime,wireless,xmms" >&6; }
{ { echo "$as_me:$LINENO: error: run ./configure --with-plugins=..." >&5
echo "$as_me: error: run ./configure --with-plugins=..." >&2;}
{ (exit 1); exit 1; }; }
@@ -8589,6 +8614,7 @@ echo "$as_me: error: run ./configure --with-plugins=..." >&2;}
PLUGIN_MPD="yes"
PLUGIN_MYSQL="yes"
PLUGIN_NETDEV="yes"
+ PLUGIN_NETINFO="yes"
PLUGIN_POP3="yes"
PLUGIN_PPP="yes"
PLUGIN_PROC_STAT="yes"
@@ -8665,6 +8691,9 @@ echo "$as_me: error: run ./configure --with-plugins=..." >&2;}
netdev)
PLUGIN_NETDEV=$val
;;
+ netinfo)
+ PLUGIN_NETINFO=$val
+ ;;
pop3)
PLUGIN_POP3=$val
;;
@@ -11204,7 +11233,7 @@ echo "$as_me: WARNING: mysql/mysql.h header not found: mysql plugin disabled" >&
fi
fi
-# network device
+# /proc/net/dev
if test "$PLUGIN_NETDEV" = "yes"; then
PLUGINS="$PLUGINS plugin_netdev.o"
@@ -11214,6 +11243,16 @@ _ACEOF
fi
+# configuration of network devices
+if test "$PLUGIN_NETINFO" = "yes"; then
+ PLUGINS="$PLUGINS plugin_netinfo.o"
+
+cat >>confdefs.h <<\_ACEOF
+#define PLUGIN_NETINFO 1
+_ACEOF
+
+fi
+
# POP3
if test "$PLUGIN_POP3" = "yes"; then
PLUGINS="$PLUGINS plugin_pop3.o"
@@ -11805,8 +11844,17 @@ 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)
+else
+ { echo "$as_me:$LINENO: result: -----------------------------------------
+including plugins:
+ $PLUGINS
+-----------------------------------------
+ " >&5
+echo "${ECHO_T}-----------------------------------------
+including plugins:
+ $PLUGINS
+-----------------------------------------
+ " >&6; }
fi
diff --git a/drivers.m4 b/drivers.m4
index 2114ffa..f42e136 100644
--- a/drivers.m4
+++ b/drivers.m4
@@ -697,5 +697,16 @@ if test "$LIBFTDI" = "yes"; then
DRVLIBS="$DRVLIBS -lftdi"
fi
+if test "$DRIVERS" = ""; then
+ AC_MSG_ERROR([You should include at least one driver...])
+else
+ AC_MSG_RESULT(
+[-----------------------------------------]
+[including drivers:]
+[ $DRIVERS]
+[-----------------------------------------]
+ )
+fi
+
AC_SUBST(DRIVERS)
AC_SUBST(DRVLIBS)
diff --git a/evaluator.c b/evaluator.c
index c4dc78c..6a99041 100644
--- a/evaluator.c
+++ b/evaluator.c
@@ -100,6 +100,16 @@ typedef enum {
T_FUNCTION
} TOKEN;
+static char *tokenNames[] = {
+ "undef",
+ "Name",
+ "Number",
+ "String",
+ "Operator",
+ "Variable",
+ "Function"
+};
+
typedef enum {
O_UNDEF, /* undefined */
O_LST, /* expression lists */
diff --git a/plugins.m4 b/plugins.m4
index c2c5095..61802e8 100644
--- a/plugins.m4
+++ b/plugins.m4
@@ -28,7 +28,9 @@ AC_ARG_WITH(
plugins,
[ --with-plugins=<list> choose which plugins to compile.]
[ type --with-plugins=list for a list]
- [ of avaible plugins],
+ [ of avaible plugins]
+ [ plugins may be excluded with 'all,!<plugin>',]
+ [ (try 'all,\!<plugin>' if your shell complains...)],
plugins=$withval,
plugins=all
)
@@ -490,8 +492,13 @@ fi
if test "$PLUGINS" = ""; then
AC_MSG_ERROR([You should include at least one plugin...])
-#else
-# AC_MSG_ERROR($PLUGINS)
+else
+ AC_MSG_RESULT(
+[-----------------------------------------]
+[including plugins:]
+[ $PLUGINS]
+[-----------------------------------------]
+ )
fi
AC_SUBST(PLUGINS)