List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:November 12 2007 11:51pm
Subject:Rev 223: Merged in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3

------------------------------------------------------------
revno: 223
revision-id: mtaylor@stripped
parent: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: telco-6.3
timestamp: Mon 2007-11-12 15:51:17 -0800
message:
  Merged
modified:
  acinclude.m4                   acinclude.m4-20070228020914-u2pk759xg7thauwf-8
    ------------------------------------------------------------
    revno: 192.1.25.1.31
    revision-id: mtaylor@stripped
    parent: mtaylor@stripped
    committer: Monty Taylor <mtaylor@stripped>
    branch nick: devel
    timestamp: Mon 2007-11-12 15:50:50 -0800
    message:
      Fixed more global build issues.
    modified:
      acinclude.m4                   acinclude.m4-20070228020914-u2pk759xg7thauwf-8
=== modified file 'acinclude.m4'
--- a/acinclude.m4	2007-11-12 22:57:53 +0000
+++ b/acinclude.m4	2007-11-12 23:50:50 +0000
@@ -134,6 +134,8 @@
 
   AS_IF([test "x$RUBY" != "x"],[
 
+    AC_MSG_CHECKING(for ruby devel)
+
     dnl need to change quotes to allow square brackets
     changequote(<<, >>)dnl
     ruby_prefix=`$RUBY -rrbconfig -e "print Config::CONFIG['archdir']"`
@@ -143,6 +145,18 @@
     RUBY_LIBDIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['rubylibdir']"`
     RUBY_INCLUDES="-I$ruby_prefix"
     changequote([, ])dnl
+
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LDFLAGS="$LDFLAGS"
+    CFLAGS="$ac_save_CFLAGS $RUBY_INCLUDES"
+    CPPFLAGS="$ac_save_CPPFLAGS $RUBY_INCLUDES"
+    LDFLAGS="$ac_save_LDFLAGS $LIBRUBYARG_SHARED"
+    
+    AC_TRY_LINK([#include <ruby.h>], [VALUE rb_ac_test =
rb_define_module("actest");],
+                       
[with_ruby="yes";AC_MSG_RESULT(found)],[with_ruby="no";AC_MSG_RESULT(missing)])
+
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    LDFLAGS="$ac_save_LDFLAGS"
   ],[
     # This allows 'make clean' in the ruby directory to work when
     # ruby isn't available
@@ -152,6 +166,7 @@
     RUBY_LIB=
     RUBY_DIR=
     RUBY_LIBDIR=
+    with_ruby="no"
   ])
 
   AC_SUBST(RUBY_INCLUDES)
@@ -160,7 +175,7 @@
   AC_SUBST(RUBY_DIR)
   AC_SUBST(RUBY_LIBDIR)
 
-  AS_IF([test "x$RUBY_DIR" = "x"],[with-ruby="no"])
+  AS_IF([test "x$RUBY_DIR" = "x"],[with_ruby="no"])
 ])
  
 AC_DEFUN([WITH_MYSQL], [ 

Thread
Rev 223: Merged in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3Monty Taylor13 Nov