[Python-modules-commits] r2902 - /packages/pythonmagick/trunk/debian/patches/build-system.dpatch
azatoth-guest at users.alioth.debian.org
azatoth-guest at users.alioth.debian.org
Mon Jul 30 13:38:53 UTC 2007
Author: azatoth-guest
Date: Mon Jul 30 13:38:53 2007
New Revision: 2902
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2902
Log:
fix the build
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=2902&op=diff
==============================================================================
--- packages/pythonmagick/trunk/debian/patches/build-system.dpatch (original)
+++ packages/pythonmagick/trunk/debian/patches/build-system.dpatch Mon Jul 30 13:38:53 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 23:27:10.000000000 +0200
++++ pythonmagick/Makefile.am 2007-07-30 15:18:51.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 23:27:10.000000000 +0200
++++ pythonmagick/configure.ac 2007-07-30 15:18:51.000000000 +0200
@@ -0,0 +1,44 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
@@ -83,7 +83,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 23:27:10.000000000 +0200
++++ pythonmagick/helpers_src/Makefile.am 2007-07-30 15:18:51.000000000 +0200
@@ -0,0 +1,4 @@
+noinst_LTLIBRARIES = libhelper.la
+
@@ -91,7 +91,7 @@
+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 23:27:10.000000000 +0200
++++ pythonmagick/m4/ax_boost_python.m4 2007-07-30 15:18:51.000000000 +0200
@@ -0,0 +1,111 @@
+##### http://autoconf-archive.cryp.to/ax_boost_python.html
+#
@@ -206,8 +206,8 @@
+])
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 23:27:10.000000000 +0200
-@@ -0,0 +1,101 @@
++++ pythonmagick/m4/ax_python.m4 2007-07-30 15:38:03.000000000 +0200
+@@ -0,0 +1,68 @@
+##### http://autoconf-archive.cryp.to/ax_python.html
+#
+# SYNOPSIS
@@ -268,50 +268,17 @@
+# modified version as well.
+
+AC_DEFUN([AX_PYTHON],
-+[AC_MSG_CHECKING(for python build information)
-+AC_MSG_RESULT([])
-+for python in python2.5 python2.4 python2.3 python2.2 python2.1 python; do
-+AC_CHECK_PROGS(PYTHON_BIN, [$python])
-+ax_python_bin=$PYTHON_BIN
-+if test x$ax_python_bin != x; then
-+ AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
-+ AC_CHECK_HEADER([$ax_python_bin/Python.h],
-+ [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]],
-+ ax_python_header=no)
-+ if test $ax_python_lib != no; then
-+ if test $ax_python_header != no; then
-+ break;
-+ fi
-+ fi
-+fi
-+done
-+if test x$ax_python_bin = x; then
-+ ax_python_bin=no
-+fi
-+if test x$ax_python_header = x; then
-+ ax_python_header=no
-+fi
-+if test x$ax_python_lib = x; then
-+ ax_python_lib=no
-+fi
-+
-+AC_MSG_RESULT([ results of the Python check:])
-+AC_MSG_RESULT([ Binary: $ax_python_bin])
-+AC_MSG_RESULT([ Library: $ax_python_lib])
-+AC_MSG_RESULT([ Include Dir: $ax_python_header])
-+
-+if test x$ax_python_header != xno; then
-+ PYTHON_INCLUDE_DIR=$ax_python_header
-+ AC_SUBST(PYTHON_INCLUDE_DIR)
-+fi
-+if test x$ax_python_lib != xno; then
-+ PYTHON_LIB=$ax_python_lib
-+ AC_SUBST(PYTHON_LIB)
-+fi
++[AC_REQUIRE([AM_PATH_PYTHON])dnl
++ax_cv_python="python$am_cv_python_version"
++AC_CACHE_CHECK([for python include dir],
++ [ax_cv_python_includedir],
++ [ax_cv_python_includedir=`$ax_cv_python -c "from distutils import sysconfig; print sysconfig.get_python_inc()" 2>/dev/null || echo "${PYTHON_EXEC_PREFIX}/include/python${PYTHON_VERSION}"`''])
++AC_SUBST([PYTHON_INCLUDE_DIR], [$ax_cv_python_includedir])
++AC_SUBST([PYTHON_LIB], [$ax_cv_python])
+])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 23:34:00.000000000 +0200
++++ pythonmagick/pythonmagick_src/Makefile.am 2007-07-30 15:18:51.000000000 +0200
@@ -0,0 +1,84 @@
+noinst_LTLIBRARIES = libpymagick.la
+
More information about the Python-modules-commits
mailing list