[Python-modules-commits] r2892 - /packages/pythonmagick/trunk/debian/patches/build-system.dpatch

[azatoth-guest at users.alioth.debian.org]

Author: azatoth-guest
Date: Sun Jul 29 17:43:12 2007
New Revision: 2892

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2892
Log:
added the header only check also

Modified:
    packages/pythonmagick/trunk/debian/patches/build-system.dpatch

Modified: packages/pythonmagick/trunk/debian/patches/build-system.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/pythonmagick/trunk/debian/patches/build-system.dpatch?rev=2892&op=diff
==============================================================================
--- packages/pythonmagick/trunk/debian/patches/build-system.dpatch (original)
+++ packages/pythonmagick/trunk/debian/patches/build-system.dpatch Sun Jul 29 17:43:12 2007
@@ -7,7 +7,7 @@
 @DPATCH@
 diff -urNad pythonmagick~/Makefile.am pythonmagick/Makefile.am
 --- pythonmagick~/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ pythonmagick/Makefile.am	2007-07-29 18:06:37.000000000 +0200
++++ pythonmagick/Makefile.am	2007-07-29 19:41:05.000000000 +0200
 @@ -0,0 +1,24 @@
 +# Library built from two directories
 +SUBDIRS = pythonmagick_src helpers_src
@@ -35,7 +35,7 @@
 +								  helpers_src/libhelper.la
 diff -urNad pythonmagick~/configure.ac pythonmagick/configure.ac
 --- pythonmagick~/configure.ac	1970-01-01 01:00:00.000000000 +0100
-+++ pythonmagick/configure.ac	2007-07-29 18:06:04.000000000 +0200
++++ pythonmagick/configure.ac	2007-07-29 19:41:05.000000000 +0200
 @@ -0,0 +1,42 @@
 +#                                               -*- Autoconf -*-
 +# Process this file with autoconf to produce a configure script.
@@ -81,7 +81,7 @@
 +AC_OUTPUT
 diff -urNad pythonmagick~/helpers_src/Makefile.am pythonmagick/helpers_src/Makefile.am
 --- pythonmagick~/helpers_src/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ pythonmagick/helpers_src/Makefile.am	2007-07-29 18:06:04.000000000 +0200
++++ pythonmagick/helpers_src/Makefile.am	2007-07-29 19:41:05.000000000 +0200
 @@ -0,0 +1,5 @@
 +noinst_LTLIBRARIES = libhelper.la
 +
@@ -90,8 +90,8 @@
 +libhelper_la_CXXFLAGS = $(MAGICKPP_CFLAGS)
 diff -urNad pythonmagick~/m4/ax_boost_python.m4 pythonmagick/m4/ax_boost_python.m4
 --- pythonmagick~/m4/ax_boost_python.m4	1970-01-01 01:00:00.000000000 +0100
-+++ pythonmagick/m4/ax_boost_python.m4	2007-07-29 18:06:04.000000000 +0200
-@@ -0,0 +1,98 @@
++++ pythonmagick/m4/ax_boost_python.m4	2007-07-29 19:42:46.000000000 +0200
+@@ -0,0 +1,111 @@
 +##### http://autoconf-archive.cryp.to/ax_boost_python.html
 +#
 +# SYNOPSIS
@@ -154,11 +154,24 @@
 +
 +AC_DEFUN([AX_BOOST_PYTHON],
 +[AC_REQUIRE([AX_PYTHON])dnl
-+ax_python_lib=boost_python
-+AC_ARG_WITH([boost-python],AS_HELP_STRING([--with-boost-python],[specify the boost python library to use]),
++AS_VAR_PUSHDEF([ax_BoostPython], [ax_cv_boost_python])dnl
++AC_LANG_PUSH([C++])
++ax_cv_boost_python_save_CPPFLAGS=$CPPFLAGS
++CPPFLAGS="-I$PYTHON_INCLUDE_DIR $CPPFLAGS"
++AC_CHECK_HEADER([boost/python.hpp],
++	[AC_DEFINE([HAVE_BOOST_PYTHON],,[define if the Boost::Python library is available])]
++)
++CPPFLAGS=$ax_cv_boost_python_save_CPPFLAGS
++AC_LANG_POP([C++])
++BN=boost_python
++AC_ARG_WITH(
++	[boost-python],
++	[AS_HELP_STRING([--with-boost-python],[specify the boost python library to use])],
 +	[ax_python_lib=$withval],
-+	[for suffix in mt st gcc-mt gcc gcc41-mt gcc41 gcc42-mt gcc42; do
-+		ax_python_lib_extra="$ax_python_lib_extra $ax_python_lib-$suffix";
++	[for ax_lib in $BN $BN-mt $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
++				lib$BN lib$BN-mt lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
++				$BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s; do
++		ax_python_lib="$ax_python_lib $ax_lib";
 +	done;
 +	ax_python_lib="$ax_python_lib $ax_python_lib_extra"]
 +)
@@ -181,18 +194,18 @@
 +done
 +AS_VAR_SET_IF([ax_Search], , [AS_VAR_SET([ax_Search], [no])])
 +LIBS=$ax_cv_search_save_LIBS
++CXXFLAGS=$ax_cv_search_save_CXXFLAGS
 +AC_LANG_POP([C++])])
 +ax_res=AS_VAR_GET([ax_Search])
 +AS_IF([test "$ax_res" != "no"],
 +	[BOOST_PYTHON_LIBS="$ax_res"
-+	AC_SUBST(BOOST_PYTHON_LIBS)
-+	AC_DEFINE([HAVE_BOOST_PYTHON],,[define if the Boost::Python library is available])],
++	AC_SUBST(BOOST_PYTHON_LIBS)],
 +	[AS_WARN([No suitable Boost::Python library found])])dnl
 +AS_VAR_POPDEF([ax_Search])dnl
 +])
 diff -urNad pythonmagick~/m4/ax_python.m4 pythonmagick/m4/ax_python.m4
 --- pythonmagick~/m4/ax_python.m4	1970-01-01 01:00:00.000000000 +0100
-+++ pythonmagick/m4/ax_python.m4	2007-07-29 18:06:04.000000000 +0200
++++ pythonmagick/m4/ax_python.m4	2007-07-29 19:41:05.000000000 +0200
 @@ -0,0 +1,101 @@
 +##### http://autoconf-archive.cryp.to/ax_python.html
 +#
@@ -297,7 +310,7 @@
 +])dnl
 diff -urNad pythonmagick~/pythonmagick_src/Makefile.am pythonmagick/pythonmagick_src/Makefile.am
 --- pythonmagick~/pythonmagick_src/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ pythonmagick/pythonmagick_src/Makefile.am	2007-07-29 18:06:04.000000000 +0200
++++ pythonmagick/pythonmagick_src/Makefile.am	2007-07-29 19:41:05.000000000 +0200
 @@ -0,0 +1,71 @@
 +noinst_LTLIBRARIES = libpymagick.la
 +