[gnome-db] Re: libgda/libgnomedb 1.1.99 released

From: Tomasz Kłoczko <kloczek rudy mif pg gda pl>
To: Rodrigo Moya <rodrigo gnome-db org>
Cc: GDA <gnome-db-list gnome org>
Subject: [gnome-db] Re: libgda/libgnomedb 1.1.99 released
Date: Mon, 11 Oct 2004 09:41:57 +0200 (CEST)

On Mon, 11 Oct 2004, Rodrigo Moya wrote:

Attached patches for this version. Aprove for commit (or refuse):

- libgda-gettext.patch: remove providers/sybase/main.c from po/POTFILES.in
   (no included in dist tar ball and also translations from this file are
   never used by libgda),

- libgda-ac_fixes.patch: added fixes for latest autoheaders (include in
   situ autoheaders prototypes),

- libgda-make-jN.patch: if used in *_LDADD variable *.la file is from
   current directory do not list them with full path and so not make
   empty sql_parser_test_DEPENDENCIES variable (this fix allow build
   libgda using "make -j<N>"),

- libgda-xbase.patch: fixes for build xbase backend module.

you forgot to attach the patches :)


Sorry .. :o>

kloczek
--
-----------------------------------------------------------
*Ludzie nie mają problemów, tylko sobie sami je stwarzają*
-----------------------------------------------------------
Tomasz Kłoczko, sys adm @zie.pg.gda.pl|*e-mail: kloczek rudy mif pg gda pl*

--- libgda-1.1.0/po/POTFILES.in~	2004-03-17 20:57:08.000000000 +0100
+++ libgda-1.1.0/po/POTFILES.in	2004-03-17 20:57:08.000000000 +0100
@@ -48,7 +48,6 @@
 providers/sybase/gda-sybase-recordset.c
 providers/sybase/gda-sybase-types.c
 providers/sybase/libmain.c
-providers/sybase/main.c
 providers/sybase/utils.c
 providers/xbase/gda-xbase-provider.c
 providers/xbase/libmain.c

--- libgda-1.1.99/configure.in.orig	2004-10-10 18:53:04.586985168 +0200
+++ libgda-1.1.99/configure.in	2004-10-10 18:55:19.721441608 +0200
@@ -159,7 +159,7 @@
 	then
 		AC_MSG_WARN(Berkeley DB backend not used)
 	else
-		AC_DEFINE(HAVE_BDB)
+		AC_DEFINE(HAVE_BDB, 1, [Have Berkeley DB])
 		BDB_CFLAGS="-I${bdbdir}/include"
 		BDB_LIBS="-L${bdbdir}/lib ${bdblib}"
 	fi
@@ -211,7 +211,7 @@
 		then
 			AC_MSG_WARN(ODBC backend not used)
 		else
-			AC_DEFINE(HAVE_ODBC)
+			AC_DEFINE(HAVE_ODBC, 1, [Have ODBC])
 			ODBC_CFLAGS="-I${odbcdir}/include"
 			ODBC_LIBS="-L${odbcdir}/lib ${odbclib}"
 		fi
@@ -268,13 +268,13 @@
 		then
 			AC_MSG_WARN(MySQL backend not used)
 		else
-			AC_DEFINE(HAVE_MYSQL)
+			AC_DEFINE(HAVE_MYSQL, 1, [Have MySQL])
 			MYSQL_CFLAGS="-I${mysqldir}/include${mysqldir_suffix}"
 			MYSQL_LIBS="-L${mysqldir}/lib${mysqllibdir_suffix} -lmysqlclient"
 		fi
 	else
 		mysqldir=yes
-		AC_DEFINE(HAVE_MYSQL)
+		AC_DEFINE(HAVE_MYSQL, 1, [Have MySQL])
 		MYSQL_CFLAGS=`$MYSQL_CONFIG --cflags`
 		MYSQL_LIBS=`$MYSQL_CONFIG --libs`
 	fi
@@ -327,7 +327,7 @@
 	then
 		AC_MSG_WARN(mSQL backend not used)
 	else
-		AC_DEFINE(HAVE_MSQL)
+		AC_DEFINE(HAVE_MSQL, 1, [Have mSQL])
 		MSQL_CFLAGS="-I${msqldir}/include${msqldir_suffix}"
 		MSQL_LIBS="-L${msqldir}/lib${msqllibdir_suffix} -lmsql"
                 AC_MSG_CHECKING(for mSQL 3.x API)
@@ -337,7 +337,7 @@
                     int rc = INT64_TYPE;
                     return (rc>0) ? 0 : -1;
                   }
