diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-07-12 08:37:35 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-07-12 08:37:37 +0900 |
| commit | 8c716c24c89f4229ba1dd2859df94827d8c935c8 (patch) | |
| tree | a426831630e5bf1bdf1cd204216d958c4b131e85 /configure.ac | |
| parent | e94eac598d6c67611cd184e40480265208110b14 (diff) | |
| download | pygobject2-8c716c24c89f4229ba1dd2859df94827d8c935c8.tar.gz pygobject2-8c716c24c89f4229ba1dd2859df94827d8c935c8.tar.bz2 pygobject2-8c716c24c89f4229ba1dd2859df94827d8c935c8.zip | |
Imported Upstream version 2.90.4
Change-Id: Ib8f95df396c1690e019c961142cb5fc6de1b394c
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac index 8937c18..4719176 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ m4_define(python3_min_ver, 3.1) dnl the pygobject version number m4_define(pygobject_major_version, 2) m4_define(pygobject_minor_version, 90) -m4_define(pygobject_micro_version, 3) +m4_define(pygobject_micro_version, 4) m4_define(pygobject_version, pygobject_major_version.pygobject_minor_version.pygobject_micro_version) dnl versions of packages we require ... @@ -37,8 +37,8 @@ AC_SUBST(PYGOBJECT_MICRO_VERSION, pygobject_micro_version) AM_CONFIG_HEADER(config.h) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) -AM_INIT_AUTOMAKE(foreign) -AM_MAINTAINER_MODE +AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz]) +AM_MAINTAINER_MODE([enable]) dnl put the ACLOCAL flags in the makefile ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" @@ -101,7 +101,10 @@ if test $build_py3k = true ; then [AC_MSG_ERROR(too old)]) fi -AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) +AM_CHECK_PYTHON_HEADERS(, AC_MSG_ERROR([Python headers not found])) +if test "x$os_win32" = "xyes"; then + AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows requires Python modules to be explicitly linked to libpython.])) +fi AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h]) old_CPPFLAGS=$CPPFLAGS @@ -124,28 +127,6 @@ AC_ARG_ENABLE(thread, AC_HELP_STRING([--disable-thread], [Disable pygobject threading support]),, enable_thread=yes) -dnl Building documentation -AC_ARG_ENABLE(docs, - AC_HELP_STRING([--enable-docs], [Enable documentation building]),enable_docs=$enableval, - enable_docs=no) -if test "${enable_docs}" != no; then - dnl - dnl Check for xsltproc - dnl - AC_PATH_PROG([XSLTPROC], [xsltproc]) - if test -z "$XSLTPROC"; then - enable_docs=no - fi - - dnl check for DocBook DTD and stylesheets in the local catalog. - dnl JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN], - dnl [DocBook XML DTD V4.1.2],,enable_docs=no) - dnl JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl], - dnl [DocBook XSL Stylesheets],,enable_docs=no) -fi - -AM_CONDITIONAL(ENABLE_DOCS, test x$enable_docs != xno) - AM_CHECK_PYMOD(thread,,,enable_thread=check_for_py3_module) if test "x$enable_thread" = xcheck_for_py3_module; then dnl Python 3 uses the _thread module so check for that @@ -255,9 +236,6 @@ AC_CONFIG_FILES( Makefile pygobject-3.0.pc pygobject-3.0-uninstalled.pc - docs/Makefile - docs/reference/entities.docbook - docs/xsl/fixxref.py gi/Makefile gi/repository/Makefile gi/overrides/Makefile |