List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:November 6 2007 8:12pm
Subject:Rev 237: Fixed a small bug in build process. Now should error out if we can't compile or link against NDB API and should find both libndbhelper and li...
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge

------------------------------------------------------------
revno: 237
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: ndbjmerge
timestamp: Tue 2007-11-06 12:11:50 -0800
message:
  Fixed a small bug in build process. Now should error out if we can't compile or link
against NDB API and should find both libndbhelper and libmysys/liibmystrings versions of
things.
modified:
  acinclude.m4                   acinclude.m4-20070228020914-u2pk759xg7thauwf-8
  configure.in                   configure.in-20070228020914-u2pk759xg7thauwf-13
=== modified file 'acinclude.m4'
--- a/acinclude.m4	2007-11-06 18:31:46 +0000
+++ b/acinclude.m4	2007-11-06 20:11:50 +0000
@@ -74,6 +74,22 @@
   ])
 ])
 
+AC_DEFUN([WITH_CSHARP], [
+
+  AC_ARG_WITH([csharp], 
+    [AS_HELP_STRING([--with-csharp],
+      [BULD NDB/.NET @<:@default=no@:>@])],
+    [with_csharp=$withval], 
+    [with_csharp=no])
+
+  AS_IF([test "x$with_csharp" = "xyes"],[
+    AC_CHECK_PROGS(MONO,[mono])
+    AS_IF([test "x$MONO" = "x"],AC_MSG_ERROR([Couldn't find mono.]))
+    AC_CHECK_PROGS(MCS,[gmcs])
+    AS_IF([test "x$MCS" = "x"],AC_MSG_ERROR([Couldn't find gmcs.]))
+  ])
+])
+
 AC_DEFUN([WITH_PERL], [
 
   AC_ARG_WITH([perl], 
@@ -189,10 +205,11 @@
 
     LDFLAGS="$LDFLAGS "`$MYSQL_CONFIG --libs_r`
     
-    AC_CHECK_LIB([ndbclient],[ndb_init])
-      AC_CHECK_LIB([ndbhelper],[decimal2longlong],,
-	[AC_CHECK_LIB([mysys],[decimal2longlong])
-         AC_CHECK_LIB([mystrings],[my_str_free])])
+    AC_CHECK_LIB([ndbhelper],[decimal2longlong],,[
+      AC_CHECK_LIB([mysys],[decimal2longlong])
+      AC_CHECK_LIB([mystrings],[my_str_free])
+    ])
+    AC_CHECK_LIB([ndbclient],[ndb_init],,[AC_MSG_ERROR([Can't link against
libndbclient])])
      
     AC_MSG_CHECKING(for NdbApi headers)
      AC_TRY_LINK([#include <NdbApi.hpp>], [int attr=NdbTransaction::Commit; ],

=== modified file 'configure.in'
--- a/configure.in	2007-11-05 18:12:57 +0000
+++ b/configure.in	2007-11-06 20:11:50 +0000
@@ -41,8 +41,6 @@
 AC_SUBST(SWIG_LIB)
 
 
-AC_CHECK_PROGS(MONO,mono)
-AC_CHECK_PROGS(MCS,gmcs)
 
 AC_CANONICAL_HOST
 ACX_PTHREAD()
@@ -53,6 +51,8 @@
 
 WITH_JAVA()
 
+WITH_CSHARP()
+
 WITH_PYTHON()
 
 WITH_PHP()

Thread
Rev 237: Fixed a small bug in build process. Now should error out if we can't compile or link against NDB API and should find both libndbhelper and li...Monty Taylor6 Nov