[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/geas TODO autogen.sh configure.in doc/over...
|
From: |
Reinhard Mueller |
|
Subject: |
gnue/geas TODO autogen.sh configure.in doc/over... |
|
Date: |
Wed, 20 Jun 2001 15:26:23 -0700 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Reinhard Mueller <address@hidden> 01/06/20 15:26:23
Modified files:
geas : TODO autogen.sh configure.in
geas/doc : overview.txt
geas/doc/internals: objectstore.txt
geas/src : geas-server.c
geas/src/objectstore: objectstore.c
Removed files:
geas : CVSVERSION
Log message:
Cleaned up configure.in; removed references to libgda everywhere
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/TODO.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/autogen.sh.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/configure.in.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/doc/overview.txt.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/doc/internals/objectstore.txt.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/geas-server.c.diff?tr1=1.104&tr2=1.105&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/objectstore/objectstore.c.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
Patches:
Index: gnue/geas/TODO
diff -u gnue/geas/TODO:1.57 gnue/geas/TODO:1.58
--- gnue/geas/TODO:1.57 Wed Jun 20 13:25:16 2001
+++ gnue/geas/TODO Wed Jun 20 15:26:23 2001
@@ -113,8 +113,8 @@
objectstore.c functions changed to produce an OQL query structure
directly, and then call the execute SQL function
2) the query_result structure needs to be a separate 'object' and both
- MySQl and PostgreSQL code (and libGDA code, when written) should
- be changed to not access any members of the structure directly.
+ MySQl and PostgreSQL code should be changed to not access any members
+ of the structure directly.
possibly even allow database specific version, which store the data
returned from the database immediately, and use database API
functions to access the data. (this would potentially resulot in an
Index: gnue/geas/autogen.sh
diff -u gnue/geas/autogen.sh:1.1 gnue/geas/autogen.sh:1.2
--- gnue/geas/autogen.sh:1.1 Tue Dec 19 19:08:14 2000
+++ gnue/geas/autogen.sh Wed Jun 20 15:26:23 2001
@@ -138,7 +138,7 @@
fi
done
-conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
+conf_flags="--enable-maintainer-mode --enable-more-warnings"
if test x$NOCONFIGURE = x; then
echo Running $srcdir/configure $conf_flags "$@" ...
Index: gnue/geas/configure.in
diff -u gnue/geas/configure.in:1.36 gnue/geas/configure.in:1.37
--- gnue/geas/configure.in:1.36 Wed Jun 13 15:15:08 2001
+++ gnue/geas/configure.in Wed Jun 20 15:26:23 2001
@@ -1,32 +1,18 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(lib/)
-AM_CONFIG_HEADER(config.h)
-
AC_PREREQ(2.13)
+AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(geas, 0.0.5)
AM_MAINTAINER_MODE
dnl Checks for programs.
-AC_ISC_POSIX
-AC_PROG_CC
-AC_ARG_PROGRAM
+AC_PROG_LN_S
+AC_PROG_INSTALL
AC_PROG_AWK
-dnl AC_DECL_YYTEXT
-AM_PROG_LEX
+AC_PROG_CC
AC_PROG_YACC
+AM_PROG_LEX
AM_PROG_LIBTOOL
-AC_PROG_INSTALL
-AC_PROG_LN_S
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-AC_CHECK_HEADERS(sys/types.h)
-AC_CHECK_HEADERS(uuid/uuid.h,,AC_MSG_ERROR('You need the uuid library') )
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
dnl Checks for libraries.
AM_PATH_GLIB(1.2.0,,,gmodule)
@@ -35,133 +21,116 @@
AM_CHECK_PYMOD(CORBA)
AM_CHECK_PYTHON_HEADERS
+dnl Checks for header files.
+AC_HEADER_STDC
+AC_HEADER_DIRENT
+AC_CHECK_HEADERS(limits.h malloc.h sys/time.h unistd.h)
+AC_CHECK_HEADERS(uuid/uuid.h,,AC_MSG_ERROR('You need the uuid library'))
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_SIZE_T
+AC_HEADER_TIME
+AC_STRUCT_TM
+
dnl Checks for library functions.
+AC_TYPE_SIGNAL
+AC_FUNC_STRFTIME
+AC_FUNC_VPRINTF
+
+dnl ===========================================================================
+dnl Figure out the database drivers to compile
+dnl ===========================================================================
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(LIBGDA_INC_CHK,[if test -r $i$1/gda.h; then LIBGDA_DIR=$i;
LIBGDA_INCDIR=$i$1])
-dnl Figure out the requested database
-
-dnl goat tests
-AC_MSG_CHECKING( for goat feed)
-AC_MSG_RESULT(yes)
-
-dnl postgresql tests
-AC_MSG_CHECKING( for use of postgresql)
+dnl ---------------------------------------------------------------------------
+dnl PostgreSQL
+dnl ---------------------------------------------------------------------------
+AC_MSG_CHECKING(for PostgreSQL)
AC_ARG_WITH(postgresql,
- [ --with-postgresql=DIR Use PostgreSQL for data storage ],
- [ with_postgresql=$withval ],
- [ with_postgresql=no ]
- )
-if test "$with_postgresql" != "no"; then
- for i in /usr /usr/local /usr/local/pgsql $with_postgresql; do
- PGSQL_INC_CHK(/include)
- el[]PGSQL_INC_CHK(/include/pgsql)
- el[]PGSQL_INC_CHK(/include/postgresql)
- fi
- done
-
- if test -z "$PGSQL_DIR"; then
- AC_MSG_RESULT(Cannot find libpq-fe.h. Please specify the installation
path of PostgreSQL)
- else
-
- PGSQL_INCLUDE="-I$PGSQL_INCDIR"
+ [ --with-postgresql[=DIR] use PostgreSQL database])
- PGSQL_LIBDIR=$PGSQL_DIR/lib
- test -d $PGSQL_DIR/lib/pgsql && PGSQL_LIBDIR=$PGSQL_DIR/lib/pgsql
-
- POSTGRES_CFLAGS="$PGSQL_INCLUDE"
- POSTGRES_LIBS="-L$PGSQL_LIBDIR -lpq"
-
- AC_DEFINE(USE_POSTGRESQL,1,[ ])
-
- DB_TYPE="postgresql"
- DB_CFLAGS="$DB_CFLAGS $POSTGRES_CFLAGS"
- DB_LIBS="$DB_LIBS $POSTGRES_LIBS"
+if test "$with_postgresql" != "no"; then
+ for i in /usr /usr/local /usr/local/pgsql /usr/lib/pgsql $with_postgresql; do
+ PGSQL_INC_CHK(/include)
+ el[]PGSQL_INC_CHK(/include/pgsql)
+ el[]PGSQL_INC_CHK(/include/postgresql)
+ fi
+ done
- AC_MSG_RESULT(found)
+ if test -z "$PGSQL_DIR"; then
+ AC_MSG_RESULT(no)
+ if test "$with_postgresql"; then
+ AC_MSG_ERROR(Cannot find libpq-fe.h. Please specify the installation
path of PostgreSQL)
fi
+ else
+ PGSQL_INCLUDE="-I$PGSQL_INCDIR"
+ PGSQL_LIBDIR=$PGSQL_DIR/lib
+ test -d $PGSQL_DIR/lib/pgsql && PGSQL_LIBDIR=$PGSQL_DIR/lib/pgsql
+ POSTGRES_CFLAGS="$PGSQL_INCLUDE"
+ POSTGRES_LIBS="-L$PGSQL_LIBDIR -lpq"
+
+ AC_DEFINE(USE_POSTGRESQL,1,[Define to compile PostgreSQL DB driver])
+
+ DB_TYPE="postgresql"
+ DB_CFLAGS="$DB_CFLAGS $POSTGRES_CFLAGS"
+ DB_LIBS="$DB_LIBS $POSTGRES_LIBS"
+
+ AC_MSG_RESULT(yes)
+ fi
else
AC_MSG_RESULT(no)
fi
-dnl MySQL tests
-AC_MSG_CHECKING( for use of MySQL)
+dnl ---------------------------------------------------------------------------
+dnl MySQL
+dnl ---------------------------------------------------------------------------
+AC_MSG_CHECKING(for MySQL)
AC_ARG_WITH(mysql,
- [ --with-mysql=DIR Use MySQL for data storage ],
- [ with_mysql=$withval ],
- [ with_mysql=no ]
- )
-if test "$with_mysql" != "no"; then
- for i in /usr /usr/local /usr/local/mysql $with_mysql; do
- MYSQL_INC_CHK(/include)
- el[]MYSQL_INC_CHK(/include/mysql)
- fi
- done
-
- if test -z "$MYSQL_DIR"; then
- AC_MSG_RESULT(Cannot find mysql.h. Please specify the installation
path of MySQL)
- else
+ [ --with-mysql[=DIR] use MySQL database])
- MYSQL_INCLUDE="-I$MYSQL_INCDIR"
-
- MYSQL_LIBDIR=$MYSQL_DIR/lib
- test -d $MYSQL_DIR/lib/mysql && MYSQL_LIBDIR=$MYSQL_DIR/lib/mysql
+if test "$with_mysql" != "no"; then
+ for i in /usr /usr/local /usr/local/mysql $with_mysql; do
+ MYSQL_INC_CHK(/include)
+ el[]MYSQL_INC_CHK(/include/mysql)
+ fi
+ done
- MYSQL_CFLAGS="$MYSQL_INCLUDE"
- MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient"
+ if test -z "$MYSQL_DIR"; then
+ AC_MSG_RESULT(no)
+ if test "$with_mysql"; then
+ AC_MSG_ERROR(Cannot find mysql.h. Please specify the installation path
of MySQL)
+ fi
+ else
+ MYSQL_INCLUDE="-I$MYSQL_INCDIR"
+ MYSQL_LIBDIR=$MYSQL_DIR/lib
+ test -d $MYSQL_DIR/lib/mysql && MYSQL_LIBDIR=$MYSQL_DIR/lib/mysql
+ MYSQL_CFLAGS="$MYSQL_INCLUDE"
+ MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient"
- AC_DEFINE(USE_MYSQL,1,[ ])
+ AC_DEFINE(USE_MYSQL,1,[Define to compile MySQL DB driver])
- DB_TYPE="mysql"
- DB_CFLAGS="$DB_CFLAGS $MYSQL_CFLAGS"
- DB_LIBS="$DB_LIBS $MYSQL_LIBS"
+ DB_TYPE="mysql"
+ DB_CFLAGS="$DB_CFLAGS $MYSQL_CFLAGS"
+ DB_LIBS="$DB_LIBS $MYSQL_LIBS"
- AC_MSG_RESULT(found)
- fi
+ AC_MSG_RESULT(yes)
+ fi
else
AC_MSG_RESULT(no)
fi
-
-dnl libgda tests
-AC_MSG_CHECKING( for libgda)
-AC_ARG_WITH(libgda,
- [ --with-libgda=DIR Use Libgda for data storage ],
- [ with_libgda=$withval ],
- [ with_libgda=no ]
- )
-if test "$with_libgda" != "no"; then
- for i in /usr /usr/local /usr/local/gda $with_libgda; do
- LIBGDA_INC_CHK(/include)
- el[]LIBGDA_INC_CHK(/include/gda)
- fi
- done
-
- if test -z "$LIBGDA_DIR"; then
- AC_MSG_RESULT(Cannot find gda.h. Please specify the installation path
of libgda)
- else
-
- LIBGDA_INCLUDE="-I$LIBGDA_INCDIR"
- LIBGDA_LIBDIR=$LIBGDA_DIR/lib
- test -d $LIBGDA_DIR/lib/libgda && LIBGDA_LIBDIR=$LIBGDA_DIR/lib/libgda
-
- LIBGDA_CFLAGS="`gda-config --cflags client`"
- LIBGDA_LIBS="`gda-config --libs client`"
-
- AC_DEFINE(USE_LIBGDA,1,[ ])
-
- DB_TYPE="libgda"
- DB_CFLAGS="$LIBGDA_CFLAGS"
- DB_LIBS="$LIBGDA_LIBS"
-
- AC_MSG_RESULT(found)
- fi
-else
- AC_MSG_RESULT(no)
+dnl ---------------------------------------------------------------------------
+dnl Did we find any database?
+dnl ---------------------------------------------------------------------------
+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
+dnl ===========================================================================
+
dnl MAX_DATABASE_CONNECTIONS tests
AC_MSG_CHECKING( whether to enable max database connections limit)
AC_ARG_ENABLE(max-database-connections,
@@ -176,10 +145,6 @@
AC_MSG_RESULT(no)
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
-
dnl MEMORY_DEBUG tests
AC_MSG_CHECKING( whether to enable memory debugging code)
AC_ARG_ENABLE(memory-debug,
@@ -321,43 +286,41 @@
else
AC_MSG_RESULT(no)
fi
-
-idldir="\${prefix}/share/idl"
-ORBIT_IDL_MAKE_SKELETON_FLAGS="--skeleton-impl"
-
-dnl Turn on the additional warnings last, so -Werror doesn't affect other
tests.
-AC_ARG_ENABLE(more-warnings,
-[ --enable-more-warnings Maximum compiler warnings],
-set_more_warnings="$enableval",[
-if test -f $srcdir/CVSVERSION; then
- set_more_warnings=yes
-else
- set_more_warnings=no
-fi
-])
+dnl ---------------------------------------------------------------------------
+dnl Turn on additional compiler warnings
+dnl ---------------------------------------------------------------------------
AC_MSG_CHECKING(whether to turn on extended compiler warnings)
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
- AC_MSG_RESULT(yes)
- CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes"
- CFLAGS="$CFLAGS -Wcast-align -Wsign-compare"
+AC_ARG_ENABLE(more-warnings,
+ [ --enable-more-warnings Maximum compiler warnings],,[
+ if test -f $srcdir/autogen.sh; then
+ enable_more_warnings=yes
+ else
+ enable_more_warnings=no
+ fi])
+if test "$GCC" = "yes" -a "$enable_more_warnings" = "yes"; then
+ AC_MSG_RESULT(yes)
+ CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes"
+ CFLAGS="$CFLAGS -Wcast-align -Wsign-compare"
else
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT(no)
fi
+dnl ===========================================================================
+
+idldir="\${prefix}/share/idl"
+ORBIT_IDL_MAKE_SKELETON_FLAGS="--skeleton-impl"
+
AC_SUBST(idldir)
AC_SUBST(ORBIT_IDL)
AC_SUBST(ORBIT_CFLAGS)
AC_SUBST(ORBIT_LIBS)
-AC_SUBST(DB_TYPE)
AC_SUBST(DB_LIBS)
AC_SUBST(DB_CFLAGS)
AC_SUBST(POSTGRES_LIBS)
AC_SUBST(POSTGRES_CFLAGS)
AC_SUBST(MYSQL_LIBS)
AC_SUBST(MYSQL_CFLAGS)
-AC_SUBST(LIBGDA_LIBS)
-AC_SUBST(LIBGDA_CFLAGS)
AC_SUBST(NAMESERVICE_LIBS)
AC_SUBST(METHOD_LIBS)
AC_SUBST(METHOD_CFLAGS)
Index: gnue/geas/doc/internals/objectstore.txt
diff -u gnue/geas/doc/internals/objectstore.txt:1.3
gnue/geas/doc/internals/objectstore.txt:1.4
--- gnue/geas/doc/internals/objectstore.txt:1.3 Sun Apr 22 16:06:25 2001
+++ gnue/geas/doc/internals/objectstore.txt Wed Jun 20 15:26:23 2001
@@ -20,8 +20,6 @@
Implementing a driver
=====================
-(Note: steps 2 and 3 have been done for libgda.)
-
1) Add appropriate tests to the configure.in file in the main directory, and
set DB_FLAGS/DB_LIBS appropriately. Also create a USE_<databasetype>
define.
Index: gnue/geas/doc/overview.txt
diff -u gnue/geas/doc/overview.txt:1.1 gnue/geas/doc/overview.txt:1.2
--- gnue/geas/doc/overview.txt:1.1 Sun Jun 10 11:56:44 2001
+++ gnue/geas/doc/overview.txt Wed Jun 20 15:26:23 2001
@@ -34,10 +34,9 @@
references to other objects, sets of objects, and look up data from other
objects.
- SQL database independance: Currently MySQL is used for data storage,
-with PostgreSQL support planned soon, and later libGDA will be used to allow
-any supported database to be used for storing data. Custom database systems
-will be able to be added with minimal effort.
+ SQL database independance: Currently MySQL and PostgreSQL can be used
+for data storage. Custom database systems will be able to be added with
+reasonable effort.
Language independance: While Python is the main language for GNUe
applications, any language can be used to write a GEAS client, and object
Index: gnue/geas/src/geas-server.c
diff -u gnue/geas/src/geas-server.c:1.104 gnue/geas/src/geas-server.c:1.105
--- gnue/geas/src/geas-server.c:1.104 Tue Jun 12 21:28:21 2001
+++ gnue/geas/src/geas-server.c Wed Jun 20 15:26:23 2001
@@ -19,7 +19,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: geas-server.c,v 1.104 2001/06/13 04:28:21 treshna Exp $
+ $Id: geas-server.c,v 1.105 2001/06/20 22:26:23 reinhard Exp $
*/
@@ -866,9 +866,6 @@
#endif
#ifdef USE_POSTGRESQL
" PostgreSQL"
-#endif
-#ifdef USE_LIBGDA
- " All libgda supported databases"
#endif
);
Index: gnue/geas/src/objectstore/objectstore.c
diff -u gnue/geas/src/objectstore/objectstore.c:1.67
gnue/geas/src/objectstore/objectstore.c:1.68
--- gnue/geas/src/objectstore/objectstore.c:1.67 Tue Jun 12 17:47:47 2001
+++ gnue/geas/src/objectstore/objectstore.c Wed Jun 20 15:26:23 2001
@@ -19,7 +19,7 @@
along with GEAS; if not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: objectstore.c,v 1.67 2001/06/13 00:47:47 treshna Exp $
+ $Id: objectstore.c,v 1.68 2001/06/20 22:26:23 reinhard Exp $
*/
@@ -370,17 +370,6 @@
succeeded = TRUE;
}
-
-#ifdef USE_LIBGDA
-
- if (!succeeded && g_strcasecmp (type, "libGDA") == 0)
- {
- h =
- (struct database_handle *) libGDA_create_database_handle (config,
- dbname);
- succeeded = TRUE;
- }
-#endif
/* ******************** */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/geas TODO autogen.sh configure.in doc/over...,
Reinhard Mueller <=