[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. 3bc1d3f606a885975312a67ad411696b14763193

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 66328faf5927e05cad88c70953306d4f47514b72
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Mon Jun 2 14:57:05 2008 +0200

    look for librpm headers in <rpm/*>

diff --git a/config.h.in b/config.h.in
index ef8d821..02b6675 100644
--- a/config.h.in
+++ b/config.h.in
@@ -21,11 +21,11 @@
 /* Define to 1 if you have the <popt.h> header file. */
 #undef HAVE_POPT_H
 
-/* Define to 1 if you have the <rpmio.h> header file. */
-#undef HAVE_RPMIO_H
+/* Define to 1 if you have the <rpm/rpmio.h> header file. */
+#undef HAVE_RPM_RPMIO_H
 
-/* Define to 1 if you have the <rpmlib.h> header file. */
-#undef HAVE_RPMLIB_H
+/* Define to 1 if you have the <rpm/rpmlib.h> header file. */
+#undef HAVE_RPM_RPMLIB_H
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
diff --git a/configure b/configure
index 8856cf3..b6fbe5f 100755
--- a/configure
+++ b/configure
@@ -3947,7 +3947,7 @@ fi
 done
 
 
-for ac_header in rpmlib.h
+for ac_header in rpm/rpmlib.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -4092,7 +4092,7 @@ fi
 done
 
 
-for ac_header in rpmio.h
+for ac_header in rpm/rpmio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
diff --git a/configure.ac b/configure.ac
index 52dbe5e..512fc66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,8 +122,8 @@ fi
 
 AC_CONFIG_HEADERS([config.h])
 AC_CHECK_HEADERS([popt.h])
-AC_CHECK_HEADERS([rpmlib.h])
-AC_CHECK_HEADERS([rpmio.h])
+AC_CHECK_HEADERS([rpm/rpmlib.h])
+AC_CHECK_HEADERS([rpm/rpmio.h])
 AC_CHECK_HEADERS([caml/mlvalues.h])
 AC_CHECK_HEADERS([caml/memory.h])
 AC_CHECK_HEADERS([caml/alloc.h])
diff --git a/ocamlrpm/ocamlrpm_stubs.c b/ocamlrpm/ocamlrpm_stubs.c
index 6805365..2e872a4 100644
--- a/ocamlrpm/ocamlrpm_stubs.c
+++ b/ocamlrpm/ocamlrpm_stubs.c
@@ -25,10 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #endif 
 
 #ifdef HAVE_RPMIO_H
-#include <rpmio.h>
+#include <rpm/rpmio.h>
 #endif
 #ifdef HAVE_RPMLIB_H
-#include <rpmlib.h>
+#include <rpm/rpmlib.h>
 #endif
 
 #ifdef HAVE_CAML_MLVALUES_H

-- 
dose2 packaging