From: Date: February 14 2007 12:02am
Subject: bk commit into 5.1 tree (mtaylor:1.2428) BUG#25404
List-Archive: http://lists.mysql.com/commits/19813
X-Bug: 25404
Message-Id: <E1HH6fI-0007uF-HK@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.1 repository of mtaylor. When mtaylor does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-13 21:02:17-02:00, mtaylor@qualinost.(none) +2 -0
  Added cflags and libs options to mysql_config for NdbApi programs. Bug #25404

  scripts/Makefile.am@stripped, 2007-02-13 21:02:13-02:00, mtaylor@qualinost.(none) +1 -0
    Added cflags and libs options to mysql_config for NdbApi programs. 

  scripts/mysql_config.sh@stripped, 2007-02-13 21:02:13-02:00, mtaylor@qualinost.(none) +24 -8
    Added cflags and libs options to mysql_config for NdbApi programs. 

# 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:	mtaylor
# Host:	qualinost.(none)
# Root:	/home/mtaylor/src/mysql-5.1-new-maint

--- 1.61/scripts/Makefile.am	2007-02-13 21:02:24 -02:00
+++ 1.62/scripts/Makefile.am	2007-02-13 21:02:24 -02:00
@@ -137,6 +137,7 @@
 	  -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
 	  -e 's!@''STATIC_NSS_FLAGS''@!@STATIC_NSS_FLAGS@!' \
 	  -e 's!@''NON_THREADED_LIBS''@!@NON_THREADED_LIBS@!' \
+	  -e 's!@''TEST_NDBCLUSTER''@!@TEST_NDBCLUSTER@!' \
 	  -e 's!@''ZLIB_DEPS''@!@ZLIB_DEPS@!' \
 	  -e "s!@MAKE@!$(MAKE)!" \
 	$< > $@-t

--- 1.27/scripts/mysql_config.sh	2007-02-13 21:02:24 -02:00
+++ 1.28/scripts/mysql_config.sh	2007-02-13 21:02:24 -02:00
@@ -81,6 +81,8 @@
 ldata='@localstatedir@'
 execdir='@libexecdir@'
 bindir='@bindir@'
+TEST_NDBCLUSTER='@TEST_NDBCLUSTER@'
+
 
 # If installed, search for the compiled in directory first (might be "lib64")
 pkglibdir='@pkglibdir@'
@@ -101,9 +103,11 @@
 libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
 libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
 embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
+ndbclient_libs=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ -lndbclient -lmystrings -lmysys"
 
 cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
 include="-I$pkgincludedir"
+ndbclient_cflags=" -I$pkgincludedir @CFLAGS@ -I$pkgincludedir/storage/ndb -I$pkgincludedir/storage/ndb/ndbapi -I$pkgincludedir/storage/ndb/mgmapi "
 
 # Remove some options that a client doesn't have to care about
 # FIXME until we have a --cxxflags, we need to remove -Xa
@@ -117,8 +121,10 @@
   # The first option we might strip will always have a space before it because
   # we set -I$pkgincludedir as the first option
   cflags=`echo "$cflags"|sed -e "s/ -$remove  */ /g"` 
+  ndbclient_cflags=`echo "$ndbclient_cflags"|sed -e "s/ -$remove  */ /g"` 
 done
 cflags=`echo "$cflags"|sed -e 's/ *\$//'` 
+ndbclient_cflags=`echo "$ndbclient_cflags"|sed -e 's/ *\$//'` 
 
 # Same for --libs(_r)
 for remove in lmtmalloc static-libcxa i-static
@@ -127,26 +133,34 @@
   libs=`echo "$libs"|sed -e "s/ -$remove  */ /g"` 
   libs_r=`echo "$libs_r"|sed -e "s/ -$remove  */ /g"` 
   embedded_libs=`echo "$embedded_libs"|sed -e "s/ -$remove  */ /g"` 
+  ndbclient_libs=`echo "$ndbclient_libs"|sed -e "s/ -$remove  */ /g"` 
 done
 
 # Strip trailing and ending space if any, and '+' (FIXME why?)
 libs=`echo "$libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
 libs_r=`echo "$libs_r" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
 embedded_libs=`echo "$embedded_libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
+ndbclient_libs=`echo "$ndbclient_libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
 
 usage () {
         cat <<EOF
 Usage: $0 [OPTIONS]
 Options:
-        --cflags         [$cflags]
-        --include        [$include]
-        --libs           [$libs]
-        --libs_r         [$libs_r]
-        --socket         [$socket]
-        --port           [$port]
-        --version        [$version]
-        --libmysqld-libs [$embedded_libs]
+        --cflags         	[$cflags]
+        --include        	[$include]
+        --libs           	[$libs]
+        --libs_r         	[$libs_r]
+        --socket         	[$socket]
+        --port           	[$port]
+        --version        	[$version]
+        --libmysqld-libs 	[$embedded_libs]
+EOF
+	if test $TEST_NDBCLUSTER = "--ndbcluster" ; then
+		cat <<EOF
+        --libndbclient-cflags	[$ndbclient_cflags]
+        --libndbclient-libs 	[$ndbclient_libs]
 EOF
+	fi
         exit 1
 }
 
@@ -162,6 +176,8 @@
         --port)    echo "$port" ;;
         --version) echo "$version" ;;
         --embedded-libs | --embedded | --libmysqld-libs) echo "$embedded_libs" ;;
+        --libndbclient-cflags) test "$TEST_NDBCLUSTER" = "--ndbcluster" &&  echo "$ndbclient_cflags" || usage ;;
+        --libndbclient-libs) test "$TEST_NDBCLUSTER" = "--ndbcluster"  && echo "$ndbclient_libs" || usage ;;
         *)         usage ;;
         esac