[Pkg-ocaml-maint-commits] [SCM] ocaml-bitstring packaging branch, master, updated. debian/2.0.0-2

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 6f982df00297ec5bba15861cf7373a844635d996
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sat Jul 4 21:05:17 2009 +0000

    Fix camlp4of.opt detection in configure

diff --git a/debian/changelog b/debian/changelog
index 0a4f174..3d799c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-bitstring (2.0.0-2) unstable; urgency=low
+
+  * Fix camlp4of.opt detection in configure
+
+ -- Sylvain Le Gall <gildor at debian.org>  Sat, 04 Jul 2009 21:03:45 +0000
+
 ocaml-bitstring (2.0.0-1) unstable; urgency=low
 
   * Add debian/gbp.conf to force using pristine-tar
diff --git a/debian/patches/no-camlp4of-opt.patch b/debian/patches/no-camlp4of-opt.patch
new file mode 100644
index 0000000..377a008
--- /dev/null
+++ b/debian/patches/no-camlp4of-opt.patch
@@ -0,0 +1,20 @@
+Index: ocaml-bitstring/configure.ac
+===================================================================
+--- ocaml-bitstring.orig/configure.ac	2009-07-04 20:52:47.000000000 +0000
++++ ocaml-bitstring/configure.ac	2009-07-04 20:56:45.000000000 +0000
+@@ -59,9 +59,13 @@
+ fi
+ 
+ dnl Check for camlp4
+-AC_CHECK_PROG(CAMLP4OF,camlp4of.opt,camlp4of.opt,no)
++AC_CHECK_PROG(CAMLP4OF,camlp4of,camlp4of,no)
++AC_CHECK_PROG(CAMLP4OFOPT,camlp4of.opt,camlp4of.opt,no)
++if ! test "x$CAMLP4OFOPT" = "xno"; then
++  CAMLP4OF=$CAMLP4OFOPT
++fi
+ if test "x$CAMLP4OF" = "xno"; then
+-    AC_MSG_ERROR([You must have camlp4 installed])
++  AC_MSG_ERROR([You must have camlp4 installed])
+ fi
+ 
+ dnl Check for Extlib (optional)
diff --git a/debian/patches/series b/debian/patches/series
index 4e6aa30..ddc2975 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
+no-camlp4of-opt.patch
 add_dynlink.patch
 01-byte-compilation.dpatch
+update-configure.patch
diff --git a/debian/patches/update-configure.patch b/debian/patches/update-configure.patch
new file mode 100644
index 0000000..85f1a3a
--- /dev/null
+++ b/debian/patches/update-configure.patch
@@ -0,0 +1,83 @@
+Index: ocaml-bitstring/configure
+===================================================================
+--- ocaml-bitstring.orig/configure	2009-07-04 20:52:47.000000000 +0000
++++ ocaml-bitstring/configure	2009-07-04 20:57:41.000000000 +0000
+@@ -643,6 +643,7 @@
+ TIME
+ pkg_cil
+ pkg_extlib
++CAMLP4OFOPT
+ CAMLP4OF
+ OCAMLFIND
+ OCAMLLIB
+@@ -4609,8 +4610,8 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-# Extract the first word of "camlp4of.opt", so it can be a program name with args.
+-set dummy camlp4of.opt; ac_word=$2
++# Extract the first word of "camlp4of", so it can be a program name with args.
++set dummy camlp4of; ac_word=$2
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_CAMLP4OF+set}" = set; then
+@@ -4626,7 +4627,7 @@
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_CAMLP4OF="camlp4of.opt"
++    ac_cv_prog_CAMLP4OF="camlp4of"
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -4647,8 +4648,49 @@
+ fi
+ 
+ 
++# Extract the first word of "camlp4of.opt", so it can be a program name with args.
++set dummy camlp4of.opt; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_CAMLP4OFOPT+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$CAMLP4OFOPT"; then
++  ac_cv_prog_CAMLP4OFOPT="$CAMLP4OFOPT" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_CAMLP4OFOPT="camlp4of.opt"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++  test -z "$ac_cv_prog_CAMLP4OFOPT" && ac_cv_prog_CAMLP4OFOPT="no"
++fi
++fi
++CAMLP4OFOPT=$ac_cv_prog_CAMLP4OFOPT
++if test -n "$CAMLP4OFOPT"; then
++  { $as_echo "$as_me:$LINENO: result: $CAMLP4OFOPT" >&5
++$as_echo "$CAMLP4OFOPT" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++if ! test "x$CAMLP4OFOPT" = "xno"; then
++  CAMLP4OF=$CAMLP4OFOPT
++fi
+ if test "x$CAMLP4OF" = "xno"; then
+-    { { $as_echo "$as_me:$LINENO: error: You must have camlp4 installed" >&5
++  { { $as_echo "$as_me:$LINENO: error: You must have camlp4 installed" >&5
+ $as_echo "$as_me: error: You must have camlp4 installed" >&2;}
+    { (exit 1); exit 1; }; }
+ fi

-- 
ocaml-bitstring packaging