bk commit - MyODBC 3.51 (1.518)

Below is the list of changes that have just been commited into a local
MyODBC 3.51 repository of 'pharvey'. When 'pharvey' does a push, they will
be propogaged to the main repository and within 2 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_2.html#Development_ source

You can also browse the changes from public repository:
Complete repository: http://mysql.bkbits.net:8080/myodbc3/
This changeset : http://mysql.bkbits.net:8080/myodbc3/cset@1.518

ChangeSet
1.518 05/09/30 14:46:24 pharvey@mercury.codebydesign.com +2 -0
- some adjustments to work with nw qt.m4

setup/Makefile.am
1.12 05/09/30 14:46:15 pharvey@mercury.codebydesign.com +5 -2
- some adjustments to work with nw qt.m4

qt.m4
1.3 05/09/30 14:46:15 pharvey@mercury.codebydesign.com +6 -6
- some adjustments to work with nw qt.m4

# 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: pharvey
# Host: mercury.codebydesign.com
# Root: /home/pharvey/myodbc-3.51

--- 1.11/setup/Makefile.am 2005-09-20 12:58:38 -07:00
+++ 1.12/setup/Makefile.am 2005-09-30 14:46:15 -07:00
@@ -114,7 +114,8 @@
# #
############################################################ #######

-INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
+# INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
+INCLUDES = -I@top_srcdir@/include $(QT_CXXFLAGS) -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(LTDLINCL)

libmyodbc3S_la_LDFLAGS = \
-export-dynamic \
@@ -122,7 +123,9 @@
-release @myodbc_version@ \
-module

-libmyodbc3S_la_LIBADD = @QT_LDFLAGS@ @LIB_QT@ ../util/libmyodbcutil.la
+# libmyodbc3S_la_LIBADD = @QT_LDFLAGS@ @LIB_QT@ ../util/libmyodbcutil.la
+libmyodbc3S_la_LIBADD = $(QT_LDFLAGS) $(QT_LIBS) ../util/libmyodbcutil.la
+
libmyodbc3S_la_DEPENDENCIES = ../util/libmyodbcutil.la

# LDFLAGS=@EXTRA_LDFLAGS@

--- 1.2/qt.m4 2005-09-20 12:58:38 -07:00
+++ 1.3/qt.m4 2005-09-30 14:46:15 -07:00
@@ -5,8 +5,7 @@

#
# This was pulled from a gettext example on a SuSE 9.1 distro and has since been
-# enhanced to serve as a general purpose utility for detecting and configuring
-# for qt.
+# enhanced to serve the purposes of unixODBC.
#
# Peter Harvey 30.AUG.05
#
@@ -197,9 +196,9 @@
# Have not been told where Qt is so search for it...
if test "x$qt_includes" = "x" ; then
# look in standard locations
- qt_found_dirs=""
- qt_include_dirs="
$QTDIR/include
+ qt_found_dirs=""
+ qt_include_dirs="
/usr/include
/usr/local/include
/usr/X11R6/include
@@ -265,11 +264,12 @@

AC_DEFUN([FUN_QT_VERSION],
[
+ dnl the 2x versions need the extra sed
qt_current_version=`grep -w '#define QT_VERSION' "$1"/qglobal.h |
- sed s/'#define QT_VERSION 0x'//`
+ sed s/'#define QT_VERSION 0x'// | sed s/'#define QT_VERSION'//`
if test "x$qt_current_version" = "x" ; then
qt_current_version=`grep -w '#define QT_VERSION' "$1"/Qt/qglobal.h |
- sed s/'#define QT_VERSION 0x'//`
+ sed s/'#define QT_VERSION 0x'// | sed s/'#define QT_VERSION'//`
fi
])#FUN_QT_VERSION


--
MySQL ODBC Mailing List
For list archives: http://lists.mysql.com/myodbc
To unsubscribe: http://lists.mysql.com/myodbc?unsub=gcdmo-myodbc@m.gmane.org