-                ], AC_DEFINE(HAVE_MSQL3) AC_MSG_RESULT(found),
+                ], AC_DEFINE(HAVE_MSQL3, 1, [Have mSQL 3.x API]) AC_MSG_RESULT(found),
                 AC_MSG_RESULT(not found))
 	fi
 fi
@@ -395,7 +395,7 @@
 				postgresdir=""
 			fi
 			POSTGRES_LIBS="-L${postgresdir}/lib -lpq"
-			AC_DEFINE(HAVE_POSTGRES)
+			AC_DEFINE(HAVE_POSTGRES, 1, [Have PostgreSQL])
 		fi
 	fi
 fi
@@ -453,22 +453,22 @@
 		else
 			case "$freetdsvercheck" in
 				*v0.5*) AC_MSG_RESULT($freetdsvercheck - using v0.5x api)
-					AC_DEFINE(HAVE_FREETDS_VER0_5X)
+					AC_DEFINE(HAVE_FREETDS_VER0_5X, 1, [Have freetds v0.5x API])
 					FREETDS_CFLAGS="-I${freetds_incdir}"
 					FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
-					AC_DEFINE(HAVE_FREETDS)
+					AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
 					;;
 				*v0.60) AC_MSG_RESULT($freetdsvercheck - using v0.60 api)
-					AC_DEFINE(HAVE_FREETDS_VER0_60)
+					AC_DEFINE(HAVE_FREETDS_VER0_60, 1, [Have freetds v0.60 API])
 					FREETDS_CFLAGS="-I${freetds_incdir}"
 					FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
-					AC_DEFINE(HAVE_FREETDS)
+					AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
 					;;
 				*v0.6*) AC_MSG_RESULT($freetdsvercheck - using v0.6x api)
-					AC_DEFINE(HAVE_FREETDS_VER0_6X)
+					AC_DEFINE(HAVE_FREETDS_VER0_6X, 1, [Have freetds v0.6x API])
 					FREETDS_CFLAGS="-I${freetds_incdir}"
 					FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
-					AC_DEFINE(HAVE_FREETDS)
+					AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
 					;;
 				*)	AC_MSG_WARN($freetdsvercheck not supprted - backend not used)
 					freetdsdir=""
@@ -525,7 +525,7 @@
 		AC_MSG_WARN(IBM DB2 backend not used)
 	else
 		AC_MSG_RESULT(found IBM DB2 in $ibmdb2dir)
-		AC_DEFINE(HAVE_IBMDB2)
+		AC_DEFINE(HAVE_IBMDB2, 1, [Have IBM DB2])
 		AC_MSG_WARN(IBM DB2 Provider does not work yet)
 		IBMDB2_CFLAGS="-DIBMDB2_DIR=\\\"${ibmdb2dir}\\\" -I${ibmdb2dir}/include"
 		IBMDB2_LIBS="-L${ibmdb2dir}/lib -Wl,-rpath,${ibmdb2dir}/lib -ldb2"
@@ -591,8 +591,8 @@
 			SYBASE_LIBS="${SYBASE_LIBS} ${sybase_blklibs}"
 			AC_CHECK_LIB(ct,tdsdump_on,[
 			AC_MSG_WARN(linking against freetds libct)
-			AC_DEFINE(HAVE_SYBASE)
-			], AC_DEFINE(HAVE_SYBASE))
+			AC_DEFINE(HAVE_SYBASE, 1, [Have Sybase])
+			], AC_DEFINE(HAVE_SYBASE, 1, [Have Sybase]))
 			;;
 		*) AC_MSG_WARN(this host type is unsupported; sybase backend not used)
 			sybasedir=""
@@ -611,7 +611,7 @@
        AC_MSG_CHECKING(for Sybase debugging level)
        if test "x$enable_sybase_debug" = "xmax"
        then
-               AC_DEFINE(SYBASE_DEBUG)
+               AC_DEFINE(SYBASE_DEBUG, 1, [Enable Sybase debugging level])
                if test -f $sybasedir/devlib/libct.a
                then
                        AC_MSG_RESULT(max)
@@ -670,7 +670,7 @@
 	then
 		AC_MSG_WARN(ORACLE backend not used)
 	else
-		AC_DEFINE(HAVE_ORACLE)
+		AC_DEFINE(HAVE_ORACLE, 1, [Have ORACLE])
 		ORACLE_CFLAGS="-I${ORACLE_HOME}/rdbms/demo -I${ORACLE_HOME}/rdbms/public -I${ORACLE_HOME}/plsql/public -I${ORACLE_HOME}/network/public"
 		ORACLE_LIBS="-L${ORACLE_HOME}/lib -lm -ldl -lclntsh"
 	fi
