List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:November 26 2007 10:28am
Subject:Rev 257: Merged build changes. 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: 257
revision-id: mtaylor@stripped
parent: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: telco-6.3
timestamp: Mon 2007-11-26 02:28:26 -0800
message:
  Merged build changes. 
modified:
  configure.in                   configure.in-20070228020914-u2pk759xg7thauwf-13
  swig/SWIG/Source/Makefile.am   makefile.am-20071104211339-fod7yzi8t7xd3g0w-108
    ------------------------------------------------------------
    revno: 192.1.25.1.93
    revision-id: mtaylor@stripped
    parent: mtaylor@stripped
    committer: Monty Taylor <mtaylor@stripped>
    branch nick: devel
    timestamp: Mon 2007-11-26 02:27:34 -0800
    message:
      Fixed yatypo that was causing lua dir to get built even if we properly detected that
we don't have lua. 
    modified:
      configure.in                   configure.in-20070228020914-u2pk759xg7thauwf-13
    ------------------------------------------------------------
    revno: 192.1.25.1.92
    revision-id: mtaylor@stripped
    parent: mtaylor@stripped
    committer: Monty Taylor <mtaylor@stripped>
    branch nick: devel
    timestamp: Mon 2007-11-26 02:21:22 -0800
    message:
      Better fix for swig old automake problem
    modified:
      swig/SWIG/Source/Makefile.am   makefile.am-20071104211339-fod7yzi8t7xd3g0w-108
=== modified file 'configure.in'
--- a/configure.in	2007-11-26 09:57:50 +0000
+++ b/configure.in	2007-11-26 10:28:26 +0000
@@ -96,7 +96,7 @@
 AM_CONDITIONAL(BUILD_CSHARP_SUBDIR, test "$with_csharp" != "no")
 AM_CONDITIONAL(BUILD_RUBY_SUBDIR, test "$with_ruby" != "no")
 AM_CONDITIONAL(BUILD_JAVA_SUBDIR, test "$with_java" != "no")
-AM_CONDITIONAL(BUILD_LUA_SUBDIR, test "x$with_lua" != "no") 
+AM_CONDITIONAL(BUILD_LUA_SUBDIR, test "$with_lua" != "no") 
 
 AC_SUBST(MYSQL_INCLUDES)
 AC_SUBST(SWIG_SOURCES)

=== modified file 'swig/SWIG/Source/Makefile.am'
--- a/swig/SWIG/Source/Makefile.am	2007-11-26 10:15:22 +0000
+++ b/swig/SWIG/Source/Makefile.am	2007-11-26 10:21:22 +0000
@@ -98,8 +98,8 @@
 # The executable is copied to the root directory for installation and running the
test-suite.
 # This occurs on each invocation of make and is a step towards providing support for
multiple 
 # build directories.
-all-local: ./eswig@EXEEXT@
-	cp -f ./eswig@EXEEXT@ $(top_builddir)/swig@EXEEXT@
+all-local: eswig@EXEEXT@
+	cp -f $(top_builddir)/Source/eswig@EXEEXT@ $(top_builddir)/swig@EXEEXT@
 
 clean-local:
 	rm -f $(top_builddir)/swig@EXEEXT@

Thread
Rev 257: Merged build changes. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3Monty Taylor26 Nov