r20469 - gnucash/trunk - Enclose building of app-utils-python in AM_CONDITIONAL so that it isn't build on a non-python build.

Christian Stimming cstim at code.gnucash.org
Thu Mar 24 15:47:32 EDT 2011


Author: cstim
Date: 2011-03-24 15:47:32 -0400 (Thu, 24 Mar 2011)
New Revision: 20469
Trac: http://svn.gnucash.org/trac/changeset/20469

Modified:
   gnucash/trunk/configure.ac
   gnucash/trunk/src/app-utils/Makefile.am
Log:
Enclose building of app-utils-python in AM_CONDITIONAL so that it isn't build on a non-python build.

Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac	2011-03-24 19:42:49 UTC (rev 20468)
+++ gnucash/trunk/configure.ac	2011-03-24 19:47:32 UTC (rev 20469)
@@ -1180,6 +1180,7 @@
   SWIG_PYTHON
 fi
 AC_SUBST(PYTHON_DIR)
+AM_CONDITIONAL(WITH_PYTHON, [test x${enable_python} = xtrue])
 
 ###-------------------------------------------------------------------------
 ### Additional compiler warnings (or not) if we're running GCC

Modified: gnucash/trunk/src/app-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/Makefile.am	2011-03-24 19:42:49 UTC (rev 20468)
+++ gnucash/trunk/src/app-utils/Makefile.am	2011-03-24 19:47:32 UTC (rev 20469)
@@ -17,7 +17,7 @@
 
 SUBDIRS = . test
 
-pkglib_LTLIBRARIES = libgncmod-app-utils.la libgncmod-app-utils-python.la
+pkglib_LTLIBRARIES = libgncmod-app-utils.la
 
 AM_CPPFLAGS = \
   -I$(top_srcdir)/lib/libc \
@@ -34,13 +34,6 @@
   ${GCONF_CFLAGS} \
   ${GTK_CFLAGS}
 
-libgncmod_app_utils_python_la_SOURCES = \
-  swig-app-utils-python.c
-
-libgncmod_app_utils_python_la_LIBADD = \
-  ${PYTHON_LIBS} \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la
-
 libgncmod_app_utils_la_SOURCES = \
   swig-app-utils-guile.c \
   business-options.c \
@@ -122,6 +115,17 @@
 	-I${top_srcdir}/src -o $@ $<
 endif
 
+if WITH_PYTHON
+pkglib_LTLIBRARIES += libgncmod-app-utils-python.la
+
+libgncmod_app_utils_python_la_SOURCES = \
+  swig-app-utils-python.c
+
+libgncmod_app_utils_python_la_LIBADD = \
+  ${PYTHON_LIBS} \
+  ${top_builddir}/src/app-utils/libgncmod-app-utils.la
+endif
+
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = app-utils.scm 
 
@@ -138,6 +142,7 @@
 noinst_DATA = .scm-links
 
 EXTRA_DIST = \
+  swig-app-utils-python.c \
   app-utils.i \
   ${gncmod_DATA} \
   ${gncscm_DATA}



More information about the gnucash-changes mailing list