[Python-modules-commits] r2891 - in /packages/pythonmagick/trunk/debian: control patches/build-system.dpatch
azatoth-guest at users.alioth.debian.org
azatoth-guest at users.alioth.debian.org
Sun Jul 29 16:11:20 UTC 2007
Author: azatoth-guest
Date: Sun Jul 29 16:11:19 2007
New Revision: 2891
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2891
Log:
At last, It's alive\!
Modified:
packages/pythonmagick/trunk/debian/control
packages/pythonmagick/trunk/debian/patches/build-system.dpatch
Modified: packages/pythonmagick/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/pythonmagick/trunk/debian/control?rev=2891&op=diff
==============================================================================
--- packages/pythonmagick/trunk/debian/control (original)
+++ packages/pythonmagick/trunk/debian/control Sun Jul 29 16:11:19 2007
@@ -2,7 +2,7 @@
Section: python
Priority: extra
Maintainer: Carl Fürstenberg <azatoth at gmail.com>
-Build-Depends: cdbs, debhelper (>= 5), libmagick++9-dev, autoconf (>=2.61), automake(>= 1.10), libtool (>= 1.5), libboost-python-dev, dpatch, python-support, autoconf-archive (>= 20070512)
+Build-Depends: cdbs, debhelper (>= 5), libmagick++9-dev, autoconf (>=2.61), automake(>= 1.10), libtool (>= 1.5), libboost-python-dev, dpatch, python-support, autoconf-archive (>= 20070512), python2.5
Standards-Version: 3.7.2
Package: python-magick
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=2891&op=diff
==============================================================================
--- packages/pythonmagick/trunk/debian/patches/build-system.dpatch (original)
+++ packages/pythonmagick/trunk/debian/patches/build-system.dpatch Sun Jul 29 16:11:19 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 02:02:25.000000000 +0200
++++ pythonmagick/Makefile.am 2007-07-29 18:06:37.000000000 +0200
@@ -0,0 +1,24 @@
+# Library built from two directories
+SUBDIRS = pythonmagick_src helpers_src
@@ -28,14 +28,14 @@
+nodist_EXTRA__PythonMagick_la_SOURCES = dummy.cpp
+
+# Flags are always good to have
-+_PythonMagick_la_LDFLAGS = -avoid-version -module $(BOOST_LDFLAGS) -l$(BOOST_PYTHON_LIBS) $(MAGICKPP_LIBS) $(MAGICK_LIBS)
++_PythonMagick_la_LDFLAGS = -avoid-version -module $(BOOST_LDFLAGS) $(BOOST_PYTHON_LIBS) $(MAGICKPP_LIBS) $(MAGICK_LIBS) -l$(PYTHON_LIB)
+
+# And the libraries to include
+_PythonMagick_la_LIBADD = pythonmagick_src/libpymagick.la \
+ 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 02:02:25.000000000 +0200
++++ pythonmagick/configure.ac 2007-07-29 18:06:04.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 02:02:25.000000000 +0200
++++ pythonmagick/helpers_src/Makefile.am 2007-07-29 18:06:04.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 02:04:20.000000000 +0200
-@@ -0,0 +1,118 @@
++++ pythonmagick/m4/ax_boost_python.m4 2007-07-29 18:06:04.000000000 +0200
+@@ -0,0 +1,98 @@
+##### http://autoconf-archive.cryp.to/ax_boost_python.html
+#
+# SYNOPSIS
@@ -108,18 +108,19 @@
+# If the library is found, HAVE_BOOST_PYTHON is defined and
+# BOOST_PYTHON_LIB is set to the name of the library.
+#
-+# This macro calls AC_SUBST(BOOST_PYTHON_LIB).
++# This macro calls AC_SUBST(BOOST_PYTHON_LIBS).
+#
+# In order to ensure that the Python headers are specified on the
+# include path, this macro requires AX_PYTHON to be called.
+#
+# LAST MODIFICATION
+#
-+# 2005-05-20
++# 2007-07-29
+#
+# COPYLEFT
+#
+# Copyright (c) 2005 Michael Tindal <mtindal at paradoxpoint.com>
++# Copyright © 2007 Carl Fürstenberg <azatoth at gmail.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
@@ -152,67 +153,46 @@
+# modified version as well.
+
+AC_DEFUN([AX_BOOST_PYTHON],
-+ [AC_REQUIRE([AX_PYTHON])dnl
-+ AC_CACHE_CHECK(whether the Boost::Python library is available,
-+ ac_cv_boost_python,
-+ [AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ CPPFLAGS_SAVE=$CPPFLAGS
-+ if test x$PYTHON_INCLUDE_DIR != x; then
-+ CPPFLAGS=-I$PYTHON_INCLUDE_DIR $CPPFLAGS
-+ fi
-+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[
-+#include <boost/python/module.hpp>
-+ using namespace boost::python;
-+ BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]],
-+ [[return 0;]]),
-+ ac_cv_boost_python=yes, ac_cv_boost_python=no)
-+ AC_LANG_RESTORE
-+ CPPFLAGS=$CPPFLAGS_SAVE
-+ ])
-+ if test "$ac_cv_boost_python" = "yes"; then
-+ AC_DEFINE(HAVE_BOOST_PYTHON,,[define if the Boost::Python library is available])
-+ ax_python_lib=boost_python
-+ AC_ARG_WITH([boost-python],AS_HELP_STRING([--with-boost-python],[specify the boost python library to use]),
-+ [if test "x$with_boost_python" != "xno"; then
-+ ax_python_lib=$with_boost_python;
-+ fi],
-+ [for i in mt st gcc-mt gcc gcc41-mt gcc41 gcc42-mt gcc42; do
-+ ax_python_lib_extra="$ax_python_lib_extra $ax_python_lib-$i";
-+ done;
-+ ax_python_lib="$ax_python_lib $ax_python_lib_extra";])
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ CPPFLAGS_SAVE=$CPPFLAGS
-+ if test x$PYTHON_INCLUDE_DIR != x; then
-+ CPPFLAGS=-I$PYTHON_INCLUDE_DIR $CPPFLAGS
-+ fi
-+
-+ LIBS_SAVE=$LIBS
-+ for i in $ax_python_lib; do
-+ ax_var=AS_TR_SH(ax_$i);
-+ LIBS=-l$i
-+ AC_CACHE_CHECK([if $i is available], $ax_var, [AC_LINK_IFELSE([[
-+#include <boost/python/module.hpp>
-+ using namespace boost::python;
-+ BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]],
-+ ax_result=yes,
-+ ax_result=no)])
-+ AC_MSG_RESULT($ax_result)
-+ if test $ax_result = yes; then
-+ BOOST_PYTHON_LIBS= $LIBS;
-+ break;
-+ fi;
++[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]),
++ [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";
+ done;
-+ LIBS=$LIBS_SAVE
++ ax_python_lib="$ax_python_lib $ax_python_lib_extra"]
++)
++
++AS_VAR_PUSHDEF([ax_Search], [ax_cv_search])dnl
++AC_CACHE_CHECK([for Usable Boost::Python library], [ax_Search],
++[AC_LANG_PUSH([C++])
++ax_cv_search_save_CXXFLAGS=$CXXFLAGS
++CXXFLAGS="-I$PYTHON_INCLUDE_DIR $CXXFLAGS"
++ax_cv_search_save_LIBS=$LIBS
++for ax_current_lib in $ax_python_lib; do
++ ax_res=-l$ax_current_lib
++ LIBS="-l$ax_current_lib -l$PYTHON_LIB $ax_cv_search_save_LIBS"
++ AC_LINK_IFELSE([#include <boost/python/module.hpp>
++ using namespace boost::python;
++ BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }
++ int main() {return 0;}],
++ [AS_VAR_SET([ax_Search], [$ax_res])])
++ AS_VAR_SET_IF([ax_Search], [break])dnl
++done
++AS_VAR_SET_IF([ax_Search], , [AS_VAR_SET([ax_Search], [no])])
++LIBS=$ax_cv_search_save_LIBS
++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)
-+ fi
-+ AC_LANG_RESTORE
-+ CPPFLAGS=$CPPFLAGS_SAVE
-+ ])dnl
++ AC_DEFINE([HAVE_BOOST_PYTHON],,[define if the Boost::Python library is available])],
++ [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 02:02:25.000000000 +0200
++++ pythonmagick/m4/ax_python.m4 2007-07-29 18:06:04.000000000 +0200
@@ -0,0 +1,101 @@
+##### http://autoconf-archive.cryp.to/ax_python.html
+#
@@ -237,7 +217,7 @@
+#
+# LAST MODIFICATION
+#
-+# 2004-09-20
++# 2007-07-29
+#
+# COPYLEFT
+#
@@ -276,7 +256,7 @@
+AC_DEFUN([AX_PYTHON],
+[AC_MSG_CHECKING(for python build information)
+AC_MSG_RESULT([])
-+for python in python2.4 python2.3 python2.2 python2.1 python; do
++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
@@ -317,7 +297,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 02:02:25.000000000 +0200
++++ pythonmagick/pythonmagick_src/Makefile.am 2007-07-29 18:06:04.000000000 +0200
@@ -0,0 +1,71 @@
+noinst_LTLIBRARIES = libpymagick.la
+
More information about the Python-modules-commits
mailing list