[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: 2003-02-14 3:36:47
[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.262 03/02/13 19:36:45 venu@myvenu.com +3 -0
Configure: fix to recognize Redhat i686 m/c conf
Configure: Enable/Disable samples
Makefile.am
1.17 03/02/13 19:35:29 venu@myvenu.com +4 -1
Enable/Disable samples
configure.in
1.30 03/02/13 19:35:15 venu@myvenu.com +25 -6
Enable/Disable samples
config.guess
1.3 03/02/13 19:34:56 venu@myvenu.com +37 -37
Fix to recognize Redhat i686 m/c conf
# 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.16/Makefile.am Mon Jan 6 12:47:19 2003
+++ 1.17/Makefile.am Thu Feb 13 19:35:29 2003
@@ -32,7 +32,10 @@
INCLUDES = @MYSQL_INCLUDES@
LDFLAGS=@EXTRA_LDFLAGS@
-SUBDIRS = driver @myodbc_thread_dir@ samples scripts
+SUBDIRS = driver \
+ @myodbc_thread_dir@ \
+ @myodbc_samples_dir@ \
+ scripts
#
# Create the binary distribution
--- 1.2/config.guess Tue Dec 17 21:36:37 2002
+++ 1.3/config.guess Thu Feb 13 19:34:56 2003
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
-timestamp='2001-08-21'
+timestamp='2001-09-04'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -402,6 +402,7 @@
echo clipper-intergraph-clix${UNAME_RELEASE}
exit 0 ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */
@@ -423,7 +424,6 @@
exit (-1);
}
EOF
- eval $set_cc_for_build
$CC_FOR_BUILD $dummy.c -o $dummy \
&& ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
&& rm -f $dummy.c $dummy && exit 0
@@ -493,6 +493,7 @@
exit 0 ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#include <sys/systemcfg.h>
@@ -504,7 +505,6 @@
exit(0);
}
EOF
- eval $set_cc_for_build
$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
echo rs6000-ibm-aix3.2.5
@@ -572,6 +572,7 @@
fi ;;
esac
if [ "${HP_ARCH}" = "" ]; then
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#define _HPUX_SOURCE
@@ -605,10 +606,9 @@
exit (0);
}
EOF
- eval $set_cc_for_build
- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
- rm -f $dummy.c $dummy
+ (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+ if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+ rm -f $dummy.c $dummy
fi ;;
esac
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -618,6 +618,7 @@
echo ia64-hp-hpux${HPUX_REV}
exit 0 ;;
3050*:HI-UX:*:*)
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#include <unistd.h>
int
@@ -643,7 +644,6 @@
exit (0);
}
EOF
- eval $set_cc_for_build
$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
echo unknown-hitachi-hiuxwe2
@@ -776,25 +776,22 @@
echo ${UNAME_MACHINE}-pc-minix
exit 0 ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux
+ echo ${UNAME_MACHINE}-unknown-linux
exit 0 ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
mips:Linux:*:*)
case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
- big) echo mips-${VENDOR}-linux && exit 0 ;;
- little) echo mipsel-${VENDOR}-linux && exit 0 ;;
- esac
- case `sed -n '/^system type/s/^.*: \([^ ]*\).*/\1/p' < /proc/cpuinfo` in
- SGI|sgi) echo mips-${VENDOR}-linux-gnu && exit 0 ;;
+ big) echo mips-unknown-linux-gnu && exit 0 ;;
+ little) echo mipsel-unknown-linux-gnu && exit 0 ;;
esac
;;
- ppc:Linux:*:*|ppc64:Linux:*:*)
- echo powerpc-${VENDOR}-linux
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
exit 0 ;;
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
@@ -811,30 +808,30 @@
esac
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit 0 ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-${VENDOR}-linux ;;
- PA8*) echo hppa2.0-${VENDOR}-linux ;;
- *) echo hppa-${VENDOR}-linux ;;
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
esac
exit 0 ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-${VENDOR}-linux
+ echo hppa64-unknown-linux-gnu
exit 0 ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit 0 ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
x86_64:Linux:*:*)
- echo x86_64-${VENDOR}-linux
+ echo x86_64-unknown-linux-gnu
exit 0 ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
@@ -848,21 +845,22 @@
p'`
case "$ld_supported_targets" in
elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
;;
a.out-i386-linux)
- echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
exit 0 ;;
coff-i386)
- echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
exit 0 ;;
"")
- # Either a pre-BFD a.out linker (linuxoldld) or
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
- echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
exit 0 ;;
esac
# Determine whether the default compiler is a.out or elf
+ eval $set_cc_for_build
cat >$dummy.c <<EOF
#include <features.h>
#ifdef __cplusplus
@@ -874,20 +872,19 @@
#ifdef __ELF__
# ifdef __GLIBC__
# if __GLIBC__ >= 2
- printf ("%s-${VENDOR}-linux\n", argv[1]);
+ printf ("%s-pc-linux-gnu\n", argv[1]);
# else
- printf ("%s-${VENDOR}-linuxlibc1\n", argv[1]);
+ printf ("%s-pc-linux-gnulibc1\n", argv[1]);
# endif
# else
- printf ("%s-${VENDOR}-linuxlibc1\n", argv[1]);
+ printf ("%s-pc-linux-gnulibc1\n", argv[1]);
# endif
#else
- printf ("%s-${VENDOR}-linuxaout\n", argv[1]);
+ printf ("%s-pc-linux-gnuaout\n", argv[1]);
#endif
return 0;
}
EOF
- eval $set_cc_for_build
$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm \
-f $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy
test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
@@ -1126,11 +1123,15 @@
i*86:XTS-300:*:STOP)
echo ${UNAME_MACHINE}-unknown-stop
exit 0 ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos
+ exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
@@ -1245,7 +1246,6 @@
}
EOF
-eval $set_cc_for_build
$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && \
exit 0 rm -f $dummy.c $dummy
--- 1.29/configure.in Mon Jan 6 12:47:18 2003
+++ 1.30/configure.in Thu Feb 13 19:35:15 2003
@@ -38,7 +38,7 @@
#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(MyODBC,3.51.06)
myodbc_version=$VERSION
@@ -667,7 +667,7 @@
AC_MSG_CHECKING([if debug mode is enabled])
AC_ARG_WITH(debug,
- [ --with-debug Build the debug version default=no],
+ [ --with-debug Build the debug version default=no],
[with_debug=$withval],
[with_debug=no])
AC_MSG_RESULT([$with_debug])
@@ -687,6 +687,7 @@
# Build Docs ? #
# #
###################################################################
+myodbc_docs_dir=""
AC_MSG_CHECKING([if building of documentation is enabled])
AC_ARG_WITH(docs,
[ --with-docs Build the documentation default=no],
@@ -697,11 +698,29 @@
if test "$with_docs" = "yes"
then
- docs_dirs="Docs"
-else
- docs_dirs=""
+ myodbc_docs_dir="Docs"
+fi
+AC_SUBST(myodbc_docs_dir)
+
+###################################################################
+# #
+# Build Samples ? #
+# #
+###################################################################
+myodbc_samples_dir="samples"
+AC_MSG_CHECKING([if building of samples is enabled])
+AC_ARG_WITH(samples,
+ [ --with-samples Build the samples default=yes],
+ [with_samples=$withval],
+ [with_samples=yes]
+ )
+AC_MSG_RESULT([$with_samples])
+
+if test "$with_samples" = "no"
+then
+ myodbc_samples_dir=""
fi
-AC_SUBST(docs_dirs)
+AC_SUBST(myodbc_samples_dir)
###################################################################
# #
---------------------------------------------------------------------
Before posting, please check:
http://www.mysql.com/products/myodbc/manual_toc.html (the manual)
http://lists.mysql.com/ (the list archive)
To unsubscribe, e-mail <myodbc-unsubscribe@lists.mysql.com>
To unsubscribe from Yahoo! Groups version, e-mail myodbc-unsubscribe@yahoogroups.com
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic