|
Lines 1-6
Link Here
|
| 1 |
--- configure.ac.orig 2015-02-26 11:49:16 UTC |
1 |
--- configure.ac.orig 2015-07-08 15:59:11.366409238 -0700 |
| 2 |
+++ configure.ac |
2 |
+++ configure.ac 2015-07-08 17:11:06.119875987 -0700 |
| 3 |
@@ -111,7 +111,7 @@ then |
3 |
@@ -111,7 +111,7 @@ |
| 4 |
fi |
4 |
fi |
| 5 |
|
5 |
|
| 6 |
# Where to install .pc files. |
6 |
# Where to install .pc files. |
|
Lines 9-15
Link Here
|
| 9 |
AC_SUBST(pkgconfigdir) |
9 |
AC_SUBST(pkgconfigdir) |
| 10 |
|
10 |
|
| 11 |
# Check for standards compliance mode |
11 |
# Check for standards compliance mode |
| 12 |
@@ -1440,6 +1440,7 @@ if test "x$with_kstat" = "xyes" |
12 |
@@ -1440,6 +1440,7 @@ |
| 13 |
then |
13 |
then |
| 14 |
AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], []) |
14 |
AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], []) |
| 15 |
fi |
15 |
fi |
|
Lines 17-23
Link Here
|
| 17 |
if test "x$with_kstat" = "xyes" |
17 |
if test "x$with_kstat" = "xyes" |
| 18 |
then |
18 |
then |
| 19 |
AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], []) |
19 |
AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], []) |
| 20 |
@@ -1449,6 +1450,8 @@ if test "x$with_kstat" = "xyes" |
20 |
@@ -1449,6 +1450,8 @@ |
| 21 |
then |
21 |
then |
| 22 |
AC_DEFINE(HAVE_LIBKSTAT, 1, |
22 |
AC_DEFINE(HAVE_LIBKSTAT, 1, |
| 23 |
[Define to 1 if you have the 'kstat' library (-lkstat)]) |
23 |
[Define to 1 if you have the 'kstat' library (-lkstat)]) |
|
Lines 26-32
Link Here
|
| 26 |
fi |
26 |
fi |
| 27 |
AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes") |
27 |
AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes") |
| 28 |
AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes") |
28 |
AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes") |
| 29 |
@@ -3508,7 +3511,7 @@ fi |
29 |
@@ -3455,7 +3458,7 @@ |
|
|
30 |
if test "x$with_python" = "xyes" |
| 31 |
then |
| 32 |
AC_MSG_CHECKING([for Python CPPFLAGS]) |
| 33 |
- python_include_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_python_inc())" | "$with_python_prog" 2>&1` |
| 34 |
+ python_include_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_python_inc())" | "$with_python_prog" 2> /dev/null` |
| 35 |
python_config_status=$? |
| 36 |
|
| 37 |
if test "$python_config_status" -ne 0 || test "x$python_include_path" = "x" |
| 38 |
@@ -3478,7 +3481,7 @@ |
| 39 |
if test "x$with_python" = "xyes" |
| 40 |
then |
| 41 |
AC_MSG_CHECKING([for Python LDFLAGS]) |
| 42 |
- python_library_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0))" | "$with_python_prog" 2>&1` |
| 43 |
+ python_library_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0))" | "$with_python_prog" 2> /dev/null` |
| 44 |
python_config_status=$? |
| 45 |
|
| 46 |
if test "$python_config_status" -ne 0 || test "x$python_library_path" = "x" |
| 47 |
@@ -3493,7 +3496,7 @@ |
| 48 |
if test "x$with_python" = "xyes" |
| 49 |
then |
| 50 |
AC_MSG_CHECKING([for Python LIBS]) |
| 51 |
- python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1` |
| 52 |
+ python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2> /dev/null` |
| 53 |
python_config_status=$? |
| 54 |
|
| 55 |
if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x" |
| 56 |
@@ -3508,7 +3511,7 @@ |
| 30 |
if test "x$with_python" = "xyes" |
57 |
if test "x$with_python" = "xyes" |
| 31 |
then |
58 |
then |
| 32 |
LDFLAGS="-L$python_library_path $LDFLAGS" |
59 |
LDFLAGS="-L$python_library_path $LDFLAGS" |
|
Lines 35-41
Link Here
|
| 35 |
|
62 |
|
| 36 |
AC_CHECK_FUNC(PyObject_CallFunction, |
63 |
AC_CHECK_FUNC(PyObject_CallFunction, |
| 37 |
[with_python="yes"], |
64 |
[with_python="yes"], |
| 38 |
@@ -4415,7 +4418,7 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING( |
65 |
@@ -4415,7 +4418,7 @@ |
| 39 |
then |
66 |
then |
| 40 |
AC_MSG_NOTICE([Not checking for libvarnish: Manually configured]) |
67 |
AC_MSG_NOTICE([Not checking for libvarnish: Manually configured]) |
| 41 |
with_libvarnish_cflags="-I$withval/include" |
68 |
with_libvarnish_cflags="-I$withval/include" |