gnue/geas configure.in

[Jade Meskill]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jade Meskill <address@hidden>   01/01/03 12:09:35

Modified files:
        geas           : configure.in 

Log message:
        allow multiple databases

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/geas/configure.in.diff?r1=1.2&r2=1.3

Patches:
Index: gnue/geas/configure.in
diff -u gnue/geas/configure.in:1.2 gnue/geas/configure.in:1.3
--- gnue/geas/configure.in:1.2  Thu Dec 21 20:27:40 2000
+++ gnue/geas/configure.in      Wed Jan  3 12:09:35 2001
@@ -43,33 +43,6 @@
 
 dnl Figure out the requested database
 
-if test "x$with_libgda" != "x" && test "$with_libgda" != "no"; then
-  with_postgresql="no"
-  with_mysql="no"
-fi
-
-if test "x$with_postgresql" = "x" && test "x$with_mysql" = "x" && test 
"x$with_libgda" = "x"; then
-  AC_MSG_RESULT([
-*** No database backend was selected.  Defaulting to MySQL.])
-  with_postgresql="no"
-  with_mysql="yes"
-fi
-
-if test "x$with_postgresql" = "x"; then
-  with_postgresql="no"
-fi
-
-if test "x$with_mysql" = "x" && test "$with_postresql" != "no"; then
-  with_mysql="no"
-fi
-
-if test "$with_postgresql" != "no" && test "$with_mysql" != "no"; then
-  AC_MSG_RESULT([
-*** PostgreSQL and MySQL cannot both be selected.  Defaulting to MySQL.])
-  with_postgresql="no"
-  with_mysql="yes"
-fi
-
 dnl postgresql tests
 AC_MSG_CHECKING( for use of postgresql)
 AC_ARG_WITH(postgresql,
@@ -100,8 +73,8 @@
        AC_DEFINE(USE_POSTGRESQL,1,[ ])
 
        DB_TYPE="postgresql"
-       DB_CFLAGS="$POSTGRES_CFLAGS -DUSE_POSTGRESQL"
-       DB_LIBS="$POSTGRES_LIBS"
+       DB_CFLAGS="$DB_CFLAGS $POSTGRES_CFLAGS -DUSE_POSTGRESQL"
+       DB_LIBS="$DB_LIBS $POSTGRES_LIBS"
 
        AC_MSG_RESULT(found)
     fi
@@ -114,7 +87,7 @@
 AC_ARG_WITH(mysql,
     [  --with-mysql=DIR       Use MySQL for data storage ],
     [ with_mysql=$withval ],
-    [ with_mysql=yes ]
+    [ with_mysql=no ]
     )
 if test "$with_mysql" != "no"; then
     for i in /usr /usr/local /usr/local/mysql $with_mysql; do
@@ -138,8 +111,8 @@
        AC_DEFINE(USE_MYSQL,1,[ ])
 
        DB_TYPE="mysql"
-       DB_CFLAGS="$MYSQL_CFLAGS -DUSE_MYSQL"
-       DB_LIBS="$MYSQL_LIBS"
+       DB_CFLAGS="$DB_CFLAGS $MYSQL_CFLAGS -DUSE_MYSQL"
+       DB_LIBS="$DB_LIBS $MYSQL_LIBS"
 
        AC_MSG_RESULT(found)
     fi
@@ -243,7 +216,7 @@
 fi
 
 idldir="\${prefix}/share/idl"
-ORBIT_IDL_MAKE_SKELETON_FLAGS = --skeleton-impl
+ORBIT_IDL_MAKE_SKELETON_FLAGS="--skeleton-impl"
 
 AC_SUBST(idldir)
 AC_SUBST(ORBIT_IDL)