Changeset 857
- Timestamp:
- 03/03/08 17:55:44 (9 months ago)
- Location:
- trunk
- Files:
-
- 3 modified
-
Makefile.am (modified) (1 diff)
-
plugin.c (modified) (3 diffs)
-
plugins.m4 (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile.am
r855 r857 109 109 \ 110 110 plugin_apm.c \ 111 plugin_button_exec.c \ 111 112 plugin_cpuinfo.c \ 112 113 plugin_diskstats.c \ -
trunk/plugin.c
r840 r857 101 101 int plugin_init_sample(void); 102 102 void plugin_exit_sample(void); 103 int plugin_init_button_exec(void); 104 void plugin_exit_button_exec(void); 103 105 int plugin_init_seti(void); 104 106 void plugin_exit_seti(void); … … 190 192 plugin_init_sample(); 191 193 #endif 194 #ifdef PLUGIN_BUTTON_EXEC 195 plugin_init_button_exec(); 196 #endif 192 197 #ifdef PLUGIN_SETI 193 198 plugin_init_seti(); … … 280 285 #ifdef PLUGIN_SAMPLE 281 286 plugin_exit_sample(); 287 #endif 288 #ifdef PLUGIN_BUTTON_EXEC 289 plugin_exit_button_exec(); 282 290 #endif 283 291 #ifdef PLUGIN_SETI -
trunk/plugins.m4
r854 r857 55 55 all) 56 56 PLUGIN_APM="yes" 57 PLUGIN_BUTTON_EXEC="yes" 57 58 PLUGIN_CPUINFO="yes" 58 59 PLUGIN_DISKSTATS="yes" … … 86 87 PLUGIN_APM=$val 87 88 ;; 89 button_exec) 90 PLUGIN_BUTTON_EXEC=$val 91 ;; 88 92 cpuinfo) 89 93 PLUGIN_CPUINFO=$val … … 177 181 PLUGINS="$PLUGINS plugin_apm.o" 178 182 AC_DEFINE(PLUGIN_APM,1,[apm plugin]) 183 fi 184 if test "$PLUGIN_BUTTON_EXEC" = "yes"; then 185 PLUGINS="$PLUGINS plugin_button_exec.o" 186 AC_DEFINE(PLUGIN_BUTTON_EXEC,1,[button_exec plugin]) 179 187 fi 180 188 if test "$PLUGIN_CPUINFO" = "yes"; then … … 224 232 fi 225 233 if test "$PLUGIN_ICONV" = "yes"; then 226 AM_ICONV234 dnl AM_ICONV 227 235 if test "$am_cv_func_iconv" = "yes"; then 228 236 PLUGINS="$PLUGINS plugin_iconv.o"
