Added config.h header and with-python configure option

git-svn-id: http://abstrakraft.org/cwiid/svn/trunk@137 918edb2d-ff29-0410-9de2-eb38e7f22bc7

Author: abstrakraft

ChangeLog

@@ -1,3 +1,18 @@
+2007-07-28 L. Donnie Smith <cwiid@abstrakraft.org>
+	configure.ac
+	* added config.h header
+	* added with-python argument and associated logic
+
+	lswm
+	* added config.h include for sources requiring defs
+
+	wmgui
+	* added config.h include for sources requiring defs
+
+	wminput
+	* added config.h include for sources requiring defs
+	* added HAVE_PYTHON tests around all python code
+
 2007-06-28 L. Donnie Smith <cwiid@abstrakraft.org>
 	libcwiid
 	* changed version

Makefile.in

@@ -5,7 +5,9 @@ include @top_builddir@/defs.mak
 LIB_DIRS = libcwiid
 BIN_DIRS = wmgui wminput lswm
 DOC_DIRS = man doc
+ifdef PYTHON
 BIND_DIRS = python
+endif
 
 SUB_DIRS = $(LIB_DIRS) $(BIN_DIRS) $(DOC_DIRS) $(BIND_DIRS) wmdemo
 
@@ -38,7 +40,7 @@ $(CWIID_PLUGINS_DIR):
 
 distclean:
 	rm -rf Makefile config.log config.status autom4te.cache \
-		defs.mak $(COMMON)/include/lib.mak
+		defs.mak $(COMMON)/include/lib.mak $(COMMON)/include/config.h
 
 uninstall:
 	rm -r $(CWIID_PLUGINS_DIR); true

common/include/config.h.in