@@ -708,7 +708,7 @@
 	then
 		AC_MSG_WARN(FireBird backend not used)
 	else
-		AC_DEFINE(HAVE_FIREBIRD)
+		AC_DEFINE(HAVE_FIREBIRD, 1, [Have FireBird])
 		FIREBIRD_CFLAGS="-I${firebirddir}/include"
 		FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -ldl -lcrypt"
 	fi
@@ -749,7 +749,7 @@
 	else
 		XBASE_CFLAGS=-I${xbasedir}/include
 		XBASE_LIBS="-L${xbasedir}/lib -lxdb"
-		AC_DEFINE(HAVE_XBASE)
+		AC_DEFINE(HAVE_XBASE, 1, [Have Xbase])
 	fi
 fi
 
@@ -788,7 +788,7 @@
 	else
 		SQLITE_CFLAGS=-I${sqlitedir}/include
 		SQLITE_LIBS="-L${sqlite}/lib -lsqlite"
-		AC_DEFINE(HAVE_SQLITE)
+		AC_DEFINE(HAVE_SQLITE, 1, [Have sqlite])
 	fi
 fi
 
@@ -827,7 +827,7 @@
 	else
 		MDB_CFLAGS=-I${mdbdir}/include
 		MDB_LIBS="-L${mdbdir}/lib -lmdb -lmdbsql"
-		AC_DEFINE(HAVE_MDB)
+		AC_DEFINE(HAVE_MDB, 1, [Have MDB])
 	fi
 fi
 
@@ -866,7 +866,7 @@
 	else
 		LDAP_CFLAGS="-I${ldapdir}/include"
 		LDAP_LIBS="-L${ldapdir}/lib -lldap -llber"
-		AC_DEFINE(HAVE_LDAP)
+		AC_DEFINE(HAVE_LDAP, 1, [Have LDAP])
 	fi
 fi

--- libgda-1.1.99/libsql/Makefile.am~	2004-10-10 17:25:48.000000000 +0200
+++ libgda-1.1.99/libsql/Makefile.am	2004-10-10 19:14:00.766016928 +0200
@@ -31,8 +31,7 @@
 
 sql_parser_test_SOURCES=sql_parser_test.c
 sql_parser_test_LDFLAGS = $(LIBGDA_LIBS)
-sql_parser_test_DEPENDENCIES =
-sql_parser_test_LDADD = $(top_builddir)/libsql/libgdasql.la
+sql_parser_test_LDADD = libgdasql.la
 
 tests: sql_parser_test

--- libgda-1.1.1/configure.in~	2004-04-05 01:37:01.000000000 +0200
+++ libgda-1.1.1/configure.in	2004-04-05 01:37:01.000000000 +0200
@@ -695,7 +695,7 @@
 	xbasedir=""
 	for d in $dir /usr /usr/local /opt/xbase
 	do
-		if test -f $d/include/xdb/xbase.h
+		if test -f $d/include/xbase/xbase.h
 		then
 			AC_MSG_RESULT(found Xbase in $d)
 			xbasedir=$d
@@ -707,7 +707,7 @@
 		AC_MSG_WARN(Xbase backend not used)
 	else
 		XBASE_CFLAGS=-I${xbasedir}/include
-		XBASE_LIBS="-L${xbasedir}/lib -lxdb"
+		XBASE_LIBS="-L${xbasedir}/lib -lxbase"
 		AC_DEFINE(HAVE_XBASE, 1, [Have Xbase])
 	fi
 fi
--- libgda-1.1.1/providers/xbase/gda-xbase-database.cpp~	2004-04-05 01:45:34.000000000 +0200
+++ libgda-1.1.1/providers/xbase/gda-xbase-database.cpp	2004-04-05 01:45:34.000000000 +0200
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <xdb/xbase.h>
+#include <xbase/xbase.h>
 #include "gda-xbase-database.h"
 #include "gda-xbase-provider.h"

Follow-Ups:
- [gnome-db] Re: libgda/libgnomedb 1.1.99 released
  - From: Rodrigo Moya

References:
- [gnome-db] libgda/libgnomedb 1.1.99 released
  - From: Rodrigo Moya
- [gnome-db] Re: libgda/libgnomedb 1.1.99 released
  - From: Tomasz Kłoczko
- [gnome-db] Re: libgda/libgnomedb 1.1.99 released
  - From: Rodrigo Moya

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]