search for: python_includedir

...2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index c809741..0aa1716 100644 --- a/configure.ac +++ b/configure.ac @@ -1106,7 +1106,6 @@ AM_CONDITIONAL([HAVE_PERL], dnl Check for Python (optional, for Python bindings). PYTHON_PREFIX= PYTHON_VERSION= -PYTHON_INCLUDEDIR= PYTHON_INSTALLDIR= AC_ARG_ENABLE([python], @@ -1117,23 +1116,30 @@ AS_IF([test "x$enable_python" != "xno"],[ AC_CHECK_PROG([PYTHON],[python],[python],[no]) if test "x$PYTHON" != "xno"; then - AC_MSG_CHECKING([Python prefix]) - P...

On Thu, May 16, Hilko Bengen wrote: > AC_MSG_RESULT([$PYTHON_VERSION]) > - > - AC_MSG_CHECKING([for Python include path]) > - if test -z "$PYTHON_INCLUDEDIR"; then > - python_path=`$PYTHON -c "import distutils.sysconfig; \ > - print (distutils.sysconfig.get_python_inc ());"` > - PYTHON_INCLUDEDIR=$python_path > - fi > - AC_MSG_RESULT([$PYTHON_INCLUDEDI...

Building against multiple versions of Python is a lot of fun as it is. Add autoconf/automake/libtool (and possible distribution-specific stuff) to the mix and things get really interesting: On Debian and Ubuntu, building against python 3.3 requires an extra include path as documented in <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=692387>. As discussed in

On Sun, Jun 16, 2013 at 02:55:29PM +0200, Olaf Hering wrote: > On Thu, May 16, Hilko Bengen wrote: > > > AC_MSG_RESULT([$PYTHON_VERSION]) > > - > > - AC_MSG_CHECKING([for Python include path]) > > - if test -z "$PYTHON_INCLUDEDIR"; then > > - python_path=`$PYTHON -c "import distutils.sysconfig; \ > > - print (distutils.sysconfig.get_python_inc ());"` > > - PYTHON_INCLUDEDIR=$python_path > > - fi > > - AC_MSG_...

...-------------------------------- 1 files changed, 12 insertions(+), 34 deletions(-) diff --git a/configure.ac b/configure.ac index b82a841..5805ddd 100644 --- a/configure.ac +++ b/configure.ac @@ -232,47 +232,25 @@ AC_CHECK_PROG([PYTHON],[python],[python],[no]) PYTHON_PREFIX= PYTHON_VERSION= -PYTHON_INCLUDEDIR= -PYTHON_SITE_PACKAGES= if test "x$PYTHON" != "xno"; then PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"` PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"` - for d in \ - $PYTHON_PREFIX/include/python$PYTHON_V...

...VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"` + PYTHON_PREFIX=`$PYTHON -c "import sys; print(sys.prefix)"` + PYTHON_VERSION=`$PYTHON -c "import sys; print(sys.version[[0:3]])"` AC_MSG_CHECKING([for Python include path]) if test -z "$PYTHON_INCLUDEDIR"; then -- 1.7.5.4

From: Jim Meyering <meyering at redhat.com> * lib/hivex.c (hivex_node_set_value): Remove unnecessary test-before-free. --- lib/hivex.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/lib/hivex.c b/lib/hivex.c index d042f4f..a72fa77 100644 --- a/lib/hivex.c +++ b/lib/hivex.c @@ -2748,8 +2748,7 @@ hivex_node_set_value (hive_h *h, hive_node_h node, leave_partial:

...ython/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am index 8599863..89e66f8 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -36,6 +36,7 @@ libhivexmod_la_SOURCES = hivex-py.c libhivexmod_la_CFLAGS = -Wall -I$(PYTHON_INCLUDEDIR) \ -I$(top_srcdir)/lib -I$(top_builddir)/lib libhivexmod_la_LIBADD = $(top_builddir)/lib/libhivex.la +libhivexmod_la_LDFLAGS = -avoid-version -shared TESTS_ENVIRONMENT = \ PYTHONPATH=$(builddir):$(builddir)/.libs -- 1.7.5.4

...nged, 1 insertions(+), 1 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am index 5884762..82960d6 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -43,7 +43,7 @@ libguestfsmod_la_SOURCES = guestfs-py.c guestfs-py.h guestfs-py-byhand.c libguestfsmod_la_CFLAGS = -Wall -I$(PYTHON_INCLUDEDIR) \ -I$(top_srcdir)/src -I$(top_builddir)/src libguestfsmod_la_LIBADD = $(top_builddir)/src/libguestfs.la -libguestfsmod_la_LDFLAGS = -avoid-version +libguestfsmod_la_LDFLAGS = -avoid-version -shared TESTS_ENVIRONMENT = \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ -- 1.7.5.4

...| 4 ++-- 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 8651c7b..33c09db 100644 --- a/configure.ac +++ b/configure.ac @@ -312,8 +312,19 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"]) dnl Check for Ruby and rake (optional, for Ruby bindings). -AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0]) -AC_CHECK_PROG([RAKE],[rake],[rake],[no]) +AC_ARG_ENABLE([ruby], + AS_HE...

...n/Makefile.am +++ b/python/Makefile.am @@ -41,7 +41,7 @@ python_LTLIBRARIES = libguestfsmod.la libguestfsmod_la_SOURCES = guestfs-py.c guestfs-py.h guestfs-py-byhand.c libguestfsmod_la_CFLAGS = \ - -DGUESTFS_PRIVATE_FUNCTIONS=1 \ + -DGUESTFS_PRIVATE=1 \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ -I$(PYTHON_INCLUDEDIR) \ -I$(top_srcdir)/src -I$(top_builddir)/src diff --git a/ruby/ext/guestfs/extconf.rb.in b/ruby/ext/guestfs/extconf.rb.in index 15259ea..269ca81 100644 --- a/ruby/ext/guestfs/extconf.rb.in +++ b/ruby/ext/guestfs/extconf.rb.in @@ -30,7 +30,7 @@ unless have_library("guestfs", "guestf...

...nocompress option. To build the supermin appliance, you need to upgrade to the latest @@ -351,11 +351,11 @@ if test "x$PYTHON" != "xno"; then do AC_MSG_CHECKING([Python.h in $d]) if test -r "$d/Python.h"; then - AC_MSG_RESULT([found]) - PYTHON_INCLUDEDIR=$d - break - fi - AC_MSG_RESULT([not found]) + AC_MSG_RESULT([found]) + PYTHON_INCLUDEDIR=$d + break + fi + AC_MSG_RESULT([not found]) done for d in \ $PYTHON_PREFIX/lib64/python$PYTHON_VERSION/site-packages \ @@ -366,11 +366,11...