@@ -0,0 +1,68 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <bluetooth/hci.h> header file. */
+#undef HAVE_BLUETOOTH_HCI_H
+
+/* Define to 1 if you have the <bluetooth/l2cap.h> header file. */
+#undef HAVE_BLUETOOTH_L2CAP_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `bluetooth' library (-lbluetooth). */
+#undef HAVE_LIBBLUETOOTH
+
+/* Define to 1 if you have the `dl' library (-ldl). */
+#undef HAVE_LIBDL
+
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+#undef HAVE_LIBPTHREAD
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if python support is enabled */
+#undef HAVE_PYTHON
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+   `char[]'. */
+#undef YYTEXT_POINTER

configure.ac

@@ -1,4 +1,8 @@
 # ChangeLog:
+# 2007-07-28 L. Donnie Smith <cwiid@abstrakraft.org>
+# * added config.h header
+# * added with-python argument and associated logic
+#
 # 2007-05-30 L. Donnie Smith <cwiid@abstrakraft.org>
 # * added python/Makefile
 # * added PYTHON_VERSION variable
@@ -21,6 +25,7 @@
 # * Check for stdint.h
 
 AC_INIT(CWiid,0.6.00_rc2,cwiid@abstrakraft.org)
+AC_CONFIG_HEADER(common/include/config.h)
 
 AC_PROG_CC
 AC_PROG_AWK
@@ -36,8 +41,36 @@ if test "$YACC" != "bison -y"; then
 	AC_MSG_ERROR([bison not found])
 fi
 
-PYTHON_VERSION=[`python -c 'import sys; print sys.version[:3]'`]
-AC_SUBST(PYTHON_VERSION)
+AC_ARG_WITH(
+	[python],
+	[AS_HELP_STRING([--without-python],[compile without python support])],
+	[case $withval in 
+		yes)
+			REQUIRE_PYTHON=1
+			PYTHON_NAME=python
+		;;
+		no)
+			REQUIRE_PYTHON=
+			PYTHON_NAME=
+		;;
+		*)
+			REQUIRE_PYTHON=1
+			PYTHON_NAME=$withval
+		;;
+	esac],
+	[REQUIRE_PYTHON=1; PYTHON_NAME=python])
+if test $REQUIRE_PYTHON; then
+	AC_CHECK_PROGS([PYTHON],$PYTHON_NAME)
+	if test $REQUIRE_PYTHON -a ! $PYTHON; then
+		AC_MSG_ERROR([$PYTHON_NAME not found])
+	fi
+fi
+AC_SUBST(PYTHON)
+if test $PYTHON; then
+	PYTHON_VERSION=[`$PYTHON -c 'import sys; print sys.version[:3]'`]
+	AC_SUBST(PYTHON_VERSION)
+	AC_DEFINE([HAVE_PYTHON],1,[Define to 1 if python support is enabled])
+fi
 
 AC_CHECK_LIB([pthread], [pthread_create],,
 	AC_MSG_ERROR([pthread library not found]))

defs.mak.in

@@ -20,6 +20,7 @@ CC = @CC@
 AWK = @AWK@
 LEX = @LEX@
 YACC = @YACC@
+PYTHON = @PYTHON@
 
 COMMON = @abs_top_builddir@/common
 
@@ -32,4 +33,4 @@ CWIID_PLUGINS_DIR = $(ROOTDIR)@CWIID_PLUGINS_DIR@
 
 DEBUGFLAGS = -g
 WARNFLAGS = -Wall -W
-CFLAGS = $(DEBUGFLAGS) $(WARNFLAGS)
+CFLAGS = $(DEBUGFLAGS) $(WARNFLAGS) @DEFS@ -I$(COMMON)/include

lswm/Makefile.in

@@ -6,7 +6,7 @@ APP_NAME = lswm
 
 SOURCES = lswm.c
 
-CFLAGS += -I@top_builddir@/libcwiid -DCWIID_VERSION=\"${PACKAGE_VERSION}\"
+CFLAGS += -I@top_builddir@/libcwiid
 LDFLAGS += -L@top_builddir@/libcwiid
 LDLIBS += -lcwiid
 INST_DIR = @bindir@

lswm/lswm.c

@@ -15,6 +15,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *  ChangeLog:
+ *  2007-07-28 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * added config.h include
+ *  * use PACKAGE_VERSION from config.h instead of CWIID_VERSION
+ *
  *  2007-06-01 Nick <nickishappy@gmail.com>
  *  * reworked command-line options (added standard options, long options)
  *
@@ -28,6 +32,10 @@
  *  * created file
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -90,7 +98,7 @@ int main(int argc, char *argv[])
 			long_format = 1;
 			break;
 		case 'v':
-			printf("CWiid Version %s\n", CWIID_VERSION);
+			printf("CWiid Version %s\n", PACKAGE_VERSION);
 			return 0;
 			break;
 		case 'q':

python/Makefile.in

@@ -7,10 +7,10 @@ ifdef ROOTDIR
 endif
 
 all:
-	python setup.py build_ext $(DEBUGFLAGS) -I@top_builddir@/libcwiid -L@top_builddir@/libcwiid -lcwiid
+	$(PYTHON) setup.py build_ext $(DEBUGFLAGS) -I@top_builddir@/libcwiid -L@top_builddir@/libcwiid -lcwiid
 
 install:
-	python setup.py install --prefix=${prefix} $(SET_ROOT_DIR)
+	$(PYTHON) setup.py install --prefix=${prefix} $(SET_ROOT_DIR)
 
 uninstall:
 	rm -f $(ROOTDIR)${prefix}/lib/python@PYTHON_VERSION@/site-packages/cwiid.so

wmgui/Makefile.in

@@ -6,8 +6,7 @@ APP_NAME = wmgui
 
 SOURCES = main.c interface.c support.c
 
-CFLAGS += @GTK_CFLAGS@ -I@top_builddir@/libcwiid \
-	-DCWIID_VERSION=\"${PACKAGE_VERSION}\"
+CFLAGS += @GTK_CFLAGS@ -I@top_builddir@/libcwiid
 LDFLAGS += -L@top_builddir@/libcwiid
 LDLIBS += @GTK_LIBS@ -lm -lcwiid
 INST_DIR = @bindir@

wmgui/main.c

@@ -15,6 +15,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *  ChangeLog:
+ *  2007-07-28 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * added config.h include
+ *  * use PACKAGE_VERSION from config.h instead of CWIID_VERSION
+ *
  *  2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
  *  * changed cwiid_{connect,disconnect,command} to
  *    cwiid_{open,close,request_status|set_led|set_rumble|set_rpt_mode}
@@ -43,7 +47,12 @@
  *  * type audit (stdint, const, char booleans)
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #define APP_NAME		"CWiid wmgui"
+#define APP_VERSION		PACKAGE_VERSION
 #define APP_COPYRIGHT	"Copyright (C) 2007 L. Donnie Smith " \
                         "<cwiid@abstrakraft.org>"
 #define APP_COMMENTS	"Wiimote GUI"
@@ -696,7 +705,7 @@ void menuAbout_activate(void)
 {
 	gtk_show_about_dialog(GTK_WINDOW(winMain),
 	                      "name", APP_NAME,
-	                      "version", CWIID_VERSION,
+	                      "version", APP_VERSION,
 	                      "copyright", APP_COPYRIGHT,
 	                      "comments", APP_COMMENTS,
 	                      NULL);

wminput/Makefile.in

@@ -4,20 +4,30 @@ include @top_builddir@/defs.mak
 
 APP_NAME = wminput
 
-SOURCES = main.c conf.c c_plugin.c py_plugin.c uinput.c action_enum.c parser.c \
-	lexer.c util.c
+SOURCES = main.c conf.c c_plugin.c uinput.c action_enum.c util.c
+#kludge to make sure YACC/LEX sources are listed last, otherwise we get errors
+#when building dependencies
+LAST_SOURCES = parser.c lexer.c
 
 WMINPUT_CONFIG_DIR = $(CWIID_CONFIG_DIR)/wminput
-CFLAGS += -I@top_builddir@/libcwiid -I/usr/include/python@PYTHON_VERSION@ \
+CFLAGS += -I@top_builddir@/libcwiid \
 	-DWMINPUT_CONFIG_DIR=\"$(WMINPUT_CONFIG_DIR)\" \
-	-DCWIID_PLUGINS_DIR=\"$(CWIID_PLUGINS_DIR)\" \
- 	-DCWIID_VERSION=\"${PACKAGE_VERSION}\"
-LDLIBS += -lcwiid -ldl -lpython@PYTHON_VERSION@
+	-DCWIID_PLUGINS_DIR=\"$(CWIID_PLUGINS_DIR)\"
+
+LDLIBS += -lcwiid -ldl
 LDFLAGS += -L@top_builddir@/libcwiid -rdynamic
 INST_DIR = @bindir@
 
 YFLAGS += -d
 
+ifdef PYTHON
+	SOURCES += py_plugin.c
+	CFLAGS += -I/usr/include/python@PYTHON_VERSION@
+	LDLIBS += -lpython@PYTHON_VERSION@
+endif
+
+SOURCES += $(LAST_SOURCES)
+
 include $(COMMON)/include/app.mak
 
 all install clean distclean uninstall: make_plugins

wminput/conf.c

@@ -15,6 +15,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *  ChangeLog:
+ *  2007-07-28 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * added config.h include
+ *  * added HAVE_PYTHON tests around all python code
+ *
  *  2007-06-18 L. Donnie Smith <cwiid@abstrakraft.org>
  *  * revised error messages
  *
@@ -40,6 +44,10 @@
  *  * type audit (stdint, const, char booleans)
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -49,7 +57,9 @@
 #include "util.h"
 #include "y.tab.h"
 #include "c_plugin.h"
+#ifdef HAVE_PYTHON
 #include "py_plugin.h"
+#endif
 
 extern FILE *yyin;
 extern int yyparse();
@@ -98,9 +108,11 @@ int conf_unload(struct conf *conf)
 			case PLUGIN_C:
 				c_plugin_close(&conf->plugins[i]);
 				break;
+#ifdef HAVE_PYTHON
 			case PLUGIN_PYTHON:
 				py_plugin_close(&conf->plugins[i]);
 				break;
+#endif
 			}
 		}
 	}
@@ -345,11 +357,13 @@ int conf_plugin_param_int(struct conf *conf, const char *name,
 			return -1;
 		}
 		break;
+#ifdef HAVE_PYTHON
 	case PLUGIN_PYTHON:
 		if (py_plugin_param_int(plugin, i, value)) {
 			return -1;
 		}
 		break;
+#endif
 	}
 
 	return 0;
@@ -384,11 +398,13 @@ int conf_plugin_param_float(struct conf *conf, const char *name,
 			return -1;
 		}
 		break;
+#ifdef HAVE_PYTHON
 	case PLUGIN_PYTHON:
 		if (py_plugin_param_float(plugin, i, value)) {
 			return -1;
 		}
 		break;
+#endif
 	}
 
 	return 0;
@@ -595,10 +611,12 @@ struct plugin *get_plugin(struct conf *conf, const char *name)
 			plugin_found = 1;
 			break;
 		}
+#ifdef HAVE_PYTHON
 		if (!py_plugin_open(plugin, conf->plugin_search_dirs[i])) {
 			plugin_found = 1;
 			break;
 		}
+#endif
 	}
 
 	if (!plugin_found) {