[Commit-gnue] gnue/objectserver configure.in server/Makefile.am

[Jade Meskill]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jade Meskill <address@hidden>   00/09/21 09:36:27

Modified files:
        objectserver   : configure.in 
        objectserver/server: Makefile.am 

Log message:
        Added checks for dotconf and configure will fail with an error if 
dotconf is not found.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/objectserver/configure.in.diff?r1=1.5&r2=1.6
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/objectserver/server/Makefile.am.diff?r1=1.2&r2=1.3

Patches:
Index: gnue/objectserver/configure.in
diff -u gnue/objectserver/configure.in:1.5 gnue/objectserver/configure.in:1.6
--- gnue/objectserver/configure.in:1.5  Thu Sep 21 08:59:01 2000
+++ gnue/objectserver/configure.in      Thu Sep 21 09:36:27 2000
@@ -47,11 +47,13 @@
 
 AC_DEFUN(PGSQL_INC_CHK,[if test -r $i$1/libpq-fe.h; then PGSQL_DIR=$i; 
PGSQL_INCDIR=$i$1])
 AC_DEFUN(MYSQL_INC_CHK,[if test -r $i$1/mysql.h; then MYSQL_DIR=$i; 
MYSQL_INCDIR=$i$1])
+AC_DEFUN(DOTCONF_INC_CHK,[if test -r $i$1/dotconf.h; then DOTCONF_DIR=$i; 
DOTCONF_INCDIR=$i$1])
 
 dnl Figure out the requested database
 
 if test "x$with_postgresql" == "x" && test "x$with_mysql" == "x"; then
-  AC_MSG_RESULT(***WARNING*** No database backend was selected.  Defaulting to 
MySQL.)
+  AC_MSG_RESULT([
+*** No database backend was selected.  Defaulting to MySQL.])
   with_postgresql="no"
   with_mysql="yes"
 fi
@@ -65,7 +67,8 @@
 fi
 
 if test "$with_postgresql" != "no" && test "$with_mysql" != "no"; then
-  AC_MSG_RESULT(***WARNING*** PostgreSQL and MySQL cannot both be selected.  
Defaulting to MySQL.)
+  AC_MSG_RESULT([
+*** PostgreSQL and MySQL cannot both be selected.  Defaulting to MySQL.])
   with_postgresql="no"
   with_mysql="yes"
 fi
@@ -114,7 +117,7 @@
 AC_ARG_WITH(mysql,
     [  --with-mysql=DIR       Use MySQL for data storage ],
     [ with_mysql=$withval ],
-    [ with_mysql=no ]
+    [ with_mysql=yes ]
     )
 if test "$with_mysql" != "no"; then
     for i in /usr /usr/local /usr/local/mysql $with_mysql; do
@@ -147,6 +150,42 @@
   AC_MSG_RESULT(no)
 fi
 
+dnl DOTCONF tests
+AC_MSG_CHECKING( for dotconf)
+AC_ARG_WITH(dotconf,
+    [  --with-dotconf=DIR       Dotconf location ],
+    [ with_dotconf=$withval ],
+    [ with_dotconf=yes ]
+    )
+if test "$with_dotconf" != "no"; then
+    for i in /usr /usr/local /usr/local/dotconf $with_dotconf; do
+        DOTCONF_INC_CHK(/include)
+        el[]DOTCONF_INC_CHK(/include/dotconf)
+       fi
+    done
+
+    if test -z "$DOTCONF_DIR"; then
+       AC_MSG_RESULT(Cannot find dotconf.h.  Please specify the installation 
path of dotconf)
+    else
+
+       DOTCONF_INCLUDE="-I$DOTCONF_INCDIR"
+
+       DOTCONF_LIBDIR=$DOTCONF_DIR/lib
+       test -d $DOTCONF_DIR/lib/dotconf && 
DOTCONF_LIBDIR=$DOTCONF_DIR/lib/dotconf
+
+       DOTCONF_CFLAGS="$DOTCONF_INCLUDE"
+       DOTCONF_LIBS="-L$DOTCONF_LIBDIR -ldotconf"
+  
+       AC_DEFINE(USE_DOTCONF,1,[ ])
+
+       AC_MSG_RESULT(found)
+    fi
+else
+  AC_MSG_RESULT(no)
+  AC_MSG_ERROR([
+dotconf not found.  Please download and install the latest dotconf from 
http://azzit.de/dotconf.])
+fi
+
 if test "x$DB_TYPE" == "x"; then
   AC_MSG_ERROR(No database backend was found.  Please check that you have the 
proper client libraries installed)
 fi
@@ -161,6 +200,8 @@
 AC_SUBST(POSTGRES_CFLAGS)
 AC_SUBST(MYSQL_LIBS)
 AC_SUBST(MYSQL_CFLAGS)
+AC_SUBST(DOTCONF_LIBS)
+AC_SUBST(DOTCONF_CFLAGS)
 
 AC_OUTPUT(Makefile \
          lib/Makefile \
Index: gnue/objectserver/server/Makefile.am
diff -u gnue/objectserver/server/Makefile.am:1.2 
gnue/objectserver/server/Makefile.am:1.3
--- gnue/objectserver/server/Makefile.am:1.2    Wed Sep 20 22:27:36 2000
+++ gnue/objectserver/server/Makefile.am        Thu Sep 21 09:36:27 2000
@@ -6,15 +6,16 @@
        -I$(top_builddir)/lib/ddlparse \
        $(GLIB_CFLAGS) \
        $(DB_CFLAGS)   \
-       $(ORBIT_CFLAGS)
+       $(ORBIT_CFLAGS) \
+       $(DOTCONF_CFLAGS)
 
 LDADD = \
         $(top_builddir)/lib/ddlparse/libddlparse.a \
        $(GLIB_LIBS)    \
        $(DB_LIBS)      \
        $(ORBIT_LIBS)   \
+       $(DOTCONF_LIBS) \
        -ll             \
-       -ldotconf       \
        -ldmalloc
 
 IDL_FILES = \
@@ -25,7 +26,6 @@
        $(top_builddir)/idl/typedefs.idl \
        $(top_builddir)/idl/exceptions.idl
 
-
 BUILT_SOURCES = gedi.h gedi-skels.c gedi-common.c 
 
 gedi.h gedi-skels.c gedi-common.c : $(IDL_FILES)
@@ -41,7 +41,6 @@
        objectdata.h    \
        gedi-implementation.h
 
-       
 bin_PROGRAMS  = gedi-server
 
 gedi_server_SOURCES =          \
@@ -56,7 +55,3 @@
         gedi-server.c          \
        impl-support.c          \
        gedi-implementation.c
-
-
-
-