diff options
| author |  Christophe Fergeau | 2017-04-20 12:38:09 +0200 |
|---|---|---|
| committer |  Nikias Bassen | 2017-04-20 12:38:09 +0200 |
| commit | 054578a2d842f53a061c0a6ddaf6bfc849be0738 (patch) | |
| tree | 135e0569d64044555c8c6b80e183ead923dedaf1 | |
| parent | d0193690c8d7b8b4adb8fac4fc9289ebe07576f3 (diff) | |
| download | libplist-054578a2d842f53a061c0a6ddaf6bfc849be0738.tar.gz libplist-054578a2d842f53a061c0a6ddaf6bfc849be0738.tar.bz2 | |
autofoo: Ensure that 'make distcheck' doesn't fail when cython is not installed
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 8ac4acf..670e7a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,9 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = libcnary src include tools $(CYTHON_SUB) test +SUBDIRS = libcnary src include tools test +if HAVE_CYTHON +SUBDIRS += cython +endif docs/html: $(top_builddir)/doxygen.cfg $(top_srcdir)/include/plist/*.h rm -rf docs diff --git a/configure.ac b/configure.ac index ddd5b81..61eb8ef 100644 --- a/configure.ac +++ b/configure.ac @@ -117,21 +117,17 @@ if [test "x$CYTHON" != "xfalse"]; then CYTHON_PLIST_INCLUDE_DIR=$($PKG_CONFIG --variable=includedir libplist)/plist/cython if [test ! -d "$CYTHON_PLIST_INCLUDE_DIR"]; then CYTHON_PLIST_INCLUDE_DIR=. - CYTHON_SUB=cython cython_python_bindings=yes AC_MSG_RESULT([Using built-in libplist Cython bindings (assuming this is a first build)]) else AC_SUBST([CYTHON_PLIST_INCLUDE_DIR]) AC_MSG_RESULT([$CYTHON_PLIST_INCLUDE_DIR]) - CYTHON_SUB=cython cython_python_bindings=yes fi else - CYTHON_SUB= cython_python_bindings=no fi -AM_CONDITIONAL([HAVE_CYTHON],[test "x$CYTHON_SUB" = "xcython"]) -AC_SUBST([CYTHON_SUB]) +AM_CONDITIONAL([HAVE_CYTHON],[test "x$cython_python_bindings" = "xyes"]) AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wredundant-decls -Wshadow -Wpointer-arith -Wwrite-strings -Wswitch-default -Wno-unused-parameter -Wno-strict-aliasing -fvisibility=hidden $PTHREAD_CFLAGS") GLOBAL_LDFLAGS="$PTHREAD_LIBS" |