lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-06-28 15:39:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed unixODBC 2.1.0+ bug.

Browse Source 
fixed GTK/Gnome handling.
more debugger stuff.
This commit is contained in:
brianb 2002-04-14 23:35:39 +00:00
parent 0d0e0efbb7
commit e7927f94bc
27 changed files with 443 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
INSTALL
View File

@ -4,6 +4,11 @@ Basic Installation
$ ./configure $ ./configure
$ make $ make
or for a complete install (requires bison, flex, and unixODBC):
$ ./configure --enable-sql --with-unixodbc=/usr/local
$ make
This will build some useful utilities: This will build some useful utilities:
mdb-ver -- prints the version (JET 3 or 4) of an mdb file mdb-ver -- prints the version (JET 3 or 4) of an mdb file
@ -15,6 +20,7 @@ mdb-header -- generates a C header to be used in exporting mdb data to a C prog.
mdb-parsecvs -- generates a C program given a CSV file made with mdb-export mdb-parsecvs -- generates a C program given a CSV file made with mdb-export
mdb-sql -- if --enable-sql is specified, a simple SQL engine (also used by mdb-sql -- if --enable-sql is specified, a simple SQL engine (also used by
ODBC and gmdb). ODBC and gmdb).
gmdb -- a graphical utility to browse MDB files.
And some utilities useful for debugging: And some utilities useful for debugging:
@ -38,4 +44,3 @@ capabilities.
bison installed for this option. bison installed for this option.
--with-unixodbc specifies the location of the unixODBC driver manager and --with-unixodbc specifies the location of the unixODBC driver manager and
causes the ODBC driver to be built. causes the ODBC driver to be built.

9
Makefile
View File

@ -62,9 +62,11 @@ host_triplet = i686-pc-linux-gnu
AS = @AS@ AS = @AS@
CC = gcc CC = gcc
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
GTK_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include GMDB_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
GTK_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl GMDB_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
HAVE_GNOME = HAVE_GNOME =
HAVE_GTK =
HAVE_ODBC =
LD = /usr/bin/ld LD = /usr/bin/ld
LEX = flex LEX = flex
LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBTOOL = $(SHELL) $(top_builddir)/libtool
@ -72,13 +74,12 @@ LN_S = ln -s
MAKEINFO = makeinfo MAKEINFO = makeinfo
NM = /usr/bin/nm -B NM = /usr/bin/nm -B
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
ODBC =
ODBC_INC = /usr/local/include ODBC_INC = /usr/local/include
PACKAGE = mdbtools PACKAGE = mdbtools
RANLIB = ranlib RANLIB = ranlib
READLINE_LIBS = -lncurses -lreadline READLINE_LIBS = -lncurses -lreadline
SQL = SQL =
VERSION = 0.3 VERSION = 0.4
YACC = bison -y YACC = bison -y
SUBDIRS = src include SUBDIRS = src include

7
Makefile.in
View File

@ -62,9 +62,11 @@ host_triplet = @host@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
GTK_CFLAGS = @GTK_CFLAGS@ GMDB_CFLAGS = @GMDB_CFLAGS@
GTK_LIBS = @GTK_LIBS@ GMDB_LIBS = @GMDB_LIBS@
HAVE_GNOME = @HAVE_GNOME@ HAVE_GNOME = @HAVE_GNOME@
HAVE_GTK = @HAVE_GTK@
HAVE_ODBC = @HAVE_ODBC@
LD = @LD@ LD = @LD@
LEX = @LEX@ LEX = @LEX@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
@ -72,7 +74,6 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
NM = @NM@ NM = @NM@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
ODBC = @ODBC@
ODBC_INC = @ODBC_INC@ ODBC_INC = @ODBC_INC@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@

15
README
View File

@ -1,6 +1,19 @@
This is mdbtools version 0.4 This is mdbtools version 0.4
This software is still beta so don't expect too much. Welcome to the exciting world of MDB Tools! In short, MDB Tools is a set of
program to help you use Microsoft Access file in various settings. The major
pieces are:
. libmdb - the core library that allows access to MDB files programatically.
. libmdbsql - builds on libmdb to provide a SQL engine (ala Jet)
. utils - provides command line utilities to list tables, export schema,
and data, show the version of the files, and other useful stuff.
. mdb-sql - a command line SQL tool that allows one to type sql queries and
get results.
. odbc - An ODBC driver for use with unixODBC driver manager. Allows
one to use MDB files with PHP for example.
. gmdb - The GTK MDB File Viewer and debugger. Still alpha, but making
great progress.
If you are interested in helping, read the HACKING file for a description of If you are interested in helping, read the HACKING file for a description of
where the code stands and what has been gleened of the file format. where the code stands and what has been gleened of the file format.

192
configure vendored
View File

@ -707,7 +707,7 @@ fi
PACKAGE=mdbtools PACKAGE=mdbtools
VERSION=0.3 VERSION=0.4
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@ -1039,7 +1039,6 @@ else
SET_MAKE="MAKE=${MAKE-make}" SET_MAKE="MAKE=${MAKE-make}"
fi fi
#AC_PROG_RANLIB
# Check whether --enable-shared or --disable-shared was given. # Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then if test "${enable_shared+set}" = set; then
enableval="$enable_shared" enableval="$enable_shared"
@ -1116,7 +1115,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi fi
echo $ac_n "checking host system type""... $ac_c" 1>&6 echo $ac_n "checking host system type""... $ac_c" 1>&6
echo "configure:1120: checking host system type" >&5 echo "configure:1119: checking host system type" >&5
host_alias=$host host_alias=$host
case "$host_alias" in case "$host_alias" in
@ -1137,7 +1136,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6 echo "$ac_t""$host" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6
echo "configure:1141: checking build system type" >&5 echo "configure:1140: checking build system type" >&5
build_alias=$build build_alias=$build
case "$build_alias" in case "$build_alias" in
@ -1157,7 +1156,7 @@ echo "$ac_t""$build" 1>&6
# Extract the first word of "ranlib", so it can be a program name with args. # Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2 set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1161: checking for $ac_word" >&5 echo "configure:1160: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1196,7 +1195,7 @@ ac_prog=ld
if test "$ac_cv_prog_gcc" = yes; then if test "$ac_cv_prog_gcc" = yes; then
# Check if gcc -print-prog-name=ld gives a path. # Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
echo "configure:1200: checking for ld used by GCC" >&5 echo "configure:1199: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5` ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in case "$ac_prog" in
# Accept absolute paths. # Accept absolute paths.
@ -1220,10 +1219,10 @@ echo "configure:1200: checking for ld used by GCC" >&5
esac esac
elif test "$with_gnu_ld" = yes; then elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
echo "configure:1224: checking for GNU ld" >&5 echo "configure:1223: checking for GNU ld" >&5
else else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
echo "configure:1227: checking for non-GNU ld" >&5 echo "configure:1226: checking for non-GNU ld" >&5
fi fi
if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -1259,7 +1258,7 @@ fi
test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
echo "configure:1263: checking if the linker ($LD) is GNU ld" >&5 echo "configure:1262: checking if the linker ($LD) is GNU ld" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1275,7 +1274,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
echo "configure:1279: checking for BSD-compatible nm" >&5 echo "configure:1278: checking for BSD-compatible nm" >&5
if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1312,7 +1311,7 @@ echo "$ac_t""$NM" 1>&6
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
echo "configure:1316: checking whether ln -s works" >&5 echo "configure:1315: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1356,8 +1355,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
case "$host" in case "$host" in
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 1360 "configure"' > conftest.$ac_ext echo '#line 1359 "configure"' > conftest.$ac_ext
if { (eval echo configure:1361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:1360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case "`/usr/bin/file conftest.o`" in case "`/usr/bin/file conftest.o`" in
*32-bit*) *32-bit*)
LD="${LD-ld} -32" LD="${LD-ld} -32"
@ -1378,19 +1377,19 @@ case "$host" in
SAVE_CFLAGS="$CFLAGS" SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf" CFLAGS="$CFLAGS -belf"
echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
echo "configure:1382: checking whether the C compiler needs -belf" >&5 echo "configure:1381: checking whether the C compiler needs -belf" >&5
if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1387 "configure" #line 1386 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
lt_cv_cc_needs_belf=yes lt_cv_cc_needs_belf=yes
else else
@ -1492,7 +1491,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
exec 5>>./config.log exec 5>>./config.log
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:1496: checking how to run the C preprocessor" >&5 echo "configure:1495: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory. # On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then if test -n "$CPP" && test -d "$CPP"; then
CPP= CPP=
@ -1507,13 +1506,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser, # On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. # not just through cpp.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1511 "configure" #line 1510 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
@ -1524,13 +1523,13 @@ else
rm -rf conftest* rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp" CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1528 "configure" #line 1527 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
@ -1541,13 +1540,13 @@ else
rm -rf conftest* rm -rf conftest*
CPP="${CC-cc} -nologo -E" CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1545 "configure" #line 1544 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
@ -1577,7 +1576,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1581: checking for $ac_word" >&5 echo "configure:1580: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1610,7 +1609,7 @@ test -n "$LEX" || LEX=""$missing_dir/missing flex""
# Extract the first word of "flex", so it can be a program name with args. # Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2 set dummy flex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1614: checking for $ac_word" >&5 echo "configure:1613: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1644,7 +1643,7 @@ then
*) ac_lib=l ;; *) ac_lib=l ;;
esac esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
echo "configure:1648: checking for yywrap in -l$ac_lib" >&5 echo "configure:1647: checking for yywrap in -l$ac_lib" >&5
ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -1652,7 +1651,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS" LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1656 "configure" #line 1655 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -1663,7 +1662,7 @@ int main() {
yywrap() yywrap()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -1686,7 +1685,7 @@ fi
fi fi
echo $ac_n "checking lex output file root""... $ac_c" 1>&6 echo $ac_n "checking lex output file root""... $ac_c" 1>&6
echo "configure:1690: checking lex output file root" >&5 echo "configure:1689: checking lex output file root" >&5
if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1707,7 +1706,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6
LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
echo "configure:1711: checking whether yytext is a pointer" >&5 echo "configure:1710: checking whether yytext is a pointer" >&5
if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1719,14 +1718,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="$LIBS $LEXLIB" LIBS="$LIBS $LEXLIB"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1723 "configure" #line 1722 "configure"
#include "confdefs.h" #include "confdefs.h"
`cat $LEX_OUTPUT_ROOT.c` `cat $LEX_OUTPUT_ROOT.c`
int main() { int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_cv_prog_lex_yytext_pointer=yes ac_cv_prog_lex_yytext_pointer=yes
else else
@ -1752,7 +1751,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1756: checking for $ac_word" >&5 echo "configure:1755: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1784,12 +1783,12 @@ test -n "$YACC" || YACC="yacc"
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
echo "configure:1788: checking for ANSI C header files" >&5 echo "configure:1787: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1793 "configure" #line 1792 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
@ -1797,7 +1796,7 @@ else
#include <float.h> #include <float.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@ -1814,7 +1813,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI. # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1818 "configure" #line 1817 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <string.h> #include <string.h>
EOF EOF
@ -1832,7 +1831,7 @@ fi
if test $ac_cv_header_stdc = yes; then if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1836 "configure" #line 1835 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
EOF EOF
@ -1853,7 +1852,7 @@ if test "$cross_compiling" = yes; then
: :
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1857 "configure" #line 1856 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@ -1864,7 +1863,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); } exit (0); }
EOF EOF
if { (eval echo configure:1868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:1867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
: :
else else
@ -1891,17 +1890,17 @@ for ac_hdr in fcntl.h limits.h unistd.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1895: checking for $ac_hdr" >&5 echo "configure:1894: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1900 "configure" #line 1899 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@ -1931,17 +1930,17 @@ for ac_hdr in wordexp.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1935: checking for $ac_hdr" >&5 echo "configure:1934: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1940 "configure" #line 1939 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@ -1969,12 +1968,12 @@ done
echo $ac_n "checking for working const""... $ac_c" 1>&6 echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:1973: checking for working const" >&5 echo "configure:1972: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1978 "configure" #line 1977 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
@ -2023,7 +2022,7 @@ ccp = (char const *const *) p;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_c_const=yes ac_cv_c_const=yes
else else
@ -2044,12 +2043,12 @@ EOF
fi fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6 echo $ac_n "checking for size_t""... $ac_c" 1>&6
echo "configure:2048: checking for size_t" >&5 echo "configure:2047: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2053 "configure" #line 2052 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#if STDC_HEADERS #if STDC_HEADERS
@ -2078,14 +2077,14 @@ fi
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
echo "configure:2082: checking whether byte ordering is bigendian" >&5 echo "configure:2081: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
ac_cv_c_bigendian=unknown ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro. # See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2089 "configure" #line 2088 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
@ -2096,11 +2095,11 @@ int main() {
#endif #endif
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not. # It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2104 "configure" #line 2103 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
@ -2111,7 +2110,7 @@ int main() {
#endif #endif
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_c_bigendian=yes ac_cv_c_bigendian=yes
else else
@ -2131,7 +2130,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2135 "configure" #line 2134 "configure"
#include "confdefs.h" #include "confdefs.h"
main () { main () {
/* Are we little or big endian? From Harbison&Steele. */ /* Are we little or big endian? From Harbison&Steele. */
@ -2144,7 +2143,7 @@ main () {
exit (u.c[sizeof (long) - 1] == 1); exit (u.c[sizeof (long) - 1] == 1);
} }
EOF EOF
if { (eval echo configure:2148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:2147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_c_bigendian=no ac_cv_c_bigendian=no
else else
@ -2194,11 +2193,11 @@ fi
if test x$odbc = xtrue; then if test x$odbc = xtrue; then
ODBC_TRUE= HAVE_ODBC_TRUE=
ODBC_FALSE='#' HAVE_ODBC_FALSE='#'
else else
ODBC_TRUE='#' HAVE_ODBC_TRUE='#'
ODBC_FALSE= HAVE_ODBC_FALSE=
fi fi
@ -2211,7 +2210,6 @@ fi
if test "$enable_sql" = "yes" ; then if test "$enable_sql" = "yes" ; then
echo "SQL ENABLED!"
CFLAGS="$CFLAGS -DSQL" CFLAGS="$CFLAGS -DSQL"
sql=true sql=true
fi fi
@ -2226,8 +2224,40 @@ else
fi fi
echo $ac_n "checking for GTK >= 1.2.0""... $ac_c" 1>&6
echo "configure:2229: checking for GTK >= 1.2.0" >&5
if gnome-config --version > /dev/null 2>&1
then
verstxt=`gtk-config --version`
vers=`echo "$verstxt" | \
awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
if test "$vers" -ge 1002000
then
echo "$ac_t""found" 1>&6
GMDB_LIBS=`gtk-config --libs`
GMDB_CFLAGS=`gtk-config --cflags`
havegtk=true
else
echo "$ac_t""not found" 1>&6
havegtk=false
fi
else
echo "$ac_t""not found" 1>&6
havegtk=false
fi
if test x$havegtk = xtrue; then
HAVE_GTK_TRUE=
HAVE_GTK_FALSE='#'
else
HAVE_GTK_TRUE='#'
HAVE_GTK_FALSE=
fi
echo $ac_n "checking for Gnome >= 1.2.0""... $ac_c" 1>&6 echo $ac_n "checking for Gnome >= 1.2.0""... $ac_c" 1>&6
echo "configure:2231: checking for Gnome >= 1.2.0" >&5 echo "configure:2261: checking for Gnome >= 1.2.0" >&5
if gnome-config --version > /dev/null 2>&1 if gnome-config --version > /dev/null 2>&1
then then
verstxt=`gnome-config --version` verstxt=`gnome-config --version`
@ -2237,20 +2267,16 @@ then
then then
echo "$ac_t""found" 1>&6 echo "$ac_t""found" 1>&6
CFLAGS="$CFLAGS -DHAVE_GNOME" CFLAGS="$CFLAGS -DHAVE_GNOME"
GTK_LIBS=`gnome-config gnome gnomeui --libs` GMDB_LIBS=`gnome-config gnome gnomeui --libs`
GTK_CFLAGS=`gnome-config gnome gnomeui --cflags` GMDB_CFLAGS=`gnome-config gnome gnomeui --cflags`
havegnome=true havegnome=true
else else
echo "$ac_t""not found" 1>&6 echo "$ac_t""not found" 1>&6
GTK_LIBS=`gtk-config --libs`
GTK_CFLAGS=`gtk-config --cflags`
havegnome=false havegnome=false
fi fi
else else
echo "$ac_t""not found" 1>&6 echo "$ac_t""not found" 1>&6
havegnome=false havegnome=false
GTK_LIBS=`gtk-config --libs`
GTK_CFLAGS=`gtk-config --cflags`
fi fi
@ -2266,10 +2292,11 @@ fi
OLDLDFLAGS=$LDFLAGS OLDLDFLAGS=$LDFLAGS
echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
echo "configure:2273: checking for initscr in -lncurses" >&5 echo "configure:2300: checking for initscr in -lncurses" >&5
ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -2277,7 +2304,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lncurses $LIBS" LIBS="-lncurses $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2281 "configure" #line 2308 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -2288,7 +2315,7 @@ int main() {
initscr() initscr()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:2319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -2313,7 +2340,7 @@ fi
echo $ac_n "checking for add_history in -lreadline""... $ac_c" 1>&6 echo $ac_n "checking for add_history in -lreadline""... $ac_c" 1>&6
echo "configure:2317: checking for add_history in -lreadline" >&5 echo "configure:2344: checking for add_history in -lreadline" >&5
ac_lib_var=`echo readline'_'add_history | sed 'y%./+-%__p_%'` ac_lib_var=`echo readline'_'add_history | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -2321,7 +2348,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lreadline $LIBS" LIBS="-lreadline $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2325 "configure" #line 2352 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -2332,7 +2359,7 @@ int main() {
add_history() add_history()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:2363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -2540,18 +2567,21 @@ s%@LEXLIB@%$LEXLIB%g
s%@CPP@%$CPP%g s%@CPP@%$CPP%g
s%@LEX_OUTPUT_ROOT@%$LEX_OUTPUT_ROOT%g s%@LEX_OUTPUT_ROOT@%$LEX_OUTPUT_ROOT%g
s%@YACC@%$YACC%g s%@YACC@%$YACC%g
s%@ODBC_TRUE@%$ODBC_TRUE%g s%@HAVE_ODBC_TRUE@%$HAVE_ODBC_TRUE%g
s%@ODBC_FALSE@%$ODBC_FALSE%g s%@HAVE_ODBC_FALSE@%$HAVE_ODBC_FALSE%g
s%@ODBC@%$ODBC%g s%@HAVE_ODBC@%$HAVE_ODBC%g
s%@ODBC_INC@%$ODBC_INC%g s%@ODBC_INC@%$ODBC_INC%g
s%@SQL_TRUE@%$SQL_TRUE%g s%@SQL_TRUE@%$SQL_TRUE%g
s%@SQL_FALSE@%$SQL_FALSE%g s%@SQL_FALSE@%$SQL_FALSE%g
s%@SQL@%$SQL%g s%@SQL@%$SQL%g
s%@HAVE_GTK_TRUE@%$HAVE_GTK_TRUE%g
s%@HAVE_GTK_FALSE@%$HAVE_GTK_FALSE%g
s%@HAVE_GTK@%$HAVE_GTK%g
s%@HAVE_GNOME_TRUE@%$HAVE_GNOME_TRUE%g s%@HAVE_GNOME_TRUE@%$HAVE_GNOME_TRUE%g
s%@HAVE_GNOME_FALSE@%$HAVE_GNOME_FALSE%g s%@HAVE_GNOME_FALSE@%$HAVE_GNOME_FALSE%g
s%@HAVE_GNOME@%$HAVE_GNOME%g s%@HAVE_GNOME@%$HAVE_GNOME%g
s%@GTK_LIBS@%$GTK_LIBS%g s%@GMDB_LIBS@%$GMDB_LIBS%g
s%@GTK_CFLAGS@%$GTK_CFLAGS%g s%@GMDB_CFLAGS@%$GMDB_CFLAGS%g
s%@READLINE_LIBS@%$READLINE_LIBS%g s%@READLINE_LIBS@%$READLINE_LIBS%g
CEOF CEOF

45
configure.in
View File

@ -1,11 +1,10 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/extras/mdb-dump.c) AC_INIT(src/extras/mdb-dump.c)
AM_INIT_AUTOMAKE(mdbtools,0.3) AM_INIT_AUTOMAKE(mdbtools,0.4)
AC_PROG_CC(gcc) AC_PROG_CC(gcc)
dnl Checks for programs. dnl Checks for programs.
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
#AC_PROG_RANLIB
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
AM_PROG_LEX AM_PROG_LEX
AC_PROG_YACC AC_PROG_YACC
@ -39,21 +38,44 @@ if test "$with_unixodbc"; then
ODBC_INC=$with_unixodbc/include ODBC_INC=$with_unixodbc/include
odbc=true odbc=true
fi fi
AM_CONDITIONAL(ODBC, test x$odbc = xtrue) AM_CONDITIONAL(HAVE_ODBC, test x$odbc = xtrue)
AC_SUBST(ODBC) AC_SUBST(HAVE_ODBC)
AC_SUBST(ODBC_INC) AC_SUBST(ODBC_INC)
AC_ARG_ENABLE(sql, AC_ARG_ENABLE(sql,
[ --enable-sql Enable SQL engine]) [ --enable-sql Enable SQL engine])
if test "$enable_sql" = "yes" ; then if test "$enable_sql" = "yes" ; then
echo "SQL ENABLED!"
CFLAGS="$CFLAGS -DSQL" CFLAGS="$CFLAGS -DSQL"
sql=true sql=true
fi fi
AM_CONDITIONAL(SQL, test x$sql = xtrue) AM_CONDITIONAL(SQL, test x$sql = xtrue)
AC_SUBST(SQL) AC_SUBST(SQL)
dnl gnome check modified from gnome-db
AC_MSG_CHECKING(for GTK >= 1.2.0)
if gnome-config --version > /dev/null 2>&1
then
verstxt=`gtk-config --version`
vers=`echo "$verstxt" | \
awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
if test "$vers" -ge 1002000
then
AC_MSG_RESULT(found)
GMDB_LIBS=`gtk-config --libs`
GMDB_CFLAGS=`gtk-config --cflags`
havegtk=true
else
AC_MSG_RESULT(not found)
havegtk=false
fi
else
AC_MSG_RESULT(not found)
havegtk=false
fi
AM_CONDITIONAL(HAVE_GTK, test x$havegtk = xtrue)
AC_SUBST(HAVE_GTK)
dnl gnome check modified from gnome-db dnl gnome check modified from gnome-db
AC_MSG_CHECKING(for Gnome >= 1.2.0) AC_MSG_CHECKING(for Gnome >= 1.2.0)
if gnome-config --version > /dev/null 2>&1 if gnome-config --version > /dev/null 2>&1
@ -65,25 +87,22 @@ then
then then
AC_MSG_RESULT(found) AC_MSG_RESULT(found)
CFLAGS="$CFLAGS -DHAVE_GNOME" CFLAGS="$CFLAGS -DHAVE_GNOME"
GTK_LIBS=`gnome-config gnome gnomeui --libs` GMDB_LIBS=`gnome-config gnome gnomeui --libs`
GTK_CFLAGS=`gnome-config gnome gnomeui --cflags` GMDB_CFLAGS=`gnome-config gnome gnomeui --cflags`
havegnome=true havegnome=true
else else
AC_MSG_RESULT(not found) AC_MSG_RESULT(not found)
GTK_LIBS=`gtk-config --libs`
GTK_CFLAGS=`gtk-config --cflags`
havegnome=false havegnome=false
fi fi
else else
AC_MSG_RESULT(not found) AC_MSG_RESULT(not found)
havegnome=false havegnome=false
GTK_LIBS=`gtk-config --libs`
GTK_CFLAGS=`gtk-config --cflags`
fi fi
AM_CONDITIONAL(HAVE_GNOME, test x$havegnome = xtrue) AM_CONDITIONAL(HAVE_GNOME, test x$havegnome = xtrue)
AC_SUBST(HAVE_GNOME) AC_SUBST(HAVE_GNOME)
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS) AC_SUBST(GMDB_LIBS)
AC_SUBST(GMDB_CFLAGS)
dnl Checks for library functions. dnl Checks for library functions.

11
include/Makefile
View File

@ -62,9 +62,11 @@ host_triplet = i686-pc-linux-gnu
AS = @AS@ AS = @AS@
CC = gcc CC = gcc
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
GTK_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include GMDB_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
GTK_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl GMDB_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
HAVE_GNOME = HAVE_GNOME =
HAVE_GTK =
HAVE_ODBC =
LD = /usr/bin/ld LD = /usr/bin/ld
LEX = flex LEX = flex
LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBTOOL = $(SHELL) $(top_builddir)/libtool
@ -72,16 +74,15 @@ LN_S = ln -s
MAKEINFO = makeinfo MAKEINFO = makeinfo
NM = /usr/bin/nm -B NM = /usr/bin/nm -B
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
ODBC =
ODBC_INC = /usr/local/include ODBC_INC = /usr/local/include
PACKAGE = mdbtools PACKAGE = mdbtools
RANLIB = ranlib RANLIB = ranlib
READLINE_LIBS = -lncurses -lreadline READLINE_LIBS = -lncurses -lreadline
SQL = SQL =
VERSION = 0.3 VERSION = 0.4
YACC = bison -y YACC = bison -y
include_HEADERS = mdbtools.h mdbsql.h include_HEADERS = mdbtools.h mdbsql.h mdbodbc.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
HEADERS = $(include_HEADERS) HEADERS = $(include_HEADERS)

2
include/Makefile.am
View File

@ -1 +1 @@
include_HEADERS = mdbtools.h mdbsql.h include_HEADERS = mdbtools.h mdbsql.h mdbodbc.h

9
include/Makefile.in
View File

@ -62,9 +62,11 @@ host_triplet = @host@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
GTK_CFLAGS = @GTK_CFLAGS@ GMDB_CFLAGS = @GMDB_CFLAGS@
GTK_LIBS = @GTK_LIBS@ GMDB_LIBS = @GMDB_LIBS@
HAVE_GNOME = @HAVE_GNOME@ HAVE_GNOME = @HAVE_GNOME@
HAVE_GTK = @HAVE_GTK@
HAVE_ODBC = @HAVE_ODBC@
LD = @LD@ LD = @LD@
LEX = @LEX@ LEX = @LEX@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
@ -72,7 +74,6 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
NM = @NM@ NM = @NM@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
ODBC = @ODBC@
ODBC_INC = @ODBC_INC@ ODBC_INC = @ODBC_INC@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
@ -81,7 +82,7 @@ SQL = @SQL@
VERSION = @VERSION@ VERSION = @VERSION@
YACC = @YACC@ YACC = @YACC@
include_HEADERS = mdbtools.h mdbsql.h include_HEADERS = mdbtools.h mdbsql.h mdbodbc.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
HEADERS = $(include_HEADERS) HEADERS = $(include_HEADERS)

13
src/Makefile
View File

@ -62,9 +62,11 @@ host_triplet = i686-pc-linux-gnu
AS = @AS@ AS = @AS@
CC = gcc CC = gcc
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
GTK_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include GMDB_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
GTK_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl GMDB_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
HAVE_GNOME = HAVE_GNOME =
HAVE_GTK =
HAVE_ODBC =
LD = /usr/bin/ld LD = /usr/bin/ld
LEX = flex LEX = flex
LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBTOOL = $(SHELL) $(top_builddir)/libtool
@ -72,15 +74,14 @@ LN_S = ln -s
MAKEINFO = makeinfo MAKEINFO = makeinfo
NM = /usr/bin/nm -B NM = /usr/bin/nm -B
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
ODBC =
ODBC_INC = /usr/local/include ODBC_INC = /usr/local/include
PACKAGE = mdbtools PACKAGE = mdbtools
RANLIB = ranlib RANLIB = ranlib
READLINE_LIBS = -lncurses -lreadline READLINE_LIBS = -lncurses -lreadline
SQL = SQL =
VERSION = 0.3 VERSION = 0.4
YACC = bison -y YACC = bison -y
SUBDIRS = libmdb sql util extras SUBDIRS = libmdb sql util extras odbc gmdb
#SUBDIRS = #libmdb util extras #SUBDIRS = #libmdb util extras
DEFDIR = $(prefix) DEFDIR = $(prefix)
#DEFDIR = #$(prefix) #DEFDIR = #$(prefix)
@ -93,7 +94,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar TAR = gtar
GZIP_ENV = --best GZIP_ENV = --best
DIST_SUBDIRS = libmdb sql util extras libmdb util extras DIST_SUBDIRS = libmdb sql util extras odbc gmdb libmdb util extras
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)

2
src/Makefile.am
View File

@ -1,5 +1,5 @@
if SQL if SQL
SUBDIRS = libmdb sql util extras SUBDIRS = libmdb sql util extras odbc gmdb
DEFDIR = $(prefix) DEFDIR = $(prefix)
else else
SUBDIRS = libmdb util extras SUBDIRS = libmdb util extras

11
src/Makefile.in
View File

@ -62,9 +62,11 @@ host_triplet = @host@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
GTK_CFLAGS = @GTK_CFLAGS@ GMDB_CFLAGS = @GMDB_CFLAGS@
GTK_LIBS = @GTK_LIBS@ GMDB_LIBS = @GMDB_LIBS@
HAVE_GNOME = @HAVE_GNOME@ HAVE_GNOME = @HAVE_GNOME@
HAVE_GTK = @HAVE_GTK@
HAVE_ODBC = @HAVE_ODBC@
LD = @LD@ LD = @LD@
LEX = @LEX@ LEX = @LEX@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
@ -72,7 +74,6 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
NM = @NM@ NM = @NM@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
ODBC = @ODBC@
ODBC_INC = @ODBC_INC@ ODBC_INC = @ODBC_INC@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
@ -80,7 +81,7 @@ READLINE_LIBS = @READLINE_LIBS@
SQL = @SQL@ SQL = @SQL@
VERSION = @VERSION@ VERSION = @VERSION@
YACC = @YACC@ YACC = @YACC@
@SQL_TRUE@SUBDIRS = @SQL_TRUE@libmdb sql util extras @SQL_TRUE@SUBDIRS = @SQL_TRUE@libmdb sql util extras odbc gmdb
@SQL_FALSE@SUBDIRS = @SQL_FALSE@libmdb util extras @SQL_FALSE@SUBDIRS = @SQL_FALSE@libmdb util extras
@SQL_TRUE@DEFDIR = @SQL_TRUE@$(prefix) @SQL_TRUE@DEFDIR = @SQL_TRUE@$(prefix)
@SQL_FALSE@DEFDIR = @SQL_FALSE@$(prefix) @SQL_FALSE@DEFDIR = @SQL_FALSE@$(prefix)
@ -93,7 +94,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar TAR = gtar
GZIP_ENV = --best GZIP_ENV = --best
DIST_SUBDIRS = libmdb sql util extras libmdb util extras DIST_SUBDIRS = libmdb sql util extras odbc gmdb libmdb util extras
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)

11
src/extras/Makefile
View File

@ -62,9 +62,11 @@ host_triplet = i686-pc-linux-gnu
AS = @AS@ AS = @AS@
CC = gcc CC = gcc
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
GTK_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include GMDB_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
GTK_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl GMDB_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
HAVE_GNOME = HAVE_GNOME =
HAVE_GTK =
HAVE_ODBC =
LD = /usr/bin/ld LD = /usr/bin/ld
LEX = flex LEX = flex
LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBTOOL = $(SHELL) $(top_builddir)/libtool
@ -72,13 +74,12 @@ LN_S = ln -s
MAKEINFO = makeinfo MAKEINFO = makeinfo
NM = /usr/bin/nm -B NM = /usr/bin/nm -B
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
ODBC =
ODBC_INC = /usr/local/include ODBC_INC = /usr/local/include
PACKAGE = mdbtools PACKAGE = mdbtools
RANLIB = ranlib RANLIB = ranlib
READLINE_LIBS = -lncurses -lreadline READLINE_LIBS = -lncurses -lreadline
SQL = SQL =
VERSION = 0.3 VERSION = 0.4
YACC = bison -y YACC = bison -y
bin_PROGRAMS = mdb-dump bin_PROGRAMS = mdb-dump
@ -91,7 +92,7 @@ CONFIG_CLEAN_FILES =
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
DEFS = -DPACKAGE=\"mdbtools\" -DVERSION=\"0.3\" -DYYTEXT_POINTER=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_WORDEXP_H=1 -DHAVE_READLINE=1 -I. -I$(srcdir) DEFS = -DPACKAGE=\"mdbtools\" -DVERSION=\"0.4\" -DYYTEXT_POINTER=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_WORDEXP_H=1 -DHAVE_READLINE=1 -I. -I$(srcdir)
CPPFLAGS = CPPFLAGS =
LDFLAGS = LDFLAGS =
mdb_dump_OBJECTS = mdb-dump.o mdbsupport.o mdb_dump_OBJECTS = mdb-dump.o mdbsupport.o

7
src/extras/Makefile.in
View File

@ -62,9 +62,11 @@ host_triplet = @host@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
GTK_CFLAGS = @GTK_CFLAGS@ GMDB_CFLAGS = @GMDB_CFLAGS@
GTK_LIBS = @GTK_LIBS@ GMDB_LIBS = @GMDB_LIBS@
HAVE_GNOME = @HAVE_GNOME@ HAVE_GNOME = @HAVE_GNOME@
HAVE_GTK = @HAVE_GTK@
HAVE_ODBC = @HAVE_ODBC@
LD = @LD@ LD = @LD@
LEX = @LEX@ LEX = @LEX@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
@ -72,7 +74,6 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
NM = @NM@ NM = @NM@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
ODBC = @ODBC@
ODBC_INC = @ODBC_INC@ ODBC_INC = @ODBC_INC@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@

16
src/gmdb/Makefile.am
View File

@ -1,10 +1,16 @@
if HAVE_GTK
bin_PROGRAMS = gmdb bin_PROGRAMS = gmdb
include_HEADERS = gmdb.h gtkhlist.h debug.xpm forms.xpm macros.xpm pk.xpm \
table.xpm query.xpm code.xpm reports.xpm
gmdb_SOURCES = debug.c file.c form.c gtkhlist.c info.c macro.c main.c \ gmdb_SOURCES = debug.c file.c form.c gtkhlist.c info.c macro.c main.c \
module.c query.c report.c sql.c table.c table_data.c table_def.c \ module.c query.c report.c sql.c table.c table_data.c table_def.c \
table_export.c util.c table_export.c util.c
LIBS = $(GTK_LIBS) @LEXLIB@ LIBS = $(GMDB_LIBS) @LEXLIB@
INCLUDES = -I$(top_srcdir)/include $(GTK_CFLAGS) INCLUDES = -I$(top_srcdir)/include $(GMDB_CFLAGS)
LDADD = ../libmdb/libmdb.la #LDADD = ../libmdb/libmdb.la
if SQL LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la
gmdb_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la #if SQL
#gmdb_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la
#endif
endif endif

24
src/gmdb/debug.c
View File

@ -95,19 +95,31 @@ int i;
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->white, &dbug->black, gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->white, &dbug->black,
dbug->linesz * start_row + start_col, dbug->linesz * start_row + start_col,
dbug->linesz * start_row + end_col + 2); dbug->linesz * start_row + end_col + 2);
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->white, &dbug->black,
dbug->linesz * start_row + 59 + (range->start_byte % 16),
dbug->linesz * start_row + 59 + (range->end_byte % 16) + 1);
} else { } else {
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->white, &dbug->black, gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->white, &dbug->black,
dbug->linesz * start_row + start_col, dbug->linesz * start_row + start_col,
/* 55 = 8 (addr) + 15 (bytes) * 3 (%02x " ") + 2 (last byte) */ /* 55 = 8 (addr) + 15 (bytes) * 3 (%02x " ") + 2 (last byte) */
dbug->linesz * start_row + 55); dbug->linesz * start_row + 55);
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->white, &dbug->black,
dbug->linesz * start_row + 59 + (range->start_byte % 16),
dbug->linesz * start_row + 75);
for (i=start_row + 1; i < end_row; i++) { for (i=start_row + 1; i < end_row; i++) {
gmdb_debug_redraw(dbug->textbox, dbug->font, gmdb_debug_redraw(dbug->textbox, dbug->font,
&dbug->white, &dbug->black, &dbug->white, &dbug->black,
dbug->linesz * i + 8, dbug->linesz * i + 55); dbug->linesz * i + 8, dbug->linesz * i + 55);
gmdb_debug_redraw(dbug->textbox, dbug->font,
&dbug->white, &dbug->black,
dbug->linesz * i + 59, dbug->linesz * i + 75);
} }
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->white, &dbug->black, gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->white, &dbug->black,
dbug->linesz * end_row + 8, dbug->linesz * end_row + 8,
dbug->linesz * end_row + end_col + 2); dbug->linesz * end_row + end_col + 2);
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->white, &dbug->black,
dbug->linesz * end_row + 59,
dbug->linesz * end_row + 59 + (range->end_byte % 16) + 1);
} }
gtk_text_thaw(GTK_TEXT(dbug->textbox)); gtk_text_thaw(GTK_TEXT(dbug->textbox));
} }
@ -132,19 +144,31 @@ int i;
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->black, &dbug->white, gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->black, &dbug->white,
dbug->linesz * start_row + start_col, dbug->linesz * start_row + start_col,
dbug->linesz * start_row + end_col + 2); dbug->linesz * start_row + end_col + 2);
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->black, &dbug->white,
dbug->linesz * start_row + 59 + (range->start_byte % 16),
dbug->linesz * start_row + 59 + (range->end_byte % 16) + 1);
} else { } else {
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->black, &dbug->white, gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->black, &dbug->white,
dbug->linesz * start_row + start_col, dbug->linesz * start_row + start_col,
/* 55 = 8 (addr) + 15 (bytes) * 3 (%02x " ") + 2 (last byte) */ /* 55 = 8 (addr) + 15 (bytes) * 3 (%02x " ") + 2 (last byte) */
dbug->linesz * start_row + 55); dbug->linesz * start_row + 55);
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->black, &dbug->white,
dbug->linesz * start_row + 59 + (range->start_byte % 16),
dbug->linesz * start_row + 75);
for (i=start_row + 1; i < end_row; i++) { for (i=start_row + 1; i < end_row; i++) {
gmdb_debug_redraw(dbug->textbox, dbug->font, gmdb_debug_redraw(dbug->textbox, dbug->font,
&dbug->black, &dbug->white, &dbug->black, &dbug->white,
dbug->linesz * i + 8, dbug->linesz * i + 55); dbug->linesz * i + 8, dbug->linesz * i + 55);
gmdb_debug_redraw(dbug->textbox, dbug->font,
&dbug->black, &dbug->white,
dbug->linesz * i + 59, dbug->linesz * i + 75);
} }
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->black, &dbug->white, gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->black, &dbug->white,
dbug->linesz * end_row + 8, dbug->linesz * end_row + 8,
dbug->linesz * end_row + end_col + 2); dbug->linesz * end_row + end_col + 2);
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->black, &dbug->white,
dbug->linesz * end_row + 59,
dbug->linesz * end_row + 59 + (range->end_byte % 16) + 1);
} }
} }
void void

4
src/gmdb/main.c
View File

@ -242,8 +242,10 @@ gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
#endif #endif
#ifdef SQL
/* initialize the SQL engine */ /* initialize the SQL engine */
sql = mdb_sql_init(); sql = mdb_sql_init();
#endif
/* initialize MDB Tools library */ /* initialize MDB Tools library */
mdb_init(); mdb_init();
@ -314,8 +316,10 @@ gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
/* enter the main loop */ /* enter the main loop */
gtk_main (); gtk_main ();
#ifdef SQL
/* free MDB Tools library */ /* free MDB Tools library */
mdb_sql_exit(sql); mdb_sql_exit(sql);
#endif
mdb_exit(); mdb_exit();
return 0; return 0;

11
src/libmdb/Makefile
View File

@ -62,9 +62,11 @@ host_triplet = i686-pc-linux-gnu
AS = @AS@ AS = @AS@
CC = gcc CC = gcc
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
GTK_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include GMDB_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
GTK_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl GMDB_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
HAVE_GNOME = HAVE_GNOME =
HAVE_GTK =
HAVE_ODBC =
LD = /usr/bin/ld LD = /usr/bin/ld
LEX = flex LEX = flex
LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBTOOL = $(SHELL) $(top_builddir)/libtool
@ -72,13 +74,12 @@ LN_S = ln -s
MAKEINFO = makeinfo MAKEINFO = makeinfo
NM = /usr/bin/nm -B NM = /usr/bin/nm -B
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
ODBC =
ODBC_INC = /usr/local/include ODBC_INC = /usr/local/include
PACKAGE = mdbtools PACKAGE = mdbtools
RANLIB = ranlib RANLIB = ranlib
READLINE_LIBS = -lncurses -lreadline READLINE_LIBS = -lncurses -lreadline
SQL = SQL =
VERSION = 0.3 VERSION = 0.4
YACC = bison -y YACC = bison -y
lib_LTLIBRARIES = libmdb.la lib_LTLIBRARIES = libmdb.la
@ -90,7 +91,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = -DPACKAGE=\"mdbtools\" -DVERSION=\"0.3\" -DYYTEXT_POINTER=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_WORDEXP_H=1 -DHAVE_READLINE=1 -I. -I$(srcdir) DEFS = -DPACKAGE=\"mdbtools\" -DVERSION=\"0.4\" -DYYTEXT_POINTER=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_WORDEXP_H=1 -DHAVE_READLINE=1 -I. -I$(srcdir)
CPPFLAGS = CPPFLAGS =
LDFLAGS = LDFLAGS =
libmdb_la_LDFLAGS = libmdb_la_LDFLAGS =

7
src/libmdb/Makefile.in
View File

@ -62,9 +62,11 @@ host_triplet = @host@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
GTK_CFLAGS = @GTK_CFLAGS@ GMDB_CFLAGS = @GMDB_CFLAGS@
GTK_LIBS = @GTK_LIBS@ GMDB_LIBS = @GMDB_LIBS@
HAVE_GNOME = @HAVE_GNOME@ HAVE_GNOME = @HAVE_GNOME@
HAVE_GTK = @HAVE_GTK@
HAVE_ODBC = @HAVE_ODBC@
LD = @LD@ LD = @LD@
LEX = @LEX@ LEX = @LEX@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
@ -72,7 +74,6 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
NM = @NM@ NM = @NM@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
ODBC = @ODBC@
ODBC_INC = @ODBC_INC@ ODBC_INC = @ODBC_INC@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@

23
src/odbc/Makefile
View File

@ -62,9 +62,11 @@ host_triplet = i686-pc-linux-gnu
AS = @AS@ AS = @AS@
CC = gcc CC = gcc
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
GTK_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include GMDB_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
GTK_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl GMDB_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
HAVE_GNOME = HAVE_GNOME =
HAVE_GTK =
HAVE_ODBC =
LD = /usr/bin/ld LD = /usr/bin/ld
LEX = flex LEX = flex
LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBTOOL = $(SHELL) $(top_builddir)/libtool
@ -72,13 +74,12 @@ LN_S = ln -s
MAKEINFO = makeinfo MAKEINFO = makeinfo
NM = /usr/bin/nm -B NM = /usr/bin/nm -B
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
ODBC =
ODBC_INC = /usr/local/include ODBC_INC = /usr/local/include
PACKAGE = mdbtools PACKAGE = mdbtools
RANLIB = ranlib RANLIB = ranlib
READLINE_LIBS = -lncurses -lreadline READLINE_LIBS = -lncurses -lreadline
SQL = SQL =
VERSION = 0.3 VERSION = 0.4
YACC = bison -y YACC = bison -y
include_HEADERS = connectparams.h include_HEADERS = connectparams.h
@ -87,7 +88,6 @@ SQLSOURCES = mdbsql.c parser.c lexer.c
MDBDIR = ../libmdb MDBDIR = ../libmdb
MDBSOURCES = backend.c index.c money.c catalog.c kkd.c sargs.c \ MDBSOURCES = backend.c index.c money.c catalog.c kkd.c sargs.c \
data.c like.c table.c dump.c file.c mem.c data.c like.c table.c dump.c file.c mem.c
bin_PROGRAMS = unittest bin_PROGRAMS = unittest
lib_LTLIBRARIES = libmdbodbc.la lib_LTLIBRARIES = libmdbodbc.la
INCLUDES = -I ../../include `glib-config --cflags` INCLUDES = -I ../../include `glib-config --cflags`
@ -96,7 +96,6 @@ libmdbodbc_la_LIBADD = $(patsubst %, $(SQLDIR)/%, \
$(patsubst %.c, %.lo, $(SQLSOURCES))) \ $(patsubst %.c, %.lo, $(SQLSOURCES))) \
$(patsubst %, $(MDBDIR)/%, \ $(patsubst %, $(MDBDIR)/%, \
$(patsubst %.c, %.lo, $(MDBSOURCES))) -lglib $(patsubst %.c, %.lo, $(MDBSOURCES))) -lglib
LIBS = -lfl `glib-config --libs` LIBS = -lfl `glib-config --libs`
unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@ -104,20 +103,20 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = -DPACKAGE=\"mdbtools\" -DVERSION=\"0.3\" -DYYTEXT_POINTER=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_WORDEXP_H=1 -DHAVE_READLINE=1 -I. -I$(srcdir) DEFS = -DPACKAGE=\"mdbtools\" -DVERSION=\"0.4\" -DYYTEXT_POINTER=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_WORDEXP_H=1 -DHAVE_READLINE=1 -I. -I$(srcdir)
CPPFLAGS = CPPFLAGS =
LDFLAGS = LDFLAGS =
libmdbodbc_la_LDFLAGS = libmdbodbc_la_LDFLAGS =
libmdbodbc_la_DEPENDENCIES = $(patsubst %, $(SQLDIR)/%, $(patsubst %.c, \ libmdbodbc_la_DEPENDENCIES = $(patsubst %, $(SQLDIR)/%, \
%.lo, $(SQLSOURCES))) $(patsubst %, $(MDBDIR)/%, $(patsubst %.c, %.lo, \ $(patsubst %.c, %.lo, $(SQLSOURCES))) $(patsubst %, \
$(MDBSOURCES))) $(MDBDIR)/%, $(patsubst %.c, %.lo, $(MDBSOURCES)))
libmdbodbc_la_OBJECTS = odbc.lo connectparams.lo libmdbodbc_la_OBJECTS = odbc.lo connectparams.lo
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
unittest_SOURCES = unittest.c unittest_SOURCES = unittest.c
unittest_OBJECTS = unittest.o unittest_OBJECTS = unittest.o
unittest_DEPENDENCIES = libmdbodbc.la ../libmdb/libmdb.la \ unittest_DEPENDENCIES = libmdbodbc.la \
../sql/libmdbsql.la ../libmdb/libmdb.la ../sql/libmdbsql.la
unittest_LDFLAGS = unittest_LDFLAGS =
CFLAGS = -g -O2 -DUNIXODBC -DSQL -DHAVE_GNOME CFLAGS = -g -O2 -DUNIXODBC -DSQL -DHAVE_GNOME
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

3
src/odbc/Makefile.am
View File

@ -1,3 +1,4 @@
if HAVE_ODBC
include_HEADERS = connectparams.h include_HEADERS = connectparams.h
SQLDIR = ../sql SQLDIR = ../sql
SQLSOURCES = mdbsql.c parser.c lexer.c SQLSOURCES = mdbsql.c parser.c lexer.c
@ -18,4 +19,4 @@ unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
## Need blank statement to avoid compiling odbc.c ## Need blank statement to avoid compiling odbc.c
odbc: $(EXTRA_LTLIBRARIES) odbc: $(EXTRA_LTLIBRARIES)
@echo '' @echo ''
endif

57
src/odbc/Makefile.in
View File

@ -62,9 +62,11 @@ host_triplet = @host@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
GTK_CFLAGS = @GTK_CFLAGS@ GMDB_CFLAGS = @GMDB_CFLAGS@
GTK_LIBS = @GTK_LIBS@ GMDB_LIBS = @GMDB_LIBS@
HAVE_GNOME = @HAVE_GNOME@ HAVE_GNOME = @HAVE_GNOME@
HAVE_GTK = @HAVE_GTK@
HAVE_ODBC = @HAVE_ODBC@
LD = @LD@ LD = @LD@
LEX = @LEX@ LEX = @LEX@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
@ -72,7 +74,6 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
NM = @NM@ NM = @NM@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
ODBC = @ODBC@
ODBC_INC = @ODBC_INC@ ODBC_INC = @ODBC_INC@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
@ -81,24 +82,22 @@ SQL = @SQL@
VERSION = @VERSION@ VERSION = @VERSION@
YACC = @YACC@ YACC = @YACC@
include_HEADERS = connectparams.h @HAVE_ODBC_TRUE@include_HEADERS = @HAVE_ODBC_TRUE@connectparams.h
SQLDIR = ../sql @HAVE_ODBC_TRUE@SQLDIR = @HAVE_ODBC_TRUE@../sql
SQLSOURCES = mdbsql.c parser.c lexer.c @HAVE_ODBC_TRUE@SQLSOURCES = @HAVE_ODBC_TRUE@mdbsql.c parser.c lexer.c
MDBDIR = ../libmdb @HAVE_ODBC_TRUE@MDBDIR = @HAVE_ODBC_TRUE@../libmdb
MDBSOURCES = backend.c index.c money.c catalog.c kkd.c sargs.c \ @HAVE_ODBC_TRUE@MDBSOURCES = @HAVE_ODBC_TRUE@backend.c index.c money.c catalog.c kkd.c sargs.c \
data.c like.c table.c dump.c file.c mem.c @HAVE_ODBC_TRUE@ data.c like.c table.c dump.c file.c mem.c
@HAVE_ODBC_TRUE@bin_PROGRAMS = @HAVE_ODBC_TRUE@unittest
bin_PROGRAMS = unittest @HAVE_ODBC_TRUE@lib_LTLIBRARIES = @HAVE_ODBC_TRUE@libmdbodbc.la
lib_LTLIBRARIES = libmdbodbc.la @HAVE_ODBC_TRUE@INCLUDES = @HAVE_ODBC_TRUE@-I ../../include `glib-config --cflags`
INCLUDES = -I ../../include `glib-config --cflags` @HAVE_ODBC_TRUE@libmdbodbc_la_SOURCES = @HAVE_ODBC_TRUE@odbc.c connectparams.c
libmdbodbc_la_SOURCES = odbc.c connectparams.c @HAVE_ODBC_TRUE@libmdbodbc_la_LIBADD = @HAVE_ODBC_TRUE@$(patsubst %, $(SQLDIR)/%, \
libmdbodbc_la_LIBADD = $(patsubst %, $(SQLDIR)/%, \ @HAVE_ODBC_TRUE@ $(patsubst %.c, %.lo, $(SQLSOURCES))) \
$(patsubst %.c, %.lo, $(SQLSOURCES))) \ @HAVE_ODBC_TRUE@ $(patsubst %, $(MDBDIR)/%, \
$(patsubst %, $(MDBDIR)/%, \ @HAVE_ODBC_TRUE@ $(patsubst %.c, %.lo, $(MDBSOURCES))) -lglib
$(patsubst %.c, %.lo, $(MDBSOURCES))) -lglib @HAVE_ODBC_TRUE@LIBS = @HAVE_ODBC_TRUE@@LEXLIB@ `glib-config --libs`
@HAVE_ODBC_TRUE@unittest_LDADD = @HAVE_ODBC_TRUE@libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
LIBS = @LEXLIB@ `glib-config --libs`
unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
@ -108,16 +107,16 @@ DEFS = @DEFS@ -I. -I$(srcdir)
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
libmdbodbc_la_LDFLAGS = libmdbodbc_la_LDFLAGS =
libmdbodbc_la_DEPENDENCIES = $(patsubst %, $(SQLDIR)/%, $(patsubst %.c, \ @HAVE_ODBC_TRUE@libmdbodbc_la_DEPENDENCIES = $(patsubst %, $(SQLDIR)/%, \
%.lo, $(SQLSOURCES))) $(patsubst %, $(MDBDIR)/%, $(patsubst %.c, %.lo, \ @HAVE_ODBC_TRUE@$(patsubst %.c, %.lo, $(SQLSOURCES))) $(patsubst %, \
$(MDBSOURCES))) @HAVE_ODBC_TRUE@$(MDBDIR)/%, $(patsubst %.c, %.lo, $(MDBSOURCES)))
libmdbodbc_la_OBJECTS = odbc.lo connectparams.lo @HAVE_ODBC_TRUE@libmdbodbc_la_OBJECTS = odbc.lo connectparams.lo
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
unittest_SOURCES = unittest.c unittest_SOURCES = unittest.c
unittest_OBJECTS = unittest.o unittest_OBJECTS = unittest.o
unittest_DEPENDENCIES = libmdbodbc.la ../libmdb/libmdb.la \ @HAVE_ODBC_TRUE@unittest_DEPENDENCIES = libmdbodbc.la \
../sql/libmdbsql.la @HAVE_ODBC_TRUE@../libmdb/libmdb.la ../sql/libmdbsql.la
unittest_LDFLAGS = unittest_LDFLAGS =
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -418,8 +417,8 @@ distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean mostlyclean distclean maintainer-clean
odbc: $(EXTRA_LTLIBRARIES) @HAVE_ODBC_TRUE@odbc: $(EXTRA_LTLIBRARIES)
@echo '' @HAVE_ODBC_TRUE@ @echo ''
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.

126
src/odbc/odbc.c
View File

@ -32,7 +32,7 @@
#include "connectparams.h" #include "connectparams.h"
static char software_version[] = "$Id: odbc.c,v 1.6 2002/04/09 01:19:26 brianb Exp $"; static char software_version[] = "$Id: odbc.c,v 1.7 2002/04/14 23:35:39 brianb Exp $";
static void *no_unused_var_warn[] = {software_version, static void *no_unused_var_warn[] = {software_version,
no_unused_var_warn}; no_unused_var_warn};
@ -1038,12 +1038,136 @@ int i;
return 0; return 0;
} }
static void _set_func_exists(SQLUSMALLINT FAR *pfExists, SQLUSMALLINT fFunction)
{
SQLUSMALLINT FAR *mod;
mod = pfExists + (fFunction >> 4);
*mod |= (1 << (fFunction & 0x0f));
}
SQLRETURN SQL_API SQLGetFunctions( SQLRETURN SQL_API SQLGetFunctions(
SQLHDBC hdbc, SQLHDBC hdbc,
SQLUSMALLINT fFunction, SQLUSMALLINT fFunction,
SQLUSMALLINT FAR *pfExists) SQLUSMALLINT FAR *pfExists)
{ {
int i;
TRACE("SQLGetFunctions"); TRACE("SQLGetFunctions");
switch (fFunction) {
#if ODBCVER >= 0x0300
case SQL_API_ODBC3_ALL_FUNCTIONS:
/* for (i=0;i<SQL_API_ODBC3_ALL_FUNCTIONS_SIZE;i++) {
pfExists[i] = 0xFFFF;
}
*/
_set_func_exists(pfExists,SQL_API_SQLALLOCCONNECT);
_set_func_exists(pfExists,SQL_API_SQLALLOCENV);
_set_func_exists(pfExists,SQL_API_SQLALLOCHANDLE);
_set_func_exists(pfExists,SQL_API_SQLALLOCSTMT);
_set_func_exists(pfExists,SQL_API_SQLBINDCOL);
_set_func_exists(pfExists,SQL_API_SQLBINDPARAMETER);
_set_func_exists(pfExists,SQL_API_SQLCANCEL);
_set_func_exists(pfExists,SQL_API_SQLCLOSECURSOR);
_set_func_exists(pfExists,SQL_API_SQLCOLATTRIBUTE);
_set_func_exists(pfExists,SQL_API_SQLCOLUMNS);
_set_func_exists(pfExists,SQL_API_SQLCONNECT);
_set_func_exists(pfExists,SQL_API_SQLCOPYDESC);
_set_func_exists(pfExists,SQL_API_SQLDATASOURCES);
_set_func_exists(pfExists,SQL_API_SQLDESCRIBECOL);
_set_func_exists(pfExists,SQL_API_SQLDISCONNECT);
_set_func_exists(pfExists,SQL_API_SQLENDTRAN);
_set_func_exists(pfExists,SQL_API_SQLERROR);
_set_func_exists(pfExists,SQL_API_SQLEXECDIRECT);
_set_func_exists(pfExists,SQL_API_SQLEXECUTE);
_set_func_exists(pfExists,SQL_API_SQLFETCH);
_set_func_exists(pfExists,SQL_API_SQLFETCHSCROLL);
_set_func_exists(pfExists,SQL_API_SQLFREECONNECT);
_set_func_exists(pfExists,SQL_API_SQLFREEENV);
_set_func_exists(pfExists,SQL_API_SQLFREEHANDLE);
_set_func_exists(pfExists,SQL_API_SQLFREESTMT);
_set_func_exists(pfExists,SQL_API_SQLGETCONNECTATTR);
_set_func_exists(pfExists,SQL_API_SQLGETCONNECTOPTION);
_set_func_exists(pfExists,SQL_API_SQLGETCURSORNAME);
_set_func_exists(pfExists,SQL_API_SQLGETDATA);
_set_func_exists(pfExists,SQL_API_SQLGETDESCFIELD);
_set_func_exists(pfExists,SQL_API_SQLGETDESCREC);
_set_func_exists(pfExists,SQL_API_SQLGETDIAGFIELD);
_set_func_exists(pfExists,SQL_API_SQLGETDIAGREC);
_set_func_exists(pfExists,SQL_API_SQLGETENVATTR);
_set_func_exists(pfExists,SQL_API_SQLGETFUNCTIONS);
_set_func_exists(pfExists,SQL_API_SQLGETINFO);
_set_func_exists(pfExists,SQL_API_SQLGETSTMTATTR);
_set_func_exists(pfExists,SQL_API_SQLGETSTMTOPTION);
_set_func_exists(pfExists,SQL_API_SQLGETTYPEINFO);
_set_func_exists(pfExists,SQL_API_SQLNUMRESULTCOLS);
_set_func_exists(pfExists,SQL_API_SQLPARAMDATA);
_set_func_exists(pfExists,SQL_API_SQLPREPARE);
_set_func_exists(pfExists,SQL_API_SQLPUTDATA);
_set_func_exists(pfExists,SQL_API_SQLROWCOUNT);
_set_func_exists(pfExists,SQL_API_SQLSETCONNECTATTR);
_set_func_exists(pfExists,SQL_API_SQLSETCONNECTOPTION);
_set_func_exists(pfExists,SQL_API_SQLSETCURSORNAME);
_set_func_exists(pfExists,SQL_API_SQLSETDESCFIELD);
_set_func_exists(pfExists,SQL_API_SQLSETDESCREC);
_set_func_exists(pfExists,SQL_API_SQLSETENVATTR);
_set_func_exists(pfExists,SQL_API_SQLSETPARAM);
_set_func_exists(pfExists,SQL_API_SQLSETSTMTATTR);
_set_func_exists(pfExists,SQL_API_SQLSETSTMTOPTION);
_set_func_exists(pfExists,SQL_API_SQLSPECIALCOLUMNS);
_set_func_exists(pfExists,SQL_API_SQLSTATISTICS);
_set_func_exists(pfExists,SQL_API_SQLTABLES);
_set_func_exists(pfExists,SQL_API_SQLTRANSACT);
return SQL_SUCCESS;
break;
#endif
case SQL_API_ALL_FUNCTIONS:
_set_func_exists(pfExists,SQL_API_SQLALLOCCONNECT);
_set_func_exists(pfExists,SQL_API_SQLALLOCENV);
_set_func_exists(pfExists,SQL_API_SQLALLOCSTMT);
_set_func_exists(pfExists,SQL_API_SQLBINDCOL);
_set_func_exists(pfExists,SQL_API_SQLCANCEL);
_set_func_exists(pfExists,SQL_API_SQLCOLATTRIBUTES);
_set_func_exists(pfExists,SQL_API_SQLCOLUMNS);
_set_func_exists(pfExists,SQL_API_SQLCONNECT);
_set_func_exists(pfExists,SQL_API_SQLDATASOURCES);
_set_func_exists(pfExists,SQL_API_SQLDESCRIBECOL);
_set_func_exists(pfExists,SQL_API_SQLDISCONNECT);
_set_func_exists(pfExists,SQL_API_SQLERROR);
_set_func_exists(pfExists,SQL_API_SQLEXECDIRECT);
_set_func_exists(pfExists,SQL_API_SQLEXECUTE);
_set_func_exists(pfExists,SQL_API_SQLFETCH);
_set_func_exists(pfExists,SQL_API_SQLFREECONNECT);
_set_func_exists(pfExists,SQL_API_SQLFREEENV);
_set_func_exists(pfExists,SQL_API_SQLFREESTMT);
_set_func_exists(pfExists,SQL_API_SQLGETCONNECTOPTION);
_set_func_exists(pfExists,SQL_API_SQLGETCURSORNAME);
_set_func_exists(pfExists,SQL_API_SQLGETDATA);
_set_func_exists(pfExists,SQL_API_SQLGETFUNCTIONS);
_set_func_exists(pfExists,SQL_API_SQLGETINFO);
_set_func_exists(pfExists,SQL_API_SQLGETSTMTOPTION);
_set_func_exists(pfExists,SQL_API_SQLGETTYPEINFO);
_set_func_exists(pfExists,SQL_API_SQLNUMRESULTCOLS);
_set_func_exists(pfExists,SQL_API_SQLPARAMDATA);
_set_func_exists(pfExists,SQL_API_SQLPREPARE);
_set_func_exists(pfExists,SQL_API_SQLPUTDATA);
_set_func_exists(pfExists,SQL_API_SQLROWCOUNT);
_set_func_exists(pfExists,SQL_API_SQLSETCONNECTOPTION);
_set_func_exists(pfExists,SQL_API_SQLSETCURSORNAME);
_set_func_exists(pfExists,SQL_API_SQLSETPARAM);
_set_func_exists(pfExists,SQL_API_SQLSETSTMTOPTION);
_set_func_exists(pfExists,SQL_API_SQLSPECIALCOLUMNS);
_set_func_exists(pfExists,SQL_API_SQLSTATISTICS);
_set_func_exists(pfExists,SQL_API_SQLTABLES);
_set_func_exists(pfExists,SQL_API_SQLTRANSACT);
return SQL_SUCCESS;
break;
default:
*pfExists = 1; /* SQL_TRUE */
return SQL_SUCCESS;
break;
}
return SQL_SUCCESS; return SQL_SUCCESS;
} }

11
src/sql/Makefile
View File

@ -62,9 +62,11 @@ host_triplet = i686-pc-linux-gnu
AS = @AS@ AS = @AS@
CC = gcc CC = gcc
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
GTK_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include GMDB_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
GTK_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl GMDB_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
HAVE_GNOME = HAVE_GNOME =
HAVE_GTK =
HAVE_ODBC =
LD = /usr/bin/ld LD = /usr/bin/ld
LEX = flex LEX = flex
LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBTOOL = $(SHELL) $(top_builddir)/libtool
@ -72,13 +74,12 @@ LN_S = ln -s
MAKEINFO = makeinfo MAKEINFO = makeinfo
NM = /usr/bin/nm -B NM = /usr/bin/nm -B
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
ODBC =
ODBC_INC = /usr/local/include ODBC_INC = /usr/local/include
PACKAGE = mdbtools PACKAGE = mdbtools
RANLIB = ranlib RANLIB = ranlib
READLINE_LIBS = -lncurses -lreadline READLINE_LIBS = -lncurses -lreadline
SQL = SQL =
VERSION = 0.3 VERSION = 0.4
lib_LTLIBRARIES = libmdbsql.la lib_LTLIBRARIES = libmdbsql.la
libmdbsql_la_SOURCES = mdbsql.c parser.y lexer.l libmdbsql_la_SOURCES = mdbsql.c parser.y lexer.l
@ -91,7 +92,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = -DPACKAGE=\"mdbtools\" -DVERSION=\"0.3\" -DYYTEXT_POINTER=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_WORDEXP_H=1 -DHAVE_READLINE=1 -I. -I$(srcdir) DEFS = -DPACKAGE=\"mdbtools\" -DVERSION=\"0.4\" -DYYTEXT_POINTER=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_WORDEXP_H=1 -DHAVE_READLINE=1 -I. -I$(srcdir)
CPPFLAGS = CPPFLAGS =
LDFLAGS = LDFLAGS =
libmdbsql_la_LDFLAGS = libmdbsql_la_LDFLAGS =

7
src/sql/Makefile.in
View File

@ -62,9 +62,11 @@ host_triplet = @host@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
GTK_CFLAGS = @GTK_CFLAGS@ GMDB_CFLAGS = @GMDB_CFLAGS@
GTK_LIBS = @GTK_LIBS@ GMDB_LIBS = @GMDB_LIBS@
HAVE_GNOME = @HAVE_GNOME@ HAVE_GNOME = @HAVE_GNOME@
HAVE_GTK = @HAVE_GTK@
HAVE_ODBC = @HAVE_ODBC@
LD = @LD@ LD = @LD@
LEX = @LEX@ LEX = @LEX@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
@ -72,7 +74,6 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
NM = @NM@ NM = @NM@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
ODBC = @ODBC@
ODBC_INC = @ODBC_INC@ ODBC_INC = @ODBC_INC@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@

11
src/util/Makefile
View File

@ -62,9 +62,11 @@ host_triplet = i686-pc-linux-gnu
AS = @AS@ AS = @AS@
CC = gcc CC = gcc
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
GTK_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include GMDB_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
GTK_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl GMDB_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
HAVE_GNOME = HAVE_GNOME =
HAVE_GTK =
HAVE_ODBC =
LD = /usr/bin/ld LD = /usr/bin/ld
LEX = flex LEX = flex
LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBTOOL = $(SHELL) $(top_builddir)/libtool
@ -72,13 +74,12 @@ LN_S = ln -s
MAKEINFO = makeinfo MAKEINFO = makeinfo
NM = /usr/bin/nm -B NM = /usr/bin/nm -B
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
ODBC =
ODBC_INC = /usr/local/include ODBC_INC = /usr/local/include
PACKAGE = mdbtools PACKAGE = mdbtools
RANLIB = ranlib RANLIB = ranlib
READLINE_LIBS = -lncurses -lreadline READLINE_LIBS = -lncurses -lreadline
SQL = SQL =
VERSION = 0.3 VERSION = 0.4
YACC = bison -y YACC = bison -y
bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-header mdb-sql mdb-ver prtable prcat prdata prkkd prdump bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-header mdb-sql mdb-ver prtable prcat prdata prkkd prdump
@ -91,7 +92,7 @@ CONFIG_CLEAN_FILES =
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
DEFS = -DPACKAGE=\"mdbtools\" -DVERSION=\"0.3\" -DYYTEXT_POINTER=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_WORDEXP_H=1 -DHAVE_READLINE=1 -I. -I$(srcdir) DEFS = -DPACKAGE=\"mdbtools\" -DVERSION=\"0.4\" -DYYTEXT_POINTER=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_WORDEXP_H=1 -DHAVE_READLINE=1 -I. -I$(srcdir)
CPPFLAGS = CPPFLAGS =
LDFLAGS = LDFLAGS =
mdb_export_SOURCES = mdb-export.c mdb_export_SOURCES = mdb-export.c

7
src/util/Makefile.in
View File

@ -62,9 +62,11 @@ host_triplet = @host@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
GTK_CFLAGS = @GTK_CFLAGS@ GMDB_CFLAGS = @GMDB_CFLAGS@
GTK_LIBS = @GTK_LIBS@ GMDB_LIBS = @GMDB_LIBS@
HAVE_GNOME = @HAVE_GNOME@ HAVE_GNOME = @HAVE_GNOME@
HAVE_GTK = @HAVE_GTK@
HAVE_ODBC = @HAVE_ODBC@
LD = @LD@ LD = @LD@
LEX = @LEX@ LEX = @LEX@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
@ -72,7 +74,6 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
NM = @NM@ NM = @NM@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
ODBC = @ODBC@
ODBC_INC = @ODBC_INC@ ODBC_INC = @ODBC_INC@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@