[Pkg-ocaml-maint-commits] [SCM] camlimages packaging branch, master, updated. debian/3.0.1-5-14-g682d33e
Sylvain Le Gall
gildor at debian.org
Fri Jul 2 01:26:57 UTC 2010
The following commit has been merged in the master branch:
commit ad84cb806bad8c41e7dea7ab879df24f45c1e263
Author: Sylvain Le Gall <gildor at debian.org>
Date: Fri Jul 2 01:20:31 2010 +0200
Use the right invocation directly inside configure.ac
diff --git a/debian/patches/CleanSourceAndUseLocalM4 b/debian/patches/CleanSourceAndUseLocalM4
index 91e1dd8..c3b30bc 100644
--- a/debian/patches/CleanSourceAndUseLocalM4
+++ b/debian/patches/CleanSourceAndUseLocalM4
@@ -1,7 +1,7 @@
Index: camlimages/Makefile.in
===================================================================
---- camlimages.orig/Makefile.in 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/Makefile.in 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/Makefile.in 2010-07-02 01:11:47.000000000 +0200
++++ camlimages/Makefile.in 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -646,8 +646,8 @@ Index: camlimages/Makefile.in
.NOEXPORT:
Index: camlimages/aclocal.m4
===================================================================
---- camlimages.orig/aclocal.m4 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/aclocal.m4 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/aclocal.m4 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/aclocal.m4 2010-07-02 01:12:08.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
@@ -1383,16 +1383,15 @@ Index: camlimages/aclocal.m4
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-@@ -848,4 +949,4 @@
+@@ -848,4 +949,3 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-m4_include([../autoconf/ocaml.m4])
-+m4_include([m4/ocaml.m4])
Index: camlimages/configure
===================================================================
---- camlimages.orig/configure 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/configure 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/configure 2010-07-02 01:11:47.000000000 +0200
++++ camlimages/configure 2010-07-02 01:12:08.000000000 +0200
@@ -1,62 +1,85 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -12802,8 +12801,8 @@ Index: camlimages/configure
Index: camlimages/doc/Makefile.in
===================================================================
---- camlimages.orig/doc/Makefile.in 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/doc/Makefile.in 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/doc/Makefile.in 2010-07-02 01:11:47.000000000 +0200
++++ camlimages/doc/Makefile.in 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -13107,8 +13106,8 @@ Index: camlimages/doc/Makefile.in
.NOEXPORT:
Index: camlimages/examples/Makefile.in
===================================================================
---- camlimages.orig/examples/Makefile.in 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/examples/Makefile.in 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/examples/Makefile.in 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/Makefile.in 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -13615,8 +13614,8 @@ Index: camlimages/examples/Makefile.in
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: camlimages/examples/converter/Makefile.in
===================================================================
---- camlimages.orig/examples/converter/Makefile.in 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/examples/converter/Makefile.in 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/examples/converter/Makefile.in 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/converter/Makefile.in 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -13940,8 +13939,8 @@ Index: camlimages/examples/converter/Makefile.in
.NOEXPORT:
Index: camlimages/examples/crop/Makefile.in
===================================================================
---- camlimages.orig/examples/crop/Makefile.in 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/examples/crop/Makefile.in 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/examples/crop/Makefile.in 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/crop/Makefile.in 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -14265,8 +14264,8 @@ Index: camlimages/examples/crop/Makefile.in
.NOEXPORT:
Index: camlimages/examples/edgedetect/Makefile.in
===================================================================
---- camlimages.orig/examples/edgedetect/Makefile.in 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/examples/edgedetect/Makefile.in 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/examples/edgedetect/Makefile.in 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/edgedetect/Makefile.in 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -14590,8 +14589,8 @@ Index: camlimages/examples/edgedetect/Makefile.in
.NOEXPORT:
Index: camlimages/examples/gifanim/Makefile.in
===================================================================
---- camlimages.orig/examples/gifanim/Makefile.in 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/examples/gifanim/Makefile.in 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/examples/gifanim/Makefile.in 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/gifanim/Makefile.in 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -14915,8 +14914,8 @@ Index: camlimages/examples/gifanim/Makefile.in
.NOEXPORT:
Index: camlimages/examples/imgstat/Makefile.in
===================================================================
---- camlimages.orig/examples/imgstat/Makefile.in 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/examples/imgstat/Makefile.in 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/examples/imgstat/Makefile.in 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/imgstat/Makefile.in 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -15240,8 +15239,8 @@ Index: camlimages/examples/imgstat/Makefile.in
.NOEXPORT:
Index: camlimages/examples/liv/Makefile.in
===================================================================
---- camlimages.orig/examples/liv/Makefile.in 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/examples/liv/Makefile.in 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/examples/liv/Makefile.in 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/liv/Makefile.in 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -15565,8 +15564,8 @@ Index: camlimages/examples/liv/Makefile.in
.NOEXPORT:
Index: camlimages/examples/monochrome/Makefile.in
===================================================================
---- camlimages.orig/examples/monochrome/Makefile.in 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/examples/monochrome/Makefile.in 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/examples/monochrome/Makefile.in 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/monochrome/Makefile.in 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -15890,8 +15889,8 @@ Index: camlimages/examples/monochrome/Makefile.in
.NOEXPORT:
Index: camlimages/examples/normalize/Makefile.in
===================================================================
---- camlimages.orig/examples/normalize/Makefile.in 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/examples/normalize/Makefile.in 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/examples/normalize/Makefile.in 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/normalize/Makefile.in 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16215,8 +16214,8 @@ Index: camlimages/examples/normalize/Makefile.in
.NOEXPORT:
Index: camlimages/examples/resize/Makefile.in
===================================================================
---- camlimages.orig/examples/resize/Makefile.in 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/examples/resize/Makefile.in 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/examples/resize/Makefile.in 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/resize/Makefile.in 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16540,8 +16539,8 @@ Index: camlimages/examples/resize/Makefile.in
.NOEXPORT:
Index: camlimages/examples/tiffps/Makefile.in
===================================================================
---- camlimages.orig/examples/tiffps/Makefile.in 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/examples/tiffps/Makefile.in 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/examples/tiffps/Makefile.in 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/tiffps/Makefile.in 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16865,8 +16864,8 @@ Index: camlimages/examples/tiffps/Makefile.in
.NOEXPORT:
Index: camlimages/examples/ttfimg/Makefile.in
===================================================================
---- camlimages.orig/examples/ttfimg/Makefile.in 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/examples/ttfimg/Makefile.in 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/examples/ttfimg/Makefile.in 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/ttfimg/Makefile.in 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -17190,8 +17189,8 @@ Index: camlimages/examples/ttfimg/Makefile.in
.NOEXPORT:
Index: camlimages/src/Makefile.in
===================================================================
---- camlimages.orig/src/Makefile.in 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/src/Makefile.in 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/src/Makefile.in 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/src/Makefile.in 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -17600,8 +17599,8 @@ Index: camlimages/src/Makefile.in
.NOEXPORT:
Index: camlimages/test/Makefile.in
===================================================================
---- camlimages.orig/test/Makefile.in 2010-07-02 00:43:51.000000000 +0200
-+++ camlimages/test/Makefile.in 2010-07-02 00:44:12.000000000 +0200
+--- camlimages.orig/test/Makefile.in 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/test/Makefile.in 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -18040,8 +18039,8 @@ Index: camlimages/test/Makefile.in
.NOEXPORT:
Index: camlimages/Makefile
===================================================================
---- camlimages.orig/Makefile 2010-07-02 00:47:30.000000000 +0200
-+++ camlimages/Makefile 2010-07-02 00:47:53.000000000 +0200
+--- camlimages.orig/Makefile 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/Makefile 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -18751,8 +18750,8 @@ Index: camlimages/Makefile
.NOEXPORT:
Index: camlimages/doc/Makefile
===================================================================
---- camlimages.orig/doc/Makefile 2010-07-02 00:47:46.000000000 +0200
-+++ camlimages/doc/Makefile 2010-07-02 00:47:53.000000000 +0200
+--- camlimages.orig/doc/Makefile 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/doc/Makefile 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -19121,8 +19120,8 @@ Index: camlimages/doc/Makefile
.NOEXPORT:
Index: camlimages/examples/Makefile
===================================================================
---- camlimages.orig/examples/Makefile 2010-07-02 00:47:46.000000000 +0200
-+++ camlimages/examples/Makefile 2010-07-02 00:47:53.000000000 +0200
+--- camlimages.orig/examples/Makefile 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/Makefile 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -19694,8 +19693,8 @@ Index: camlimages/examples/Makefile
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: camlimages/examples/converter/Makefile
===================================================================
---- camlimages.orig/examples/converter/Makefile 2010-07-02 00:47:46.000000000 +0200
-+++ camlimages/examples/converter/Makefile 2010-07-02 00:47:53.000000000 +0200
+--- camlimages.orig/examples/converter/Makefile 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/converter/Makefile 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20085,8 +20084,8 @@ Index: camlimages/examples/converter/Makefile
.NOEXPORT:
Index: camlimages/examples/crop/Makefile
===================================================================
---- camlimages.orig/examples/crop/Makefile 2010-07-02 00:47:46.000000000 +0200
-+++ camlimages/examples/crop/Makefile 2010-07-02 00:47:53.000000000 +0200
+--- camlimages.orig/examples/crop/Makefile 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/crop/Makefile 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20476,8 +20475,8 @@ Index: camlimages/examples/crop/Makefile
.NOEXPORT:
Index: camlimages/examples/edgedetect/Makefile
===================================================================
---- camlimages.orig/examples/edgedetect/Makefile 2010-07-02 00:47:46.000000000 +0200
-+++ camlimages/examples/edgedetect/Makefile 2010-07-02 00:47:53.000000000 +0200
+--- camlimages.orig/examples/edgedetect/Makefile 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/edgedetect/Makefile 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20867,8 +20866,8 @@ Index: camlimages/examples/edgedetect/Makefile
.NOEXPORT:
Index: camlimages/examples/gifanim/Makefile
===================================================================
---- camlimages.orig/examples/gifanim/Makefile 2010-07-02 00:47:46.000000000 +0200
-+++ camlimages/examples/gifanim/Makefile 2010-07-02 00:47:53.000000000 +0200
+--- camlimages.orig/examples/gifanim/Makefile 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/gifanim/Makefile 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21258,8 +21257,8 @@ Index: camlimages/examples/gifanim/Makefile
.NOEXPORT:
Index: camlimages/examples/imgstat/Makefile
===================================================================
---- camlimages.orig/examples/imgstat/Makefile 2010-07-02 00:47:46.000000000 +0200
-+++ camlimages/examples/imgstat/Makefile 2010-07-02 00:47:53.000000000 +0200
+--- camlimages.orig/examples/imgstat/Makefile 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/imgstat/Makefile 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -21649,8 +21648,8 @@ Index: camlimages/examples/imgstat/Makefile
.NOEXPORT:
Index: camlimages/examples/liv/Makefile
===================================================================
---- camlimages.orig/examples/liv/Makefile 2010-07-02 00:47:46.000000000 +0200
-+++ camlimages/examples/liv/Makefile 2010-07-02 00:47:54.000000000 +0200
+--- camlimages.orig/examples/liv/Makefile 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/liv/Makefile 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -22040,8 +22039,8 @@ Index: camlimages/examples/liv/Makefile
.NOEXPORT:
Index: camlimages/examples/monochrome/Makefile
===================================================================
---- camlimages.orig/examples/monochrome/Makefile 2010-07-02 00:47:46.000000000 +0200
-+++ camlimages/examples/monochrome/Makefile 2010-07-02 00:47:54.000000000 +0200
+--- camlimages.orig/examples/monochrome/Makefile 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/monochrome/Makefile 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -22431,8 +22430,8 @@ Index: camlimages/examples/monochrome/Makefile
.NOEXPORT:
Index: camlimages/examples/normalize/Makefile
===================================================================
---- camlimages.orig/examples/normalize/Makefile 2010-07-02 00:47:46.000000000 +0200
-+++ camlimages/examples/normalize/Makefile 2010-07-02 00:47:54.000000000 +0200
+--- camlimages.orig/examples/normalize/Makefile 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/normalize/Makefile 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -22822,8 +22821,8 @@ Index: camlimages/examples/normalize/Makefile
.NOEXPORT:
Index: camlimages/examples/resize/Makefile
===================================================================
---- camlimages.orig/examples/resize/Makefile 2010-07-02 00:47:46.000000000 +0200
-+++ camlimages/examples/resize/Makefile 2010-07-02 00:47:54.000000000 +0200
+--- camlimages.orig/examples/resize/Makefile 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/resize/Makefile 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -23213,8 +23212,8 @@ Index: camlimages/examples/resize/Makefile
.NOEXPORT:
Index: camlimages/examples/tiffps/Makefile
===================================================================
---- camlimages.orig/examples/tiffps/Makefile 2010-07-02 00:47:46.000000000 +0200
-+++ camlimages/examples/tiffps/Makefile 2010-07-02 00:47:54.000000000 +0200
+--- camlimages.orig/examples/tiffps/Makefile 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/tiffps/Makefile 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -23604,8 +23603,8 @@ Index: camlimages/examples/tiffps/Makefile
.NOEXPORT:
Index: camlimages/examples/ttfimg/Makefile
===================================================================
---- camlimages.orig/examples/ttfimg/Makefile 2010-07-02 00:47:46.000000000 +0200
-+++ camlimages/examples/ttfimg/Makefile 2010-07-02 00:47:54.000000000 +0200
+--- camlimages.orig/examples/ttfimg/Makefile 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/examples/ttfimg/Makefile 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -23995,8 +23994,8 @@ Index: camlimages/examples/ttfimg/Makefile
.NOEXPORT:
Index: camlimages/src/Makefile
===================================================================
---- camlimages.orig/src/Makefile 2010-07-02 00:47:46.000000000 +0200
-+++ camlimages/src/Makefile 2010-07-02 00:47:53.000000000 +0200
+--- camlimages.orig/src/Makefile 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/src/Makefile 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -24470,8 +24469,8 @@ Index: camlimages/src/Makefile
.NOEXPORT:
Index: camlimages/test/Makefile
===================================================================
---- camlimages.orig/test/Makefile 2010-07-02 00:47:46.000000000 +0200
-+++ camlimages/test/Makefile 2010-07-02 00:47:53.000000000 +0200
+--- camlimages.orig/test/Makefile 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/test/Makefile 2010-07-02 01:12:08.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -24973,3 +24972,296 @@ Index: camlimages/test/Makefile
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+Index: camlimages/configure.ac
+===================================================================
+--- camlimages.orig/configure.ac 2010-07-02 01:11:46.000000000 +0200
++++ camlimages/configure.ac 2010-07-02 01:12:08.000000000 +0200
+@@ -1,3 +1,4 @@
++m4_include([ocaml.m4])
+ # Process this file with autoconf to produce a configure script.
+ AC_PREREQ(2.59)
+ AC_INIT(camlimages, 3.0.2, jun.furuse at gmail.com)
+Index: camlimages/ocaml.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ camlimages/ocaml.m4 2010-07-02 01:11:46.000000000 +0200
+@@ -0,0 +1,279 @@
++# OCaml macros for autoconf
++#
++# Guillaume Rousse <Guillaume.Rousse at inria.fr>
++# inspired by previous work from:
++# Georges Mariano
++# Jean-Christophe Filliâtre
++# Olivier Andrieu
++# Grigory Batalov
++
++
++# AC_PROG_OCAML([MINIMUM VERSION])
++# --------------------------------
++# check OCaml base system, and set the following variables:
++# OCAMLC OCaml compiler
++# OCAMLOPT OCaml native compiler
++# OCAMLDEP OCaml dependency generator
++# OCAMLLIB OCaml library path
++# OCAMLVERSION OCaml version number
++# Unless --disable-opt is set by user, optimized versions are used by default.
++# Fails if no compiler is found.
++AC_DEFUN([AC_PROG_OCAML], [
++
++ # allow the user to disable the use of optimized versions
++ AC_ARG_ENABLE(
++ [native-tools],
++ AC_HELP_STRING(
++ [--enable-native-tools],
++ [use native versions of ocaml tools (default)]
++ ),
++ [case "$enableval" in
++ yes) ac_ocaml_enable_native_tools=$enableval;;
++ no) ac_ocaml_enable_native_tools=$enableval;;
++ *) AC_MSG_ERROR([bad value $enableval for --enable-native-tools]);;
++ esac],
++ [ac_ocaml_enable_native_tools=yes]
++ )
++
++ # Checking for OCaml compiler
++ _AC_OCAML_PATH_PROG_FATAL(OCAMLC, ocamlc)
++
++ # Checking for OCaml version
++ AC_CACHE_CHECK(
++ [for OCaml version],
++ [ac_cv_ocaml_version],
++ [ac_cv_ocaml_version=`$OCAMLC -version`]
++ )
++ OCAMLVERSION=$ac_cv_ocaml_version
++
++ if test -n ["$1"]; then
++ ac_ocaml_min_version=["$1"];
++ # Checking for OCaml minimum version
++ AC_CACHE_CHECK(
++ [whether OCaml version >= $ac_ocaml_min_version],
++ [ac_cv_ocaml_version_enough],
++ [
++ ac_ocaml_min_major_version=`echo $ac_ocaml_min_version \
++ | cut -d. -f1`
++ ac_ocaml_min_minor_version=`echo $ac_ocaml_min_version \
++ | cut -d. -f2`
++ ac_ocaml_min_micro_version=`echo $ac_ocaml_min_version \
++ | cut -d. -f3`
++ ac_ocaml_major_version=`echo ${OCAMLVERSION%%+*} | cut -d. -f1`
++ ac_ocaml_minor_version=`echo ${OCAMLVERSION%%+*} | cut -d. -f2`
++ ac_ocaml_micro_version=`echo ${OCAMLVERSION%%+*} | cut -d. -f3`
++
++ if expr \
++ \( \
++ ${ac_ocaml_major_version:-0} \> \
++ ${ac_ocaml_min_major_version:-0} \
++ \) \| \
++ \( \
++ ${ac_ocaml_major_version:-0} \= \
++ ${ac_ocaml_min_major_version:-0} \& \
++ ${ac_ocaml_minor_version:-0} \> \
++ ${ac_ocaml_min_minor_version:-0} \
++ \) \| \
++ \( \
++ ${ac_ocaml_major_version:-0} \= \
++ ${ac_ocaml_min_major_version:-0} \& \
++ ${ac_ocaml_minor_version:-0} \= \
++ ${ac_ocaml_min_minor_version:-0} \& \
++ ${ac_ocaml_micro_version:-0} \>= \
++ ${ac_ocaml_min_micro_version:-0} \
++ \) > /dev/null; then
++ ac_cv_ocaml_version_enough=yes
++ else
++ ac_cv_ocaml_version_enough=no
++ fi
++ ]
++ )
++
++ if test "$ac_cv_ocaml_version_enough" = "no"; then
++ AC_MSG_ERROR([OCaml version unsufficient])
++ fi
++ fi
++
++ # Checking for OCaml library path
++ AC_CACHE_CHECK(
++ [for OCaml library path],
++ [ac_cv_ocaml_library_path],
++ [ac_cv_ocaml_library_path=`$OCAMLC -where`]
++ )
++ OCAMLLIB=$ac_cv_ocaml_library_path
++
++ if test "$ac_ocaml_enable_native_tools" = "yes"; then
++ # Checking for ocamlc.opt
++ _AC_OCAML_PATH_PROG_NONFATAL(OCAMLC_OPT, ocamlc.opt)
++ if test -n "$OCAMLC_OPT"; then
++ _AC_OCAML_CHECK_VERSION_NONFATAL(OCAMLC_OPT, ocamlc.opt)
++ fi
++ if test -n "$OCAMLC_OPT"; then
++ OCAMLC=$OCAMLC_OPT
++ fi
++ fi
++
++ # Checking for OCaml native compiler
++ _AC_OCAML_PATH_PROG_NONFATAL(OCAMLOPT, ocamlopt, [Cannot find ocamlopt; bytecode compilation only])
++ if test -n "$OCAMLOPT"; then
++ _AC_OCAML_CHECK_VERSION_NONFATAL(OCAMLOPT, ocamlopt)
++ fi
++ if test -n "$OCAMLOPT"; then
++ AC_CACHE_CHECK(
++ [if OCaml C compiler works],
++ [ac_cv_ocaml_c_compiler_works],
++ [
++ touch conftest.c
++ if $OCAMLC conftest.c >/dev/null 2>&1; then
++ ac_cv_ocaml_c_compiler_works=yes
++ else
++ ac_cv_ocaml_c_compiler_works=no
++ fi
++ rm -f conftest.c
++ ]
++ )
++
++ if test "$ac_cv_ocaml_c_compiler_works" = "no"; then
++ AC_MSG_WARN([bytecode compilation only])
++ unset OCAMLOPT
++ fi
++ fi
++
++ if test "$ac_ocaml_enable_native_tools" = "yes"; then
++ # Checking for ocamlopt.opt
++ _AC_OCAML_PATH_PROG_NONFATAL(OCAMLOPT_OPT, ocamlopt.opt)
++ if test -n "$OCAMLOPT_OPT"; then
++ _AC_OCAML_CHECK_VERSION_NONFATAL(OCAMLOPT_OPT, ocamlopt.opt)
++ fi
++ if test -n "$OCAMLOPT_OPT"; then
++ OCAMLOPT=$OCAMLOPT_OPT
++ fi
++ fi
++
++ # Checking for ocamldep
++ _AC_OCAML_PATH_PROG_NONFATAL(OCAMLDEP, ocamldep)
++
++ if test "$ac_ocaml_enable_native_tools" = "yes"; then
++ # Checking for ocamldep.opt
++ _AC_OCAML_PATH_PROG_NONFATAL(OCAMLDEP_OPT, ocamldep.opt)
++ if test -n "$OCAMLDEP_OPT"; then
++ OCAMLDEP=$OCAMLDEP_OPT
++ fi
++ fi
++
++ AC_ARG_VAR([OCAMLCFLAGS], [Ocaml compiler flags [none]])
++
++]) # AC_PROG_OCAML
++
++# AC_PROG_OCAML_TOOL(VARIABLE, PROGRAM)
++# ---------------------
++# check some additional OCaml tool, and set VARIABLE to PROGRAM if found.
++# Unless --disable-opt is set by user, optimized versions is used by default.
++AC_DEFUN([AC_PROG_OCAML_TOOL], [
++ AC_REQUIRE([AC_PROG_OCAML])
++
++ # Checking for bytecode version
++ _AC_OCAML_PATH_PROG_NONFATAL([$1], [$2])
++
++ if test "$ac_ocaml_enable_native_tools" = "yes"; then
++ # Checking for binary version, using AC_PATH_PROG directly
++ # to avoid warnings
++ AC_PATH_PROG([$1]_OPT, [$2].opt)
++ if test -n "[$$1]_OPT"; then
++ [$1]=[$$1]_OPT
++ fi
++ fi
++]) # AC_PROG_OCAML_TOOL
++
++# AC_PROG_CAMLP4
++# --------------
++# Check CamlP4 and set the following variables:
++# CAMLP4 camlp4
++# CAMLP4O camlp4o
++# CAMLP4R camlp4r
++# CAMLP4LIB parser library path
++# Fails if camlp4 is not found
++AC_DEFUN([AC_PROG_CAMLP4], [
++ AC_REQUIRE([AC_PROG_OCAML])
++
++ # Checking for camlp4
++ _AC_OCAML_PATH_PROG_FATAL(CAMLP4, camlp4)
++ _AC_OCAML_CHECK_VERSION_FATAL(CAMLP4, camlp4)
++
++ # Checking for Camlp4o
++ _AC_OCAML_PATH_PROG_NONFATAL(CAMLP4O, camlp4o)
++
++ # Checking for Camlp4r
++ _AC_OCAML_PATH_PROG_NONFATAL(CAMLP4R, camlp4r)
++
++ # Searching for parser library path
++ AC_MSG_CHECKING([for CamlP4 library path])
++ CAMLP4LIB=`$CAMLP4 -where`
++ AC_MSG_RESULT([$CAMLP4LIB])
++
++]) # AC_PROG_CAMLP4
++
++# _AC_OCAML_PATH_PROG_FATAL(VARIABLE, PROGRAM, [MESSAGE])
++# -------------------------------------------------------
++# wraps AC_PATH_PROG, issuing an error if PROGRAM
++# is not found, otherwise affects its path to VARIABLE
++AC_DEFUN([_AC_OCAML_PATH_PROG_FATAL], [
++ AC_PATH_PROG([$1], [$2])
++ if test -z "[$$1]"; then
++ AC_MSG_ERROR([m4_default([$3], [Cannot find [$2]])])
++ fi
++]) # _AC_OCAML_PATH_PROG_FATAL
++
++# _AC_OCAML_PATH_PROG_NONFATAL(VARIABLE, PROGRAM, [MESSAGE])
++# ----------------------------------------------------------
++# wraps AC_PATH_PROG, issuing a warning if PROGRAM
++# is not found, otherwise affects its path to VARIABLE
++AC_DEFUN([_AC_OCAML_PATH_PROG_NONFATAL], [
++ AC_PATH_PROG([$1], [$2])
++ if test -z "[$$1]"; then
++ AC_MSG_WARN([m4_default([$3], [Cannot find [$2]])])
++ fi
++]) # _AC_OCAML_PATH_PROG_NONFATAL
++
++# _AC_OCAML_CHECK_VERSION(VARIABLE, PROGRAM)
++# ------------------------------------------
++# check than PROGRAM version is the same as the OCaml compiler,
++# otherwise unset VARIABLE
++AC_DEFUN([_AC_OCAML_CHECK_VERSION], [
++ AC_CACHE_CHECK(
++ [wether [$2] version = $OCAMLVERSION],
++ [ac_cv_ocaml_[$1]_version_ok],
++ [
++ ac_ocaml_[$1]_version=`$[$1] -version`
++ if test "$ac_ocaml_[$1]_version" = "$OCAMLVERSION"; then
++ ac_cv_ocaml_[$1]_version_ok=yes
++ else
++ ac_cv_ocaml_[$1]_version_ok=no
++ fi
++ ]
++ )
++
++ if test "$ac_cv_ocaml_[$1]_version_ok" = "no"; then
++ unset [$1]
++ fi
++]) # _AC_OCAML_CHECK_VERSION
++
++# _AC_OCAML_CHECK_VERSION_NONFATAL(VARIABLE, PROGRAM)
++# ------------------------------------------
++# wraps _AC_OCAML_CHECK_VERSION, issuing a warning if it fails
++AC_DEFUN([_AC_OCAML_CHECK_VERSION_NONFATAL], [
++ _AC_OCAML_CHECK_VERSION([$1], [$2])
++ if test -z ["$$1"]; then
++ AC_MSG_WARN([[$2] version differs from ocamlc, discarding])
++ fi
++]) # _AC_OCAML_CHECK_VERSION_NONFATAL
++
++# _AC_OCAML_CHECK_VERSION_FATAL(VARIABLE, PROGRAM)
++# ------------------------------------------
++# wraps _AC_OCAML_CHECK_VERSION, issuing an error if it fails
++AC_DEFUN([_AC_OCAML_CHECK_VERSION_FATAL], [
++ _AC_OCAML_CHECK_VERSION([$1], [$2])
++ if test -z ["$$1"]; then
++ AC_MSG_ERROR([[$2] version differs from ocamlc, aborting])
++ fi
++]) # _AC_OCAML_CHECK_VERSION_FATAL
--
camlimages packaging
More information about the Pkg-ocaml-maint-commits
mailing list