diff options
| author | Didier Raboud <odyx@debian.org> | 2016-01-06 12:33:02 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2014-06-15 16:42:46 +1000 |
| commit | 361b32cb517fcc214063880475b991c0e9aa660c (patch) | |
| tree | 8a0583d0191e1e11d28d638bf8b873c5a6c4d1d6 /configure.in | |
| parent | f1226f7126ab280868e2817699b6b3ee03567a52 (diff) | |
Imported Upstream version 3.15.2
Diffstat (limited to 'configure.in')
| -rwxr-xr-x | configure.in | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/configure.in b/configure.in index c2a77fec1..d5fb23644 100755 --- a/configure.in +++ b/configure.in @@ -26,7 +26,7 @@ # 104 = no libdl #AC_PREREQ(2.59) -AC_INIT([HP Linux Imaging and Printing], [3.14.6], [3.14.6], [hplip]) +AC_INIT([HP Linux Imaging and Printing], [3.15.2], [3.15.2], [hplip]) #AM_INIT_AUTOMAKE([1.9 foreign]) AM_INIT_AUTOMAKE AC_DISABLE_STATIC @@ -524,10 +524,13 @@ if test "$hpijs_only_build" = "no" && test "$lite_build" = "no" && test "$hpcups AC_ARG_VAR([PYTHON], [Python interpreter/compiler command]) AM_PATH_PYTHON([2.2]) AC_MSG_CHECKING([for path to Python.h]) - PYTHONINCLUDEDIR=`$PYTHON -c "from distutils.sysconfig import get_python_inc; print get_python_inc();"` - AC_MSG_RESULT("using $PYTHONINCLUDEDIR") + PYTHONINCLUDEDIR=`$PYTHON -c "from distutils.sysconfig import get_python_inc; print (get_python_inc());"` + AC_MSG_RESULT("using $PYTHONINCLUDEDIR .... python${PYTHON_VERSION}/Python.h") AC_ARG_VAR(PYTHONINCLUDEDIR, [path to Python.h C header file]) - AC_CHECK_HEADERS(python$PYTHON_VERSION/Python.h, ,[AC_MSG_ERROR([cannot find python-devel support], 6)]) + AC_CHECK_HEADERS([python${PYTHON_VERSION}/Python.h python${PYTHON_VERSION}mu/Python.h python${PYTHON_VERSION}m/Python.h ], + [FOUND_HEADER=yes; break;]) + AS_IF([test "x$FOUND_HEADER" != "xyes"], + [AC_MSG_ERROR([cannot find python-devel support], 6)]) fi if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then @@ -578,7 +581,7 @@ AC_DEFINE_DIR([abs_drvdir], [drvdir]) AC_SUBST(abs_datadir) AC_SUBST(abs_sbindir) AC_SUBST(abs_hpppddir) -AC_SUBST(abs_docdir) +AC_SUBST(abs_docdir) AC_SUBST(abs_htmldir) AC_SUBST(abs_ppddir) AC_SUBST(abs_drvdir) |