gnue/geas configure.in src/Makefile.am

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/11/19 17:30:17

Modified files:
        geas           : configure.in 
        geas/src       : Makefile.am 

Log message:
        Made it possible to configure both C method support and Python method 
support.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/configure.in.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/Makefile.am.diff?tr1=1.44&tr2=1.45&r1=text&r2=text

Patches:
Index: gnue/geas/configure.in
diff -u gnue/geas/configure.in:1.53 gnue/geas/configure.in:1.54
--- gnue/geas/configure.in:1.53 Wed Nov 14 16:17:13 2001
+++ gnue/geas/configure.in      Mon Nov 19 17:30:17 2001
@@ -17,6 +17,9 @@
 AM_PATH_PYTHON(module)
 AM_CHECK_PYMOD(CORBA)
 AM_CHECK_PYTHON_HEADERS
+PYTHON_CFLAGS="${PYTHON_INCLUDES}"
+PYTHON_LIBS="-lpython${PYTHON_VERSION} -lpthread"
+dnl TODO: we need better python checks! Maybe look at the one from orbit-python
 dnl libuuid needs the socket library on solaris
 AC_CHECK_LIB(socket,socket,[SOCKET_LIB=-lsocket],[SOCKET_LIB=""])
 AC_SUBST(SOCKET_LIB)
@@ -137,7 +140,49 @@
 fi
 
 dnl ===========================================================================
+dnl Figure out the method support drivers to compile
+dnl ===========================================================================
+
+METHOD_CFLAGS=
+METHOD_LIBS=
+
+dnl ---------------------------------------------------------------------------
+dnl C
+dnl ---------------------------------------------------------------------------
+AC_MSG_CHECKING(whether to enable C method support)
+AC_ARG_ENABLE(c-methods,
+              [  --enable-c-methods      support methods written in C],,
+              enable_c_methods=yes)
+if test ${enable_c_methods} != "no"; then
+  # no additional CFLAGS and LIBS are needed, since we depend on glib anyway.
+  # METHOD_CFLAGS="${METHOD_CFLAGS}"
+  # METHOD_LIBS="${METHOD_LIBS}"
+  AC_DEFINE(USE_GLIBMODULE_METHODS,1,Define to compile C method support)
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
+
+dnl ---------------------------------------------------------------------------
+dnl Python
+dnl ---------------------------------------------------------------------------
+AC_MSG_CHECKING(whether to enable Python method support)
+AC_ARG_ENABLE(python-methods,
+              [  --enable-python-methods support methods written in Python],,
+              enable_python_methods=yes)
+dnl TODO: default of this option should depend on whether the python
+dnl       development libraries are installed or not
+if test ${enable_python_methods} != "no"; then
+  METHOD_CFLAGS="${METHOD_CFLAGS} ${PYTHON_CFLAGS}"
+  METHOD_LIBS="${METHOD_LIBS} ${PYTHON_LIBS}"
+  AC_DEFINE(USE_PYTHON_METHODS,1,Define to compile Python method support)
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
 
+dnl ===========================================================================
+
 dnl MAX_DATABASE_CONNECTIONS tests
 AC_MSG_CHECKING( whether to enable max database connections limit)
 AC_ARG_ENABLE(max-database-connections,
@@ -223,34 +268,6 @@
   AC_MSG_RESULT(no)
 fi
 
-dnl METHODS tests
-AC_MSG_CHECKING( Method system to use)
-AC_ARG_ENABLE(methods,
-    [  --enable-methods=[gmodule|python]       gmodule or python ],
-    [ methods=$enableval ],
-    [ methods=yes ]
-    )
-if test "$methods" = "gmodule"; then
-       AC_DEFINE(USE_GLIBMODULE_METHODS,1,[ ])
-       METHOD_LIBS=""
-       METHOD_CFLAGS=""
-       AC_MSG_RESULT(gmodule)
-elif test "$methods" = "python"; then
-       AC_DEFINE(USE_PYTHON_METHODS,1,[ ])
-       PYTHON_CFLAGS="${PYTHON_INCLUDES}"
-       PYTHON_LIBS="-lpython${PYTHON_VERSION} -lpthread"
-       METHOD_CFLAGS="${PYTHON_CFLAGS}"
-       METHOD_LIBS="${PYTHON_LIBS}"
-       AC_MSG_RESULT(python)
-dnl TODO: better python tests, probably in a macro
-else
-       AC_DEFINE(USE_GLIBMODULE_METHODS,1,[ ])
-       METHOD_LIBS=""
-       METHOD_CFLAGS=""
-       AC_MSG_RESULT(unknown - defaulting to gmodule)
-fi
-
-
 dnl DEBUG_SECURITY tests
 AC_MSG_CHECKING( whether to enable security debugging code)
 AC_ARG_ENABLE(debug-security,
@@ -342,3 +359,14 @@
        src/methods/Makefile     \
        tools/Makefile
 )
+
+dnl ---------------------------------------------------------------------------
+dnl Issue warning if no method support was configured
+dnl ---------------------------------------------------------------------------
+if test "${enable_c_methods}" = "no" -a "${enable_python_methods}" = "no"; then
+  echo "    ******************************************************************"
+  echo "    * WARNING: You configured GEAS with no methods support.  This is *"
+  echo "    * very likely to not be what you want.  Please double-check your *"
+  echo "    * --enable-*-methods and --disable-*-methods parameters.         *"
+  echo "    ******************************************************************"
+fi
Index: gnue/geas/src/Makefile.am
diff -u gnue/geas/src/Makefile.am:1.44 gnue/geas/src/Makefile.am:1.45
--- gnue/geas/src/Makefile.am:1.44      Sat Sep 15 06:30:21 2001
+++ gnue/geas/src/Makefile.am   Mon Nov 19 17:30:17 2001
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.44 2001/09/15 10:30:21 reinhard Exp $
+## $Id: Makefile.am,v 1.45 2001/11/19 22:30:17 reinhard Exp $
 
 SUBDIRS        = classdef config objectstore oql objectcache methods 
datamonitor
 
@@ -6,12 +6,6 @@
 
 bin_PROGRAMS = geas-server
 
-# temporary, really - just while the python interpreter is in GEAS
-# PYTHON_CFLAGS= $(PYTHON_INCLUDES)
-# PYTHON_LIBS= -lpython1.5
-# PYTHON_CFLAGS= -DNO_USE_PYTHON
-# PYTHON_LIBS= 
-
 MODULES = $(top_builddir)/src/config/libconfig.a \
           $(top_builddir)/src/oql/liboql.a \
           $(top_builddir)/src/objectcache/libobjectcache.a \
@@ -24,9 +18,7 @@
            -DGEAS_PID_DIR=\"$(localstatedir)/run\" \
            -DGEAS_IOR_DIR=\"$(localstatedir)/run\" \
            $(GLIB_CFLAGS) \
-           $(DB_CFLAGS) \
            $(ORBIT_CFLAGS) \
-           $(PYTHON_CFLAGS) \
            -I$(top_srcdir)/src/ \
            -I$(top_srcdir)/lib/classdefs
 
@@ -35,10 +27,10 @@
         -luuid \
         $(SOCKET_LIB) \
         $(GLIB_LIBS) \
-        $(DB_LIBS) \
         $(ORBIT_LIBS) \
         $(NAMESERVICE_LIBS) \
-        $(PYTHON_LIBS)
+        $(DB_LIBS) \
+        $(METHOD_LIBS)
 
 geas_srvr_headers = \
        geas-server.h           \