Author: twittner Date: Sun Dec 24 22:50:56 2006 GMT
Module: SOURCES Tag: twittner
---- Log message:
- up to 0.8.2
---- Files affected:
SOURCES:
hk_classes.patch (1.3.2.1 -> 1.3.2.2)
---- Diffs:
================================================================
Index: SOURCES/hk_classes.patch
diff -u SOURCES/hk_classes.patch:1.3.2.1 SOURCES/hk_classes.patch:1.3.2.2
--- SOURCES/hk_classes.patch:1.3.2.1 Sun Nov 19 10:54:45 2006
+++ SOURCES/hk_classes.patch Sun Dec 24 23:50:51 2006
@@ -1,33 +1,33 @@
-diff -Nur o.hk_classes-0.8.1/acinclude.m4 n.hk_classes-0.8.1/acinclude.m4
---- o.hk_classes-0.8.1/acinclude.m4 2006-04-14 17:38:48.000000000 +0200
-+++ n.hk_classes-0.8.1/acinclude.m4 2006-04-24 21:41:18.000000000 +0200
-@@ -34,6 +34,15 @@
- HK_CLASSESDIR=$libdir/hk_classes
- HK_CLASSESINCDIR=$includedir/hk_classes
+diff -Nurb o.hk_classes-0.8.2/acinclude.m4 n.hk_classes-0.8.2/acinclude.m4
+--- o.hk_classes-0.8.2/acinclude.m4 2006-10-03 12:33:07.000000000 +0200
++++ n.hk_classes-0.8.2/acinclude.m4 2006-11-19 11:16:41.000000000 +0100
+@@ -57,13 +57,24 @@
+ HK_CLASSESINCDIR=$with_hk_classes_incdir
fi
+
+if test "$with_hk_classes_dir" != ""; then
-+HK_CLASSESDIR=$with_hk_classes_dir
++ HK_CLASSESDIR=$with_hk_classes_dir
+fi
+if test "$with_hk_classes_drvdir" != ""; then
-+HK_DRIVERSDIR=$with_hk_classes_drvdir
++ HK_DRIVERSDIR=$with_hk_classes_drvdir
+else
-+HK_DRIVERSDIR=$HK_CLASSESDIR/drivers
++ HK_DRIVERSDIR=$HK_CLASSESDIR/drivers
+fi
+AC_SUBST(HK_DRIVERSDIR)
- if test "$with_hk_classes_incdir" != ""; then
- HK_CLASSESINCDIR=$with_hk_classes_incdir
- fi
-@@ -43,7 +52,8 @@
++
+ HKPYTHONDIR=""
+ UTILITIESDIR=""
+ AC_SUBST(HK_CLASSESDIR)
AC_SUBST(HK_CLASSESINCDIR)
NODRIVER=true
POSSIBLE_DRIVERS="FIREBIRD,MYSQL,ODBC,PARADOX,POSTGRESQL,SQLITE2,SQLITE3,MDB,XBASE"
-dnl AC_DEFINE_UNQUOTED(HKCLASSES, "$HK_CLASSESDIR",[PREPROCESSOR DEFINITION])
+AC_DEFINE_UNQUOTED(HKCLASSES, "$HK_CLASSESDIR", [HKCLASSES - directory for
libhk_classes library])
+AC_DEFINE_UNQUOTED(HK_DRIVERSDIR, "$HK_DRIVERSDIR", [HK_DRIVERSDIR - database
drivers' directory])
- AC_MSG_RESULT(OK)
+ AC_SUBST(BITARCHITECTURE)
])
-@@ -378,6 +388,7 @@
+@@ -437,6 +448,7 @@
dnl accordingly.
dnl AC_LIB_LINKFLAGS_BODY([iconv])
@@ -35,7 +35,7 @@
AC_MSG_CHECKING([if libiconv is present])
ac_save_LIBS="$LIBS"
LIBS="$ac_save_LIBS -liconv"
-@@ -388,6 +399,7 @@
+@@ -447,6 +459,7 @@
LIBS="$ac_save_LIBS"
ac_liconv="no")
AC_MSG_RESULT($ac_liconv)
@@ -43,256 +43,31 @@
dnl Add $INCICONV to CPPFLAGS before performing the following checks,
dnl because if the user has installed libiconv and not disabled its use
dnl via --without-libiconv-prefix, he wants to use it. The first
-@@ -520,30 +532,42 @@
-
- AC_DEFUN([HK_SQLITE3TEST],
- [
-+
- AC_MSG_CHECKING([whether the SQLITE3 driver will be installed])
--if test "$want_sqlite3" = "yes"; then
--NODRIVER=false
--DRIVERSDIR="$DRIVERSDIR hk_sqlite3classes"
--AC_MSG_RESULT(yes)
-+if test "$with_sqlite3" = "yes" -o "$with_sqlite3" = "external" ; then
-+ NODRIVER=false
-+ DRIVERSDIR="$DRIVERSDIR hk_sqlite3classes"
-+ if test "$with_sqlite3" = "yes" ; then
-+ SQLITE3_LIB=""
-+ AC_SUBST(SQLITE3_LIB)
-+ AM_CONDITIONAL(SQLITE3_BUILTIN, true)
-+ elif test "$with_sqlite3" = "external" ; then
-+ AC_CHECK_LIB(sqlite3, sqlite3_value_text,
SQLITE3_LIB="-lsqlite3",
-+ AC_MSG_ERROR([SQLITE3 library not found.]))
-+ AM_CONDITIONAL(SQLITE3_BUILTIN, false)
-+ AC_SUBST(SQLITE3_LIB)
-+ fi
-+ AC_MSG_RESULT($with_sqlite3)
- else
--AC_MSG_RESULT(no)
-+ AC_MSG_RESULT(no)
- fi
-
-+])
-
-
--])
-
-+AC_DEFUN([HK_PKGCONFIG],[
-
-+pkg_config_version="0.15"
-+PKG_PROG_PKG_CONFIG("$pkg_config_version")
-+test -z "$PKG_CONFIG" && AC_MSG_ERROR([Required pkg-config version ( >=
$pkg_config_version ) not found. Bye.])
-
--AC_DEFUN([HK_PGKCONFIG],[
--if test "$want_mdb" = "yes"; then
-+])
-
--dnl Check for pkg-config
--AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
--if test "$PKG_CONFIG" = "no"; then
-- AC_MSG_ERROR([This package requires pkg-config.])
--fi
-+
-+AC_DEFUN([HK_GLIB],[
-+AC_REQUIRE(HK_PKGCONFIG)
-
- dnl Check for Glib-2.0
- # GLIB_CFLAGS: cflags for compiling glib dependant sources
-@@ -552,21 +576,14 @@
-
- GLIB_PACKAGES="glib-2.0"
- GLIB_VERSION="2.4"
--AC_MSG_CHECKING(whether the MDB/ACCESS driver will be installed)
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.15 ; then
-- if $PKG_CONFIG --atleast-version $GLIB_VERSION $GLIB_PACKAGES >/dev/null
2>&1 ; then
-+if $PKG_CONFIG --atleast-version $GLIB_VERSION $GLIB_PACKAGES >/dev/null 2>&1
; then
- GLIB_CFLAGS="`$PKG_CONFIG --cflags $GLIB_PACKAGES`"
- GLIB_LIBADD="`$PKG_CONFIG --libs-only-l --libs-only-other $GLIB_PACKAGES`"
- GLIB_LDFLAGS="`$PKG_CONFIG --libs-only-L $GLIB_PACKAGES`"
- AC_MSG_RESULT(yes)
-- fi
-+fi
- else
-- if $PKG_CONFIG --atleast-version $GLIB_VERSION $GLIB_PACKAGES >/dev/null
2>&1 ; then
-- GLIB_CFLAGS="`$PKG_CONFIG --cflags $GLIB_PACKAGES`"
-- GLIB_LIBADD="`$PKG_CONFIG --libs-only-l $GLIB_PACKAGES`"
-- GLIB_LDFLAGS="`$PKG_CONFIG --libs-only-L $GLIB_PACKAGES`"
-- fi
-+ AC_MSG_ERROR([Required glib2 version (0.15 >=) not found. Bye.])
- fi
-
- if test -z "$GLIB_LIBADD"; then
-@@ -578,12 +595,9 @@
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBADD)
- AC_SUBST(GLIB_LDFLAGS)
--NODRIVER=false
--DRIVERSDIR="$DRIVERSDIR hk_mdbclasses"
- AC_MSG_RESULT(yes)
-
- fi
--fi
-
- ])
-
-@@ -591,7 +605,43 @@
-
- AC_DEFUN([HK_MDBTEST],
- [
--AC_REQUIRE([HK_PGKCONFIG])
-+
-+AC_REQUIRE([HK_PKGCONFIG])
-+
-+AC_MSG_CHECKING(whether the MDB/ACCESS driver will be installed)
-+
-+if test "$with_mdb" = "yes" ; then
-+
-+ AM_CONDITIONAL(MDB_BUILTIN, true)
-+ MDB_CFLAGS="-I./mdbtools"
-+ MDB_LIBS=""
-+ AC_SUBST(MDB_CFLAGS)
-+ AC_SUBST(MDB_LIBS)
-+ AC_MSG_RESULT([yes - using enclosed mdbtools sources.])
-+
-+elif test "$with_mdb" = "external" ; then
-+
-+ AM_CONDITIONAL(MDB_BUILTIN, false)
-+ ## AC_SUBST: MDB_CFLAGS=-I/usr/include/glib-2.0
-I/usr/lib/glib-2.0/include ; MDB_LIBS=-lmdb -lglib-2.0
-+ PKG_CHECK_MODULES(MDB, libmdb)
-+ test -z "$MDB_LIBS" && AC_MSG_ERROR([external mdbtools library not
found - bye.])
-+ ## -I/usr/include/mdb
-+ MDB_CFLAGS="-I`$PKG_CONFIG --variable=includedir libmdb` $MDB_CFLAGS"
-+ AC_SUBST(MDB_CFLAGS)
-+ AC_MSG_RESULT([yes - using external mdb library.])
-+
-+else
-+
-+ AC_MSG_RESULT([no.])
-+
-+fi
-+
-+if test "$with_mdb" = yes -o "$with_mdb" = "external" ; then
-+
-+ NODRIVER=false
-+ DRIVERSDIR="$DRIVERSDIR hk_mdbclasses"
-+
-+fi
-
- ])
-
-@@ -659,12 +709,22 @@
- [
-
- AC_MSG_CHECKING([whether the PARADOX (pxlib) driver will be installed])
--if test "$want_paradox" = "yes"; then
--NODRIVER=false
--DRIVERSDIR="$DRIVERSDIR hk_paradoxclasses"
--AC_MSG_RESULT(yes)
-+if test "$with_paradox" = "yes" -o "$with_paradox" = "external" ; then
-+ NODRIVER=false
-+ DRIVERSDIR="$DRIVERSDIR hk_paradoxclasses"
-+ if test "$with_paradox" = "yes" ; then
-+ PARADOX_LIB=""
-+ AC_SUBST(PARADOX_LIB)
-+ AM_CONDITIONAL(PARADOX_BUILTIN, true)
-+ elif test "$with_paradox" = "external" ; then
-+ AC_CHECK_LIB(px, PX_new, PARADOX_LIB="-lpx",
-+ AC_MSG_ERROR([PARADOX library not found.]))
-+ AM_CONDITIONAL(PARADOX_BUILTIN, false)
-+ AC_SUBST(PARADOX_LIB)
-+ fi
-+ AC_MSG_RESULT($with_paradox)
- else
--AC_MSG_RESULT(no)
-+ AC_MSG_RESULT(no)
- fi
-
- ])
-@@ -680,18 +740,19 @@
- if test "$want_firebird" = "yes"; then
- AC_MSG_CHECKING([whether FIREBIRD is available])
- if test "$with_firebird_dir" = ""; then
-- FIREBIRDLIBDIR=/opt/firebird/lib
-- FIREBIRDINCDIR=/opt/firebird/include
--else FIREBIRDLIBDIR=$with_firebird_dir/lib
--FIREBIRDINCDIR=$with_firebird_dir/include
-+ FIREBIRDLIBDIR=/opt/firebird/lib
-+ FIREBIRDINCDIR=/opt/firebird/include
-+else
-+ FIREBIRDLIBDIR=$with_firebird_dir/lib
-+ FIREBIRDINCDIR=$with_firebird_dir/include
- fi
-
- if test "x$with_firebird_incdir" != "x"; then
-- FIREBIRDINCDIR=$with_firebird_incdir
-+ FIREBIRDINCDIR=$with_firebird_incdir
- fi
-
- if test "x$with_firebird_libdir" != "x"; then
-- FIREBIRDLIBDIR=$with_firebird_libdir
-+ FIREBIRDLIBDIR=$with_firebird_libdir
- fi
-
- ac_save_LIBS="$LIBS"
-@@ -794,7 +855,7 @@
- fi
-
- if test "x$with_fontconfig_libdir" != "x"; then
-- FONTCONFIGLIBDIR=$with_fontconifg_libdir
-+ FONTCONFIGLIBDIR=$with_fontconfig_libdir
- fi
-
- ac_save_LIBS="$LIBS"
-diff -Nur o.hk_classes-0.8.1/configure.in n.hk_classes-0.8.1/configure.in
---- o.hk_classes-0.8.1/configure.in 2006-04-14 17:38:48.000000000 +0200
-+++ n.hk_classes-0.8.1/configure.in 2006-04-23 19:32:38.000000000 +0200
-@@ -15,6 +15,8 @@
- AC_ARG_WITH(mysql-dir,[ --with-mysql-dir=PATH Path to the Mysql
directory],:,:)
+diff -Nurb o.hk_classes-0.8.2/configure.in n.hk_classes-0.8.2/configure.in
+--- o.hk_classes-0.8.2/configure.in 2006-10-23 17:33:56.000000000 +0200
++++ n.hk_classes-0.8.2/configure.in 2006-11-19 12:40:47.000000000 +0100
+@@ -18,6 +18,8 @@
AC_ARG_WITH(mysql-incdir,[ --with-mysql-incdir=PATH Path to the Mysql
header files],:,:)
AC_ARG_WITH(mysql-libdir,[ --with-mysql-libdir=PATH Path to the Mysql
library],:,:)
+ AC_ARG_WITH(hk_classes-incdir,[ --with-hk_classes-incdir=PATH Path for the
hk_classes header files],:,:)
+AC_ARG_WITH(hk_classes-dir,[ --with-hk_classes-dir=PATH Path for the
hk_classes library files],:,:)
+AC_ARG_WITH(hk_classes-drvdir,[ --with-hk_classes-drvdir=PATH Path for the
hk_classes driver files],:,:)
- AC_ARG_WITH(hk_classes-incdir,[ --with-hk_classes-incdir=PATH Path for the
hk_classes header files],:,:)
AC_ARG_WITH(postgres, AC_HELP_STRING([--without-postgres],[disable postgres
plugins]),[want_postgres=$withval], want_postgres=yes)
-@@ -32,10 +34,10 @@
- AC_ARG_WITH(sqlite-incdir,[ --with-sqlite-incdir=PATH Path to the sqlite2
header files],:,:)
- AC_ARG_WITH(sqlite-libdir,[ --with-sqlite-libdir=PATH Path to the sqlite2
library],:,:)
-
--AC_ARG_WITH(sqlite3, AC_HELP_STRING([--without-sqlite3],[disable sqlite3
plugins]),[want_sqlite3=$withval], want_sqlite3=yes)
-+AC_ARG_WITH(sqlite3,
AC_HELP_STRING([--with-sqlite3=(yes)/external/no],[sqlite3 plugins]),,
with_sqlite3=yes)
-
-
--AC_ARG_WITH(mdb, AC_HELP_STRING([--without-mdb],[disable mdb (M$Access)
plugins]),[want_mdb=$withval], want_mdb=yes)
-+AC_ARG_WITH(mdb, AC_HELP_STRING([--with-mdb=(yes)/external/no],[mdb
(M$Access) plugins]),, with_mdb=yes)
-
-
- AC_ARG_WITH(xbase, AC_HELP_STRING([--without-xbase],[disable xbase
plugins]),[want_xbase=$withval], want_xbase=yes)
-@@ -44,7 +46,7 @@
- AC_ARG_WITH(xbase-libdir,[ --with-xbase-libdir=PATH Path to the xbase
library],:,:)
-
-
--AC_ARG_WITH(paradox, AC_HELP_STRING([--without-paradox],[disable paradox
plugins]),[want_paradox=$withval], want_paradox=yes)
-+AC_ARG_WITH(paradox,
AC_HELP_STRING([--with-paradox=(yes)/external/no],[paradox plugins]),,
with_paradox=yes)
-
-
- AC_ARG_WITH(fontconfig-incdir,[ --with-fontconfig-incdir=PATH Path to the
fontconfig header files],:,:)
-@@ -70,7 +72,8 @@
+ AC_ARG_WITH(postgres-dir,[ --with-postgres-dir=PATH Path to the postgres
directory],:,:)
+@@ -84,7 +86,7 @@
HK_FIREBIRD2TEST
HK_MDBTEST
HK_MYSQLTEST
-PXLIB_BUILD_DATE=`date '+%Y-%m-%d'`
-+# little lies are useful for ccache
-+PXLIB_BUILD_DATE='2006-04-23'
++PXLIB_BUILD_DATE='9999-12-31'
AC_DEFINE_UNQUOTED(PXLIB_BUILD_DATE,"$PXLIB_BUILD_DATE",[pxlib build date])
AC_SUBST(PXLIB_BUILD_DATE)
-diff -Nur o.hk_classes-0.8.1/hk_classes/hk_drivermanager.cpp
n.hk_classes-0.8.1/hk_classes/hk_drivermanager.cpp
---- o.hk_classes-0.8.1/hk_classes/hk_drivermanager.cpp 2006-03-28
19:37:21.000000000 +0200
-+++ n.hk_classes-0.8.1/hk_classes/hk_drivermanager.cpp 2006-04-23
19:18:54.000000000 +0200
-@@ -60,7 +60,7 @@
+diff -Nurb o.hk_classes-0.8.2/hk_classes/hk_drivermanager.cpp
n.hk_classes-0.8.2/hk_classes/hk_drivermanager.cpp
+--- o.hk_classes-0.8.2/hk_classes/hk_drivermanager.cpp 2006-10-03
12:33:06.000000000 +0200
++++ n.hk_classes-0.8.2/hk_classes/hk_drivermanager.cpp 2006-11-19
13:06:54.000000000 +0100
+@@ -59,7 +59,7 @@
};
requestdialogtype* hk_drivermanager::p_driverselectdialog=NULL;
@@ -301,7 +76,7 @@
vector<hk_string> hk_drivermanager::p_driverlist;
typedef hk_connection* connectiontype(hk_drivermanager* );
-@@ -83,8 +83,7 @@
+@@ -82,8 +82,7 @@
{
p_private = new hk_drivermanagerprivate;
hk_report::setup_reportbasics();
@@ -311,18 +86,19 @@
scan_directory();
char* h= getenv("HOME");
hk_string classespath=(h==NULL?"/tmp":h);
-@@ -449,7 +448,7 @@
- //the following is a hack for LFS
- if (b.find("/usr/local/hk_classes")<b.size())
+@@ -447,8 +446,7 @@
+ #endif
+ if (b.find("/usr/local/hk_classes")!=hk_string::npos)
{
- b=HKCLASSES;b+="/drivers";
+-
+ b=HK_DRIVERSDIR;
-
set_path(b);
show_warningmessage("Due to a new directory hierarchy, your
preferences have been changed");
-diff -Nur o.hk_classes-0.8.1/hk_classes/hk_drivermanager.h
n.hk_classes-0.8.1/hk_classes/hk_drivermanager.h
---- o.hk_classes-0.8.1/hk_classes/hk_drivermanager.h 2005-06-22
20:12:09.000000000 +0200
-+++ n.hk_classes-0.8.1/hk_classes/hk_drivermanager.h 2006-04-23
19:18:54.000000000 +0200
+ save_preferences();
+diff -Nurb o.hk_classes-0.8.2/hk_classes/hk_drivermanager.h
n.hk_classes-0.8.2/hk_classes/hk_drivermanager.h
+--- o.hk_classes-0.8.2/hk_classes/hk_drivermanager.h 2006-05-20
22:07:18.000000000 +0200
++++ n.hk_classes-0.8.2/hk_classes/hk_drivermanager.h 2006-11-19
12:49:56.000000000 +0100
@@ -17,6 +17,14 @@
#include "hk_url.h"
#include "hk_definitions.h"
@@ -338,202 +114,91 @@
using namespace std;
class hk_connection;
-diff -Nur o.hk_classes-0.8.1/hk_firebirdclasses/Makefile.am
n.hk_classes-0.8.1/hk_firebirdclasses/Makefile.am
---- o.hk_classes-0.8.1/hk_firebirdclasses/Makefile.am 2006-04-13
20:02:06.000000000 +0200
-+++ n.hk_classes-0.8.1/hk_firebirdclasses/Makefile.am 2006-04-23
19:18:54.000000000 +0200
+diff -Nurb o.hk_classes-0.8.2/hk_dbaseclasses/Makefile.am
n.hk_classes-0.8.2/hk_dbaseclasses/Makefile.am
+--- o.hk_classes-0.8.2/hk_dbaseclasses/Makefile.am 2006-10-02
19:54:17.000000000 +0200
++++ n.hk_classes-0.8.2/hk_dbaseclasses/Makefile.am 2006-11-19
13:06:00.000000000 +0100
+@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@/drivers
[EMAIL PROTECTED]@
+ INCLUDES= -I../hk_classes
+
+ AM_CPPFLAGS=
+diff -Nurb o.hk_classes-0.8.2/hk_firebirdclasses/Makefile.am
n.hk_classes-0.8.2/hk_firebirdclasses/Makefile.am
+--- o.hk_classes-0.8.2/hk_firebirdclasses/Makefile.am 2006-10-02
19:54:17.000000000 +0200
++++ n.hk_classes-0.8.2/hk_firebirdclasses/Makefile.am 2006-11-19
13:06:00.000000000 +0100
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@/drivers
[EMAIL PROTECTED]@
INCLUDES= -I../hk_classes [EMAIL PROTECTED]@
AM_CPPFLAGS=-W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings
-diff -Nur o.hk_classes-0.8.1/hk_mdbclasses/Makefile.am
n.hk_classes-0.8.1/hk_mdbclasses/Makefile.am
---- o.hk_classes-0.8.1/hk_mdbclasses/Makefile.am 2006-04-15
17:48:57.000000000 +0200
-+++ n.hk_classes-0.8.1/hk_mdbclasses/Makefile.am 2006-04-23
19:53:36.000000000 +0200
-@@ -1,23 +1,35 @@
+diff -Nurb o.hk_classes-0.8.2/hk_mdbclasses/Makefile.am
n.hk_classes-0.8.2/hk_mdbclasses/Makefile.am
+--- o.hk_classes-0.8.2/hk_mdbclasses/Makefile.am 2006-10-02
19:54:17.000000000 +0200
++++ n.hk_classes-0.8.2/hk_mdbclasses/Makefile.am 2006-11-19
13:06:00.000000000 +0100
+@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@/drivers
--INCLUDES= -I../hk_classes -I ./mdbtools
[EMAIL PROTECTED]@
-+INCLUDES= -I../hk_classes
-
--AM_CPPFLAGS=$(GLIB_CFLAGS)
-+AM_CPPFLAGS=$(GLIB_CFLAGS)
-
- AM_CXXFLAGS= -Wall
+ INCLUDES= -I../hk_classes -I ./mdbtools
--libhk_mdbdriver_la_LDFLAGS = -version-info 0:0:0 $(GLIB_LIBADD)
$(GLIB_LDFLAGS)
--libhk_mdbdriver_la_LIBADD = ../hk_classes/libhk_classes.la $(GLIB_LIBADD)
$(GLIB_LDFLAGS)
-+libhk_mdbdriver_la_CPPFLAGS = @MDB_CFLAGS@
-+libhk_mdbdriver_la_LDFLAGS = -version-info 0:0:0
-+libhk_mdbdriver_la_LIBADD = ../hk_classes/libhk_classes.la $(GLIB_LIBADD)
$(GLIB_LDFLAGS) @MDB_LIBS@
-
--lib_LTLIBRARIES = libhk_mdbdriver.la
-+lib_LTLIBRARIES = libhk_mdbdriver.la
-
--noinst_HEADERS = hk_mdbconnection.h hk_mdbdatabase.h hk_mdbdatasource.h
hk_mdbcolumn.h\
-- hk_mdbresultquery.h hk_mdbtable.h
mdbtools/mdbtools.h
-+noinst_HEADERS = hk_mdbconnection.h hk_mdbdatabase.h hk_mdbdatasource.h
hk_mdbcolumn.h \
-+ hk_mdbresultquery.h hk_mdbtable.h
mdbtools/mdbtools.h
-
-
-
- include_HEADERS =
--libhk_mdbdriver_la_SOURCES= hk_mdbconnection.cpp hk_mdbdatabase.cpp
hk_mdbdatasource.cpp hk_mdbcolumn.cpp\
-- hk_mdbresultquery.cpp hk_mdbtable.cpp \
-- mdbtools/catalog.c mdbtools/mem.c
mdbtools/file.c mdbtools/kkd.c mdbtools/table.c mdbtools/data.c mdbtools/dump.c
mdbtools/backend.c mdbtools/money.c mdbtools/sargs.c mdbtools/index.c
mdbtools/like.c mdbtools/write.c mdbtools/stats.c mdbtools/map.c
mdbtools/props.c mdbtools/worktable.c mdbtools/options.c mdbtools/iconv.c
-
--EXTRA_DIST = mdbtools/AUTHORS
-+if MDB_BUILTIN
-+libhk_mdbdriver_la_SOURCES = hk_mdbconnection.cpp hk_mdbdatabase.cpp
hk_mdbdatasource.cpp hk_mdbcolumn.cpp \
-+
hk_mdbresultquery.cpp hk_mdbtable.cpp \
-+
mdbtools/catalog.c mdbtools/mem.c mdbtools/file.c mdbtools/kkd.c
mdbtools/table.c mdbtools/data.c \
-+ mdbtools/dump.c
mdbtools/backend.c mdbtools/money.c mdbtools/sargs.c mdbtools/index.c
mdbtools/like.c \
-+
mdbtools/write.c mdbtools/stats.c mdbtools/map.c mdbtools/props.c
mdbtools/worktable.c mdbtools/options.c \
-+ mdbtools/iconv.c
-+
-+EXTRA_DIST = mdbtools/AUTHORS
-+
-+else
-+libhk_mdbdriver_la_SOURCES = hk_mdbconnection.cpp hk_mdbdatabase.cpp
hk_mdbdatasource.cpp hk_mdbcolumn.cpp \
-+
hk_mdbresultquery.cpp hk_mdbtable.cpp
-+endif
-+
-diff -Nur o.hk_classes-0.8.1/hk_mysqlclasses/Makefile.am
n.hk_classes-0.8.1/hk_mysqlclasses/Makefile.am
---- o.hk_classes-0.8.1/hk_mysqlclasses/Makefile.am 2006-04-13
20:02:06.000000000 +0200
-+++ n.hk_classes-0.8.1/hk_mysqlclasses/Makefile.am 2006-04-23
19:18:54.000000000 +0200
+ AM_CPPFLAGS=$(GLIB_CFLAGS)
+diff -Nurb o.hk_classes-0.8.2/hk_mysqlclasses/Makefile.am
n.hk_classes-0.8.2/hk_mysqlclasses/Makefile.am
+--- o.hk_classes-0.8.2/hk_mysqlclasses/Makefile.am 2006-10-02
19:54:17.000000000 +0200
++++ n.hk_classes-0.8.2/hk_mysqlclasses/Makefile.am 2006-11-19
13:06:00.000000000 +0100
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@/drivers
[EMAIL PROTECTED]@
INCLUDES= -I../hk_classes [EMAIL PROTECTED]@
- AM_CXXFLAGS= -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings
-diff -Nur o.hk_classes-0.8.1/hk_odbcclasses/Makefile.am
n.hk_classes-0.8.1/hk_odbcclasses/Makefile.am
---- o.hk_classes-0.8.1/hk_odbcclasses/Makefile.am 2006-04-13
20:02:06.000000000 +0200
-+++ n.hk_classes-0.8.1/hk_odbcclasses/Makefile.am 2006-04-23
19:18:53.000000000 +0200
+ AM_CXXFLAGS= -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings
[EMAIL PROTECTED]@ @BITARCHITECTURE@
+diff -Nurb o.hk_classes-0.8.2/hk_odbcclasses/Makefile.am
n.hk_classes-0.8.2/hk_odbcclasses/Makefile.am
+--- o.hk_classes-0.8.2/hk_odbcclasses/Makefile.am 2006-10-02
19:54:17.000000000 +0200
++++ n.hk_classes-0.8.2/hk_odbcclasses/Makefile.am 2006-11-19
13:06:00.000000000 +0100
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@/drivers
[EMAIL PROTECTED]@
INCLUDES= -I../hk_classes [EMAIL PROTECTED]@
- AM_CXXFLAGS= -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings
+ AM_CXXFLAGS= -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings
[EMAIL PROTECTED]@ @BITARCHITECTURE@
-diff -Nur o.hk_classes-0.8.1/hk_paradoxclasses/Makefile.am
n.hk_classes-0.8.1/hk_paradoxclasses/Makefile.am
---- o.hk_classes-0.8.1/hk_paradoxclasses/Makefile.am 2006-04-13
20:02:07.000000000 +0200
-+++ n.hk_classes-0.8.1/hk_paradoxclasses/Makefile.am 2006-04-23
19:18:53.000000000 +0200
-@@ -1,15 +1,20 @@
+diff -Nurb o.hk_classes-0.8.2/hk_paradoxclasses/Makefile.am
n.hk_classes-0.8.2/hk_paradoxclasses/Makefile.am
+--- o.hk_classes-0.8.2/hk_paradoxclasses/Makefile.am 2006-10-02
19:54:20.000000000 +0200
++++ n.hk_classes-0.8.2/hk_paradoxclasses/Makefile.am 2006-11-19
13:06:00.000000000 +0100
+@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@/drivers
[EMAIL PROTECTED]@
-+
-+if PARADOX_BUILTIN
INCLUDES= -I../hk_classes -I./pxlib
-+else
-+INCLUDES= -I../hk_classes
-+endif
AM_CPPFLAGS=
-
- AM_CXXFLAGS= -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings
-
--PXLIB_BUILD_DATE = 2006-02-28
-+PARADOX_LIB_BUILD_DATE = 2006-02-28
-
-
- libhk_paradoxdriver_la_LDFLAGS = -version-info 0:0:0
--libhk_paradoxdriver_la_LIBADD = -lm ../hk_classes/libhk_classes.la
-+libhk_paradoxdriver_la_LIBADD = -lm @PARADOX_LIB@
../hk_classes/libhk_classes.la
-
- lib_LTLIBRARIES = libhk_paradoxdriver.la
-
-@@ -19,16 +24,19 @@
- pxlib/px_memory.h pxlib/pxversion.h pxlib/paradox-gsf.h
pxlib/paradox-mp.h pxlib/px_encode.h \
- pxlib/px_head.h pxlib/px_io.h pxlib/px_misc.h
pxlib/sdncal.h
-
--
--
- include_HEADERS =
-
-+if PARADOX_BUILTIN
- libhk_paradoxdriver_la_SOURCES= hk_paradoxconnection.cpp
hk_paradoxdatabase.cpp hk_paradoxdatasource.cpp \
- hk_paradoxcolumn.cpp hk_paradoxresultquery.cpp
hk_paradoxtable.cpp hk_paradoxactionquery.cpp \
- pxlib/gregor.c pxlib/px_crypt.c
pxlib/px_error.c pxlib/px_io.c \
- pxlib/px_memprof.c pxlib/paradox.c
pxlib/px_encode.c pxlib/px_head.c \
- pxlib/px_memory.c pxlib/px_misc.c
-+else
-+libhk_paradoxdriver_la_SOURCES= hk_paradoxconnection.cpp
hk_paradoxdatabase.cpp hk_paradoxdatasource.cpp \
-+ hk_paradoxcolumn.cpp hk_paradoxresultquery.cpp
hk_paradoxtable.cpp hk_paradoxactionquery.cpp
-+endif
-
--
-+if PARADOX_BUILTIN
- EXTRA_DIST = pxlib/AUTHORS
--
-+endif
-diff -Nur o.hk_classes-0.8.1/hk_postgresclasses/Makefile.am
n.hk_classes-0.8.1/hk_postgresclasses/Makefile.am
---- o.hk_classes-0.8.1/hk_postgresclasses/Makefile.am 2006-04-13
20:02:07.000000000 +0200
-+++ n.hk_classes-0.8.1/hk_postgresclasses/Makefile.am 2006-04-23
19:18:54.000000000 +0200
+diff -Nurb o.hk_classes-0.8.2/hk_postgresclasses/Makefile.am
n.hk_classes-0.8.2/hk_postgresclasses/Makefile.am
+--- o.hk_classes-0.8.2/hk_postgresclasses/Makefile.am 2006-10-02
19:54:20.000000000 +0200
++++ n.hk_classes-0.8.2/hk_postgresclasses/Makefile.am 2006-11-19
13:06:00.000000000 +0100
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@/drivers
[EMAIL PROTECTED]@
INCLUDES= -I../hk_classes [EMAIL PROTECTED]@
- AM_CXXFLAGS= -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings
-diff -Nur o.hk_classes-0.8.1/hk_sqlite3classes/Makefile.am
n.hk_classes-0.8.1/hk_sqlite3classes/Makefile.am
---- o.hk_classes-0.8.1/hk_sqlite3classes/Makefile.am 2006-04-13
20:02:07.000000000 +0200
-+++ n.hk_classes-0.8.1/hk_sqlite3classes/Makefile.am 2006-04-23
19:18:54.000000000 +0200
-@@ -1,11 +1,16 @@
+ AM_CXXFLAGS= -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings
[EMAIL PROTECTED]@ @BITARCHITECTURE@
+diff -Nurb o.hk_classes-0.8.2/hk_sqlite3classes/Makefile.am
n.hk_classes-0.8.2/hk_sqlite3classes/Makefile.am
+--- o.hk_classes-0.8.2/hk_sqlite3classes/Makefile.am 2006-10-02
19:54:20.000000000 +0200
++++ n.hk_classes-0.8.2/hk_sqlite3classes/Makefile.am 2006-11-19
13:06:00.000000000 +0100
+@@ -1,5 +1,5 @@
+
[EMAIL PROTECTED]@/drivers
--INCLUDES= -I../hk_classes -I ./sqlite
[EMAIL PROTECTED]@
-+
-+if SQLITE3_BUILTIN
-+INCLUDES= -I../hk_classes -I ./sqlite
-+else
-+INCLUDES= -I../hk_classes
-+endif
- AM_CXXFLAGS= -Wall -DNO_TCL=1 -W -Wconversion -Wshadow -Wcast-qual
-Wwrite-strings
+ AM_CXXFLAGS= -Wall -DNO_TCL=1 -W -Wconversion -Wshadow -Wcast-qual
-Wwrite-strings [EMAIL PROTECTED]@ @BITARCHITECTURE@
AM_CFLAGS= -DNO_TCL=1
-
- libhk_sqlite3driver_la_LDFLAGS = -version-info 0:0:0
--libhk_sqlite3driver_la_LIBADD = ../hk_classes/libhk_classes.la
-+libhk_sqlite3driver_la_LIBADD = @SQLITE3_LIB@ ../hk_classes/libhk_classes.la
-
- lib_LTLIBRARIES = libhk_sqlite3driver.la
-
-@@ -16,10 +21,9 @@
- sqlite/btree.h sqlite/hash.h sqlite/os_common.h
sqlite/os.h sqlite/pager.h \
- sqlite/sqliteInt.h sqlite/vdbe.h sqlite/vdbeInt.h
-
--
--
--
- include_HEADERS =
-+
-+if SQLITE3_BUILTIN
- libhk_sqlite3driver_la_SOURCES= hk_sqlite3column.cpp
hk_sqlite3connection.cpp hk_sqlite3database.cpp\
- hk_sqlite3datasource.cpp
hk_sqlite3actionquery.cpp hk_sqlite3resultquery.cpp\
- hk_sqlite3table.cpp hk_sqlite3view.cpp \
-@@ -32,4 +36,8 @@
- sqlite/attach.c sqlite/build.c sqlite/date.c
sqlite/func.c sqlite/legacy.c \
- sqlite/os_unix.c sqlite/pragma.c
sqlite/random.c sqlite/table.c sqlite/trigger.c \
- sqlite/util.c sqlite/vdbeaux.c
sqlite/vdbemem.c sqlite/parse.c sqlite/opcodes.c
--
-+else
-+libhk_sqlite3driver_la_SOURCES= hk_sqlite3column.cpp
hk_sqlite3connection.cpp hk_sqlite3database.cpp\
-+ hk_sqlite3datasource.cpp
hk_sqlite3actionquery.cpp hk_sqlite3resultquery.cpp\
-+ hk_sqlite3table.cpp hk_sqlite3view.cpp
-+endif
-diff -Nur o.hk_classes-0.8.1/hk_sqliteclasses/Makefile.am
n.hk_classes-0.8.1/hk_sqliteclasses/Makefile.am
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/hk_classes.patch?r1=1.3.2.1&r2=1.3.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
