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
This commit is contained in:
Christian Stimming 2011-03-24 19:47:32 +00:00
parent 373c161dc6
commit 5cbf6cbdb1
2 changed files with 14 additions and 8 deletions

View File

@ -1180,6 +1180,7 @@ then
SWIG_PYTHON SWIG_PYTHON
fi fi
AC_SUBST(PYTHON_DIR) AC_SUBST(PYTHON_DIR)
AM_CONDITIONAL(WITH_PYTHON, [test x${enable_python} = xtrue])
###------------------------------------------------------------------------- ###-------------------------------------------------------------------------
### Additional compiler warnings (or not) if we're running GCC ### Additional compiler warnings (or not) if we're running GCC

View File

@ -17,7 +17,7 @@
SUBDIRS = . test SUBDIRS = . test
pkglib_LTLIBRARIES = libgncmod-app-utils.la libgncmod-app-utils-python.la pkglib_LTLIBRARIES = libgncmod-app-utils.la
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/libc \ -I$(top_srcdir)/lib/libc \
@ -34,13 +34,6 @@ AM_CPPFLAGS = \
${GCONF_CFLAGS} \ ${GCONF_CFLAGS} \
${GTK_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 = \ libgncmod_app_utils_la_SOURCES = \
swig-app-utils-guile.c \ swig-app-utils-guile.c \
business-options.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 $@ $< -I${top_srcdir}/src -o $@ $<
endif 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 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
gncmod_DATA = app-utils.scm gncmod_DATA = app-utils.scm
@ -138,6 +142,7 @@ gncscm_DATA = \
noinst_DATA = .scm-links noinst_DATA = .scm-links
EXTRA_DIST = \ EXTRA_DIST = \
swig-app-utils-python.c \
app-utils.i \ app-utils.i \
${gncmod_DATA} \ ${gncmod_DATA} \
${gncscm_DATA} ${gncscm_DATA}