[prev in list] [next in list] [prev in thread] [next in thread]
List: mysql-odbc
Subject: bk commit - MyODBC 3.51
From: venu () mysql ! com
Date: 2002-10-30 7:40:24
[Download RAW message or body]
Below is the list of changes that have just been commited into a local
MyODBC 3.51 repository of 'venu'. When 'venu' does a push, they will
be propogaged to the main repository and within 24 hours after the push
into the public repository.
For more information on how to access the public repository see
http://www.mysql.com/products/myodbc/faq.html#Development_source
ChangeSet
1.236 02/10/29 23:40:22 venu@myvenu.com +42 -0
- Changes to work with all kind of autoconf versions
- Moved all driver sources to driver/ directory
- Now Docs/ can be built using --build-docs configure option
- Added make test (to run MyODBC samples)
- Added make linux-rpm to Makefile.am
- Added make binary-tar to Makefile.am
Docs/Makefile.am
1.2 02/10/29 23:35:14 venu@myvenu.com +45 -24
samples/run-samples
1.2 02/10/29 23:35:06 venu@myvenu.com +5 -0
samples/Makefile.am
1.2 02/10/29 23:35:03 venu@myvenu.com +8 -1
driver/Makefile.am
1.10 02/10/29 23:34:49 venu@myvenu.com +1 -0
configure.in
1.20 02/10/29 23:34:10 venu@myvenu.com +123 -66
Changes to work with all kind of autoconf versions
acinclude.m4
1.5 02/10/29 23:34:09 venu@myvenu.com +21 -5
Makefile.am
1.9 02/10/29 23:34:04 venu@myvenu.com +7 -33
samples/run-samples
1.1 02/10/29 23:29:16 venu@myvenu.com +11 -0
samples/run-samples
1.0 02/10/29 23:29:16 venu@myvenu.com +0 -0
BitKeeper file /home/venu/work/odbc/dev-3.51/samples/run-samples
BitKeeper/deleted/.del-acconfig.h~498a32e54e0bd4ba
1.11 02/10/29 23:25:53 venu@myvenu.com +0 -0
Delete: acconfig.h
driver/makerpm.sh
1.4 02/10/29 16:10:27 venu@myvenu.com +0 -0
Rename: makerpm.sh -> driver/makerpm.sh
driver/odbc.ini
1.4 02/10/29 16:10:08 venu@myvenu.com +0 -0
Rename: odbc.ini -> driver/odbc.ini
driver/stamp-h.in
1.2 02/10/29 16:09:31 venu@myvenu.com +0 -0
Rename: stamp-h.in -> driver/stamp-h.in
acconfig.h
1.10 02/10/29 16:04:55 venu@myvenu.com +0 -0
Rename: driver/acconfig.h -> acconfig.h
driver/Makefile.am
1.9 02/10/29 16:03:08 venu@myvenu.com +0 -0
bk cp Makefile.am driver/Makefile.am
driver/WIN-Makefile_debug
1.10 02/10/29 16:02:20 venu@myvenu.com +0 -0
Rename: WIN-Makefile_debug -> driver/WIN-Makefile_debug
driver/WIN-Makefile
1.9 02/10/29 16:02:20 venu@myvenu.com +0 -0
Rename: WIN-Makefile -> driver/WIN-Makefile
driver/mysql.bmp
1.2 02/10/29 16:00:15 venu@myvenu.com +0 -0
Rename: mysql.bmp -> driver/mysql.bmp
driver/myodbc3.spec.sh
1.4 02/10/29 16:00:15 venu@myvenu.com +0 -0
Rename: myodbc3.spec.sh -> driver/myodbc3.spec.sh
driver/myodbc3.rsp
1.4 02/10/29 16:00:15 venu@myvenu.com +0 -0
Rename: myodbc3.rsp -> driver/myodbc3.rsp
driver/myodbc3.rc
1.13 02/10/29 16:00:15 venu@myvenu.com +0 -0
Rename: myodbc3.rc -> driver/myodbc3.rc
driver/myodbc3.dsw
1.5 02/10/29 16:00:15 venu@myvenu.com +0 -0
Rename: myodbc3.dsw -> driver/myodbc3.dsw
driver/myodbc3.dsp
1.8 02/10/29 16:00:15 venu@myvenu.com +0 -0
Rename: myodbc3.dsp -> driver/myodbc3.dsp
driver/myodbc3.def
1.14 02/10/29 16:00:15 venu@myvenu.com +0 -0
Rename: myodbc3.def -> driver/myodbc3.def
driver/my3dsn.hlp
1.6 02/10/29 16:00:15 venu@myvenu.com +0 -0
Rename: my3dsn.hlp -> driver/my3dsn.hlp
driver/resource.h
1.12 02/10/29 15:59:25 venu@myvenu.com +0 -0
Rename: resource.h -> driver/resource.h
driver/myutil.h
1.22 02/10/29 15:59:25 venu@myvenu.com +0 -0
Rename: myutil.h -> driver/myutil.h
driver/myodbc3.h
1.28 02/10/29 15:59:25 venu@myvenu.com +0 -0
Rename: myodbc3.h -> driver/myodbc3.h
driver/error.h
1.17 02/10/29 15:59:25 venu@myvenu.com +0 -0
Rename: error.h -> driver/error.h
driver/dialogs.h
1.19 02/10/29 15:59:25 venu@myvenu.com +0 -0
Rename: dialogs.h -> driver/dialogs.h
driver/acconfig.h
1.9 02/10/29 15:59:25 venu@myvenu.com +0 -0
Rename: acconfig.h -> driver/acconfig.h
driver/utility.c
1.31 02/10/29 15:59:16 venu@myvenu.com +0 -0
Rename: utility.c -> driver/utility.c
driver/transact.c
1.20 02/10/29 15:59:16 venu@myvenu.com +0 -0
Rename: transact.c -> driver/transact.c
driver/setup.c
1.28 02/10/29 15:59:16 venu@myvenu.com +0 -0
Rename: setup.c -> driver/setup.c
driver/results.c
1.41 02/10/29 15:59:15 venu@myvenu.com +0 -0
Rename: results.c -> driver/results.c
driver/prepare.c
1.35 02/10/29 15:59:15 venu@myvenu.com +0 -0
Rename: prepare.c -> driver/prepare.c
driver/options.c
1.35 02/10/29 15:59:15 venu@myvenu.com +0 -0
Rename: options.c -> driver/options.c
driver/myodbc3.c
1.10 02/10/29 15:59:15 venu@myvenu.com +0 -0
Rename: myodbc3.c -> driver/myodbc3.c
driver/misc.c
1.13 02/10/29 15:59:15 venu@myvenu.com +0 -0
Rename: misc.c -> driver/misc.c
driver/info.c
1.43 02/10/29 15:59:15 venu@myvenu.com +0 -0
Rename: info.c -> driver/info.c
driver/handle.c
1.21 02/10/29 15:59:15 venu@myvenu.com +0 -0
Rename: handle.c -> driver/handle.c
driver/execute.c
1.33 02/10/29 15:59:15 venu@myvenu.com +0 -0
Rename: execute.c -> driver/execute.c
driver/error.c
1.31 02/10/29 15:59:15 venu@myvenu.com +0 -0
Rename: error.c -> driver/error.c
driver/dll.c
1.17 02/10/29 15:59:15 venu@myvenu.com +0 -0
Rename: dll.c -> driver/dll.c
driver/cursor.c
1.64 02/10/29 15:59:14 venu@myvenu.com +0 -0
Rename: cursor.c -> driver/cursor.c
driver/connect.c
1.33 02/10/29 15:59:14 venu@myvenu.com +0 -0
Rename: connect.c -> driver/connect.c
driver/catalog.c
1.23 02/10/29 15:59:14 venu@myvenu.com +0 -0
Rename: catalog.c -> driver/catalog.c
driver/Makefile.am
1.8 02/09/29 09:03:44 venu@myvenu.com +43 -1
driver/Makefile.am
1.7 01/12/22 20:33:16 venu@myvenu.com +0 -1
driver/Makefile.am
1.6 01/12/19 13:09:05 sasha@mysql.sashanet.com +1 -1
added samples
driver/Makefile.am
1.5 01/11/09 08:27:23 venu@bitch.mysql.fi +1 -0
New addition of handle.c
driver/Makefile.am
1.4 01/09/21 02:25:17 venu@myvenu.com +6 -4
driver/Makefile.am
1.3 01/09/10 02:50:30 venu@venulnx.(none) +6 -2
driver/Makefile.am
1.2 01/06/21 01:11:13 monty@hundin.mysql.fi +1 -0
Added cursor.c
driver/Makefile.am
1.1 00/09/18 14:14:55 monty@work.mysql.com +25 -0
driver/Makefile.am
1.0 00/09/18 14:14:55 monty@work.mysql.com +0 -0
BitKeeper file /home/bk/myodbc/Makefile.am
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: venu
# Host: myvenu.com
# Root: /home/venu/work/odbc/dev-3.51
--- 1.1/Docs/Makefile.am Wed Jan 23 22:17:05 2002
+++ 1.2/Docs/Makefile.am Tue Oct 29 23:35:14 2002
@@ -15,11 +15,11 @@
TEXINFO_TEX = Support/texinfo.tex
noinst_SCRIPTS = Support/texi2html
-info_TEXINFOS = myodbc3.texi
+info_TEXINFOS = manual.texi
-targets = myodbc3.txt myodbc3.info myodbc3.html
+targets = manual.html faq.html
-BUILT_SOURCES = $(targets) myodbc3_toc.html include.texi
+BUILT_SOURCES = $(targets) manual_toc.html faq_toc.html include.texi
#EXTRA_DIST = $(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \
# INSTALL-BINARY mirrors.texi
@@ -30,11 +30,15 @@
CLEAN_FILES: $(BUILD_SOURCES)
touch $(BUILD_SOURCES)
+ rm -f manual_toc.html
+ rm -f manual.html
+ rm -f faq.html
+ rm -f faq_toc.html
# The PostScript and PDF version are so big that they are not included in the
# standard distribution. It is available for download from the home page.
-PDFMANUAL = myodbc3.pdf
-paper: myodbc3_a4.ps myodbc3_letter.ps $(PDFMANUAL)
+PDFMANUAL = manual.pdf faq.pdf
+paper: manual_a4.ps manual_letter.ps $(PDFMANUAL)
#########################################################################
@@ -42,20 +46,26 @@
include.texi: ../configure.in
echo "@c This file is autogenerated by the Makefile" > $@
echo -n "@set myodbc3_version " >> $@
- grep "AM_INIT_AUTOMAKE(myodbc, " ../configure.in | \
- sed -e 's;AM_INIT_AUTOMAKE(myodbc, ;;' -e 's;);;' >> $@
+ grep "AM_INIT_AUTOMAKE(driver/myodbc," ../configure.in | \
+ sed -e 's;AM_INIT_AUTOMAKE(driver/myodbc,;;' -e 's;);;' >> $@
-myodbc3.info: myodbc.texi include.texi
+manual.info: manual.texi include.texi
cd $(srcdir) && $(MAKEINFO) --no-split -I $(srcdir) $<
-myodbc3.txt: myodbc3.texi include.texi
+manual.txt: manual.texi include.texi
cd $(srcdir) && \
$(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $<
-myodbc3.html: myodbc3.texi include.texi $(srcdir)/Support/texi2html
+manual.html: manual.texi include.texi $(srcdir)/Support/texi2html
cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $<
-myodbc3_toc.html: myodbc3.html
+manual_toc.html: manual.html
+
+faq.html: faq.texi include.texi $(srcdir)/Support/texi2html
+ cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $<
+
+faq_toc.html: faq.html
+
# Fix: add --output-comment with some interesting info?
@@ -63,33 +73,44 @@
# Note: @image will work if we first convert all images to pdf ...
# is that worth it?
# Comment: We need to run pdftex 2 times to get the cross references right.
-myodbc3.pdf: myodbc3.texi
- cat myodbc3.texi | sed -e 's|@image{[^}]*} *||g' > myodbc3-tmp.texi
- pdftex --interaction=nonstopmode myodbc3-tmp.texi
- texindex myodbc3-tmp.??
- pdftex --interaction=nonstopmode myodbc3-tmp.texi
- texindex myodbc3-tmp.??
- pdftex --interaction=nonstopmode myodbc3-tmp.texi
- mv myodbc3-tmp.pdf myodbc3.pdf
- rm -f myodbc3-tmp.*
+manual.pdf: manual.texi
+ cat manual.texi | sed -e 's|@image{[^}]*} *||g' > manual-tmp.texi
+ pdftex --interaction=nonstopmode manual-tmp.texi
+ texindex manual-tmp.??
+ pdftex --interaction=nonstopmode manual-tmp.texi
+ texindex manual-tmp.??
+ pdftex --interaction=nonstopmode manual-tmp.texi
+ mv manual-tmp.pdf manual.pdf
+ rm -f manual-tmp.*
+ touch $@
+faq.pdf: faq.texi
+ cat faq.texi | sed -e 's|@image{[^}]*} *||g' > faq-tmp.texi
+ pdftex --interaction=nonstopmode faq-tmp.texi
+ texindex faq-tmp.??
+ pdftex --interaction=nonstopmode faq-tmp.texi
+ texindex faq-tmp.??
+ pdftex --interaction=nonstopmode faq-tmp.texi
+ mv faq-tmp.pdf faq.pdf
+ rm -f faq-tmp.*
touch $@
+
# The texi2dvi gives a lot of harmless errors. Just ignore them unless
# you want to help with the typesetting part.
# This is the European papersize version
-myodbc3_a4.ps: myodbc3.texi include.texi
+manual_a4.ps: manual.texi include.texi
TEXINPUTS=$(srcdir):$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
$(TEXI2DVI) --batch --texinfo --quiet '@afourpaper' $<
- $(DVIPS) -t a4 myodbc3.dvi -o $@
+ $(DVIPS) -t a4 manual.dvi -o $@
touch $@
# This is the American papersize version
-myodbc3_letter.ps: myodbc3.texi include.texi
+manual_letter.ps: manual.texi include.texi
TEXINPUTS=$(srcdir):$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
$(TEXI2DVI) --batch $<
- $(DVIPS) -t letter myodbc3.dvi -o $@
+ $(DVIPS) -t letter manual.dvi -o $@
touch $@
# Don't update the files from bitkeeper
--- 1.8/Makefile.am Sun Sep 29 09:03:44 2002
+++ 1.9/Makefile.am Tue Oct 29 23:34:04 2002
@@ -30,43 +30,17 @@
AUTOMAKE_OPTIONS=foreign
INCLUDES = @MYSQL_INCLUDES@
-lib_LTLIBRARIES=libmyodbc3.la
+LDFLAGS=@EXTRA_LDFLAGS@
-###################################################################
-# #
-# Driver Source files #
-# #
-###################################################################
+SUBDIRS = driver samples @docs_dirs@
-libmyodbc3_la_SOURCES= \
-catalog.c \
-connect.c \
-dll.c \
-execute.c \
-handle.c\
-info.c \
-myodbc3.c \
-options.c \
-prepare.c \
-results.c \
-transact.c \
-utility.c \
-dialogs.h \
-myodbc3.h \
-resource.h \
-cursor.c \
-error.c \
-misc.c
+test:
+ cd samples; \
+ $(MAKE); \
+ ./run-samples
-###################################################################
-# #
-# Linker options #
-# #
-###################################################################
+
-libmyodbc3_la_LDFLAGS=-release @myodbc_version@
-libmyodbc3_la_LIBADD=@MYSQL_LIB_PATH@ -l@MYSQL_CLIENT_LIB@
-LDFLAGS=@EXTRA_LDFLAGS@
--- 1.4/acinclude.m4 Thu Oct 24 17:57:03 2002
+++ 1.5/acinclude.m4 Tue Oct 29 23:34:09 2002
@@ -32,7 +32,7 @@
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT([no ($2)])
- AC_DEFINE($1,$2)
+ AC_DEFINE($1,$2,[Define if $1 is undefined])
fi
])
@@ -51,11 +51,20 @@
AC_MSG_ERROR([Unable to find the iodbc headers in '$1'])
fi
+
+# new autoconf tools doesn't detect through ac_hdr, so define
+# odbc_headers manually to make AC_CHECK_ODBC_TYPE to work
+if test "x$odbc_headers" = "x"
+then
+ odbc_headers="isql.h isqlext.h"
+fi
+
AC_CHECK_HEADERS(iodbcinst.h)
if test "x$ac_cv_header_iodbcinst_h" = "xyes"
then
+ odbc_headers="$odbc_headers iodbcinst.h"
save_LIBS="$LIBS"
LIBS="-L$2 $LIBS"
@@ -65,7 +74,7 @@
[LIBS="$save_LIBS"])
AC_CHECK_LIB(iodbcinst,SQLGetPrivateProfileString,
- [AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING)
+ [AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING,1,[Define if SQLGetPrivateProfileString is defined])
LIBS="$LIBS -liodbcinst"
have_iodbcinst=yes],
[LIBS="$save_LIBS"])
@@ -81,19 +90,26 @@
AC_DEFUN(AC_CHECK_UNIXODBC,
[
CPPFLAGS="$CPPFLAGS $ODBC_FLAGS -I$1"
-AC_CHECK_HEADERS(sql.h sqlext.h odbcinst.h,
-unixODBC_ok=yes;odbc_headers="$odbc_headers $ac_hdr",unixODBC_ok=no; break)
+AC_CHECK_HEADERS([sql.h sqlext.h odbcinst.h],
+[unixODBC_ok=yes;odbc_headers="$odbc_headers $ac_hdr"],[unixODBC_ok=no; break])
if test "x$unixODBC_ok" != "xyes"
then
AC_MSG_ERROR([Unable to find the unixODBC headers in '$1'])
fi
+# new autoconf tools doesn't detect through ac_hdr, so define
+# odbc_headers manually to make AC_CHECK_ODBC_TYPE to work
+if test "x$odbc_headers" = "x"
+then
+ odbc_headers="sql.h sqlext.h odbcinst.h"
+fi
+
save_LIBS="$LIBS"
LIBS="-L$2 $LIBS"
AC_CHECK_LIB(odbcinst,SQLGetPrivateProfileString,
-[AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING)
+[AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING,1,[Define if SQLGetPrivateProfileString is defined])
LIBS="$LIBS -lodbcinst"],
[LIBS="$save_LIBS"])
--- 1.19/configure.in Tue Oct 29 13:41:48 2002
+++ 1.20/configure.in Tue Oct 29 23:34:10 2002
@@ -34,9 +34,11 @@
# #
###################################################################
-AC_INIT(myodbc3.c)
+AC_INIT(driver/myodbc3.c)
+#AC_PREREQ(2.53)
+#AC_INIT([MySQL ODBC 3.51 Driver],[3.51.05],[myodbc@lists.mysql.com],[libmyodbc3])
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(myodbc,3.51.05)
+AM_INIT_AUTOMAKE(libmyodbc3,3.51.05)
myodbc_version=$VERSION
@@ -49,7 +51,7 @@
SHARED_LIB_VERSION=1:0:0
-AM_CONFIG_HEADER(myconf.h)
+AM_CONFIG_HEADER(driver/myconf.h)
AC_SUBST(myodbc_version)
@@ -105,7 +107,7 @@
AM_DISABLE_STATIC
# define _UNIX_
-AC_DEFINE(_UNIX_)
+AC_DEFINE(_UNIX_,1,[Define if we are using unix build environment (always true)])
AM_PROG_LIBTOOL
AC_CHECK_LIB(z,compress)
@@ -245,8 +247,32 @@
# #
###################################################################
-AC_CHECK_LIB(c, localtime_r, [AC_DEFINE(HAVE_LOCALTIME_R, 1)])
+AC_CHECK_LIB(c, localtime_r,
+ [AC_DEFINE(HAVE_LOCALTIME_R, 1,
+ [Define if we detected a localtime_r])
+ ]
+ )
+###################################################################
+# #
+# Perl existance (For Docs) #
+# #
+###################################################################
+AC_PATH_PROG(PERL, perl, no)
+if test "$PERL" != "no" && $PERL -e 'require 5' > /dev/null 2>&1
+then
+ PERL5=$PERL
+else
+ AC_PATH_PROG(PERL5, perl5, no)
+ if test "$PERL5" != no
+ then
+ PERL=$PERL5
+ ac_cv_path_PERL=$ac_cv_path_PERL5
+ fi
+fi
+AC_SUBST(PERL)
+AC_SUBST(PERL5)
+
###################################################################
# #
@@ -254,6 +280,7 @@
# #
###################################################################
+echo ""
echo "MySQL CONFIGURATION - CLIENT LIBS AND HEADERS"
MYSQL_CLIENT_LIB=mysqlclient
thread_safe=no
@@ -315,7 +342,7 @@
echo "using thread safe client libraries from '$mysql_libs'"
MYSQL_CLIENT_LIB=mysqlclient_r;
else
- echo "using thread safe client libraries from '$mysql_libs'"
+ echo "using client libraries from '$mysql_libs'"
fi
AC_SUBST(MYSQL_CLIENT_LIB)
@@ -402,6 +429,7 @@
fi
echo "END OF MYSQL CONFIGURATION"
+echo ""
echo "ODBC DRIVER MANAGER CONFIGURATION - LIBRARIES AND HEADERS"
###################################################################
# #
@@ -411,7 +439,7 @@
use_unixODBC=no
AC_ARG_WITH(unixODBC,
-[ --with-unixODBC[=DIR] Use unixODBC located in DIR],
+[ --with-unixODBC[=DIR] Use unixODBC located in DIR],
[use_unixODBC=yes;unixODBC="$withval"],use_unixODBC=no)
if test "x$use_unixODBC" = "xyes"
@@ -468,7 +496,7 @@
###################################################################
AC_ARG_WITH(iodbc,
-[ --with-iodbc[=DIR] Use iODBC located in DIR],
+[ --with-iodbc[=DIR] Use iODBC located in DIR],
iodbc="$withval",iodbc="/usr/local")
AC_ARG_WITH(iodbc-includes,
@@ -514,21 +542,60 @@
if test "x$have_iodbcinst" != "xyes"
then
- AC_DEFINE_UNQUOTED(SYSTEM_ODBC_INI,"$odbc_ini")
+ AC_DEFINE_UNQUOTED(SYSTEM_ODBC_INI,"$odbc_ini",
+ [Define path to system wide odbc.ini file])
fi
fi
###################################################################
+# if we're working in an older odbc environment, #
+# we don't have the SQL* types, so we need to fall #
+# back to the old versions #
+###################################################################
+
+AC_CHECK_ODBC_TYPE(SQLHENV,HENV)
+AC_CHECK_ODBC_TYPE(SQLHDBC,HDBC)
+AC_CHECK_ODBC_TYPE(SQLHSTMT,HSTMT)
+
+AC_CHECK_ODBC_TYPE(SQLINTEGER,SDWORD)
+AC_CHECK_ODBC_TYPE(SQLUINTEGER,UDWORD)
+AC_CHECK_ODBC_TYPE(SQLSMALLINT,SWORD)
+AC_CHECK_ODBC_TYPE(SQLUSMALLINT,UWORD)
+
+AC_CHECK_ODBC_TYPE(SQLPOINTER,PTR)
+AC_CHECK_ODBC_TYPE(SQLHWND,HWND)
+
+AC_CHECK_ODBC_TYPE(SQLRETURN,RETCODE)
+
+AC_CHECK_ODBC_TYPE(SQLCHAR,UCHAR)
+
+###################################################################
# #
-# Add some extra LDFLAGS to the linking of the shared library #
+# Check and validate for odbc.ini #
# #
###################################################################
-AC_ARG_WITH(ldflags,
- [ --with-ldflags=option Extra arguments for linking. Normally -lmysqlclient],
- EXTRA_LDFLAGS="$withval",EXTRA_LDFLAGS="")
-AC_SUBST(EXTRA_LDFLAGS)
+if test "x$iodbc_ok" = "xyes" && test "x$have_iodbcinst" != "xyes"
+then
+cat <<EOF
+----------------------------------------------------------------
+Warning: using iODBC but libiodbcinst library not found.
+Enabling workaround, which will search for mysql datasource
+configuration as follows:
+
+1. \$ODBCINI, and if not found - \$HOME/.odbc.ini (User data sources)
+2. $odbc_ini (System data sources)
+
+If you want to change (2), re-run configure using the
+ --with-odbc-ini=/some/other/path/odbc.ini
+option.
+----------------------------------------------------------------
+EOF
+fi
+
+echo "END OF DRIVER MANAGER CONFIGURATION"
+echo
###################################################################
# #
@@ -546,9 +613,10 @@
OPTIMIZE_CFLAGS="-O"
fi
+AC_MSG_CHECKING([if debug mode is enabled])
AC_ARG_WITH(debug,
[ --without-debug Build a production version without debugging code (default: no)],
- with_debug=$withval,with_debug=no)
+ with_debug=$withval,with_debug=yes)
if test "$with_debug" = "yes"
then
@@ -562,56 +630,42 @@
# Optimized version. No debug
CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"
fi
+AC_MSG_RESULT([$with_debug])
AC_SUBST(CFLAGS)
###################################################################
-# if we're working in an older odbc environment, #
-# we don't have the SQL* types, so we need to fall #
-# back to the old versions #
+# #
+# Build Docs ? #
+# #
###################################################################
+AC_MSG_CHECKING([if building of documentation is enabled])
+AC_ARG_WITH(docs,
+ [ --with-docs Enable building of the documentation (default: no)],
+ [with_docs=$withval],
+ [with_docs=no]
+ )
-AC_CHECK_ODBC_TYPE(SQLHENV,HENV)
-AC_CHECK_ODBC_TYPE(SQLHDBC,HDBC)
-AC_CHECK_ODBC_TYPE(SQLHSTMT,HSTMT)
-
-AC_CHECK_ODBC_TYPE(SQLINTEGER,SDWORD)
-AC_CHECK_ODBC_TYPE(SQLUINTEGER,UDWORD)
-AC_CHECK_ODBC_TYPE(SQLSMALLINT,SWORD)
-AC_CHECK_ODBC_TYPE(SQLUSMALLINT,UWORD)
-
-AC_CHECK_ODBC_TYPE(SQLPOINTER,PTR)
-AC_CHECK_ODBC_TYPE(SQLHWND,HWND)
-
-AC_CHECK_ODBC_TYPE(SQLRETURN,RETCODE)
-
-AC_CHECK_ODBC_TYPE(SQLCHAR,UCHAR)
+if test "$with_docs" = "yes"
+then
+ docs_dirs="Docs"
+else
+ docs_dirs=""
+fi
+AC_MSG_RESULT([$with_docs])
+AC_SUBST(docs_dirs)
###################################################################
# #
-# Check and validate for odbc.ini #
+# Add some extra LDFLAGS to the linking of the shared library #
# #
###################################################################
-if test "x$iodbc_ok" = "xyes" && test "x$have_iodbcinst" != "xyes"
-then
-cat <<EOF
-----------------------------------------------------------------
-Warning: using iODBC but libiodbcinst library not found.
-Enabling workaround, which will search for mysql datasource
-configuration as follows:
-
-1. \$ODBCINI, and if not found - \$HOME/.odbc.ini (User data sources)
-2. $odbc_ini (System data sources)
-
-If you want to change (2), re-run configure using the
- --with-odbc-ini=/some/other/path/odbc.ini
-option.
-----------------------------------------------------------------
-EOF
-fi
+AC_ARG_WITH(ldflags,
+ [ --with-ldflags=option Extra arguments for linking. Normally -lmysqlclient],
+ EXTRA_LDFLAGS="$withval",EXTRA_LDFLAGS="")
+AC_SUBST(EXTRA_LDFLAGS)
-echo "END OF DRIVER MANAGER CONFIGURATION"
echo
###################################################################
@@ -622,23 +676,26 @@
AC_OUTPUT([
Makefile
+ driver/Makefile
samples/Makefile
+ Docs/Makefile
])
-echo "Sucess!!"
-echo
-echo "MySQL has a Web site at http://www.mysql.com/ which carries details"
-echo "on the latest release, upcoming features, and other information to "
-echo "make your work or play with MySQL more productive. There you can "
-echo "also find information about mailing lists for MySQL discussion. "
-echo
-echo "Remember to check the MyODBC FAQ for detailed installation and "
-echo "setup instructions as well as for various errors from: "
-echo "http://www.mysql.com/products/myodbc/faq_toc.html "
-echo
-echo "MyODBC Home page:"
-echo "http://www.mysql.com/products/myodbc/"
echo
-echo "Thank you for choosing MySQL Product!"
+echo "Success!!"
+echo " -------------------------------------------------------------------- "
+echo "| Remember to check the MyODBC FAQ for detailed installation and |"
+echo "| setup instructions from: |"
+echo "| http://www.mysql.com/products/myodbc/faq_toc.html |"
+echo "| |"
+echo "| MyODBC Home page: |"
+echo "| http://www.mysql.com/products/myodbc/ |"
+echo "| |"
+echo "| MySQL/MyODBC Mail archive: |"
+echo "| http://lists.mysql.com/ |"
+echo "| |"
+echo "| If you have any questions or improvements to driver, then send a |"
+echo "| mail to 'myodbc@lists.mysql.com' |"
+echo " -------------------------------------------------------------------- "
echo
--- New file ---
+++ driver/Makefile.am 00/09/18 14:14:55
##########################################################################
# Copyright (C) 1995-2002 MySQL AB, www.mysql.com #
# #
# This program is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program; if not, write to the Free Software Foundation #
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
##########################################################################
##########################################################################
# #
# Makefile.am #
# #
# @description: This is the MyODBC 3.51 driver Makefile.am #
# #
# @author : MySQL AB (monty@mysql.com, venu@mysql.com) #
# @date : 2001-Aug-15 #
# @product : myodbc3 #
# #
##########################################################################
AUTOMAKE_OPTIONS=foreign
INCLUDES = @MYSQL_INCLUDES@
lib_LTLIBRARIES=libmyodbc3.la
###################################################################
# #
# Driver Source files #
# #
###################################################################
libmyodbc3_la_SOURCES= \
catalog.c \
connect.c \
dll.c \
execute.c \
handle.c\
info.c \
myodbc3.c \
options.c \
prepare.c \
results.c \
transact.c \
utility.c \
dialogs.h \
myodbc3.h \
resource.h \
cursor.c \
error.c \
misc.c
###################################################################
# #
# Linker options #
# #
###################################################################
libmyodbc3_la_LDFLAGS=-release @myodbc_version@
libmyodbc3_la_LIBADD=@MYSQL_LIB_PATH@ -l@MYSQL_CLIENT_LIB@
LDFLAGS=@EXTRA_LDFLAGS@
--- 1.1/samples/Makefile.am Wed Dec 19 12:09:05 2001
+++ 1.2/samples/Makefile.am Tue Oct 29 23:35:03 2002
@@ -3,5 +3,12 @@
#my_connect_SOURCE=my_connect.c
INCLUDES=@MYSQL_INCLUDES@ -I. -I..
LDFLAFS=@MYSQL_LIB_PATH@ -lmysqlclient
-LDADD=../libmyodbc3.la
+LDADD=../driver/libmyodbc3.la
+
+
+test:
+ cd samples; \
+ $(MAKE); \
+ ./run-samples
+
--- New file ---
+++ samples/run-samples 02/10/29 23:29:16
#! /bin/sh
# Run individual MyODBC test samples
# By defauly, it uses the DSN=myodb3; you can ovveride this
# by supplying the command line options to the sample
./my_basics
./my_connect
./my_param
./my_result
./my_cursor
./my_tran
---------------------------------------------------------------------
Before posting, please check:
http://www.mysql.com/products/myodbc/manual_toc.html (the manual)
http://lists.mysql.com/ (the list archive)
To request this thread, e-mail <myodbc-thread6370@lists.mysql.com>
To unsubscribe, e-mail <myodbc-unsubscribe-##L=##H@lists.mysql.com>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic