From 5cbf6cbdb1c7ff14ed5dcfea55f8e4b1067dd7ed Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Thu, 24 Mar 2011 19:47:32 +0000 Subject: [PATCH] Enclose building of app-utils-python in AM_CONDITIONAL so that it isn't build on a non-python build. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20469 57a11ea4-9604-0410-9ed3-97b8803252fd --- configure.ac | 1 + src/app-utils/Makefile.am | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 3656931cab..1dc11b3ea2 100644 --- a/configure.ac +++ b/configure.ac @@ -1180,6 +1180,7 @@ then 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 diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am index 9f7606ff89..c90ebb68f1 100644 --- a/src/app-utils/Makefile.am +++ b/src/app-utils/Makefile.am @@ -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 @@ AM_CPPFLAGS = \ ${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 @@ swig-app-utils-python.c: app-utils.i ${top_srcdir}/src/base-typemaps.i -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 @@ gncscm_DATA = \ noinst_DATA = .scm-links EXTRA_DIST = \ + swig-app-utils-python.c \ app-utils.i \ ${gncmod_DATA} \ ${gncscm_DATA}