List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:September 14 2007 11:46pm
Subject:Rev 147: Put in conditionals to prevent building in disabled languages. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/autoconfbug
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/autoconfbug

------------------------------------------------------------
revno: 147
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: autoconfbug
timestamp: Fri 2007-09-14 16:46:40 -0700
message:
  Put in conditionals to prevent building in disabled languages.
modified:
  Makefile.am                    makefile.am-20070228020914-u2pk759xg7thauwf-4
  configure.in                   configure.in-20070228020914-u2pk759xg7thauwf-13
=== modified file 'Makefile.am'
--- a/Makefile.am	2007-08-01 17:18:09 +0000
+++ b/Makefile.am	2007-09-14 23:46:40 +0000
@@ -3,7 +3,22 @@
 if BUILD_LUA_SUBDIR
   d_lua = lua
 endif
-SUBDIRS = java python perl csharp ruby php $(d_lua)
+if BUILD_JAVA_SUBDIR
+  d_java = java
+endif
+if BUILD_PYTHON_SUBDIR
+  d_python = python
+endif
+if BUILD_CSHARP_SUBDIR
+  d_csharp = csharp
+endif
+if BUILD_RUBY_SUBDIR
+  d_ruby = ruby
+endif
+if BUILD_PHP_SUBDIR
+  d_php = php
+endif
+SUBDIRS = $(d_java) $(d_python) $(d_perl) $(d_csharp) $(d_ruby) $(d_php) $(d_lua)
 
 distclean-local:
 	rm -fr autom4te.cache

=== modified file 'configure.in'
--- a/configure.in	2007-08-01 17:18:09 +0000
+++ b/configure.in	2007-09-14 23:46:40 +0000
@@ -102,6 +102,12 @@
 GENERATED="# This file is autogenerated!" 
 AC_SUBST(GENERATED)
 
+AM_CONDITIONAL(BUILD_PYTHON_SUBDIR, test "$with_python" != "no")
+AM_CONDITIONAL(BUILD_PHP_SUBDIR, test "$with_php" != "no")
+AM_CONDITIONAL(BUILD_PERL_SUBDIR, test "$with_perl" != "no")
+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$HAVE_LUA" != "x") 
 
 AC_SUBST(MYSQL_INCLUDES)

Thread
Rev 147: Put in conditionals to prevent building in disabled languages. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/autoconfbugMonty Taylor15 Sep