Expect beecrypt headers to live in beecrypt/ directory in include path

diff --git a/configure.ac b/configure.ac
index 5fd04ca..e5058e6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -472,7 +472,7 @@ AC_CHECK_HEADER([beecrypt/beecrypt.h], [
     AC_CHECK_HEADER([beecrypt/api.h], [
       AC_DEFINE(HAVE_BEECRYPT_API_H, 1, [Define to 1 if you have the <beecrypt/api.h> header file.])
     ])
-    WITH_BEECRYPT_INCLUDE="-I${includedir}/beecrypt"
+    WITH_BEECRYPT_INCLUDE=
     WITH_BEECRYPT_LIB="-lbeecrypt"
   ])
 ],[

diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h
index 2e81226..2ac020c 100644 (file)
--- a/rpmio/rpmio_internal.h
+++ b/rpmio/rpmio_internal.h
@@ -10,28 +10,28 @@
 #include <rpmurl.h>
 
 #if HAVE_BEECRYPT_API_H
-#include <api.h>
+#include <beecrypt/api.h>
 #else
-#include <beecrypt.api.h>
+#include <beecrypt/beecrypt.api.h>
 #endif
 
 #include <rpmpgp.h>
 #include <rpmsw.h>
 
 /* Drag in the beecrypt includes. */
-#include <beecrypt.h>
-#include <base64.h>
-#include <dsa.h>
-#include <endianness.h>
-#include <md5.h>
-#include <mp.h>
-#include <rsa.h>
-#include <rsapk.h>
-#include <sha1.h>
+#include <beecrypt/beecrypt.h>
+#include <beecrypt/base64.h>
+#include <beecrypt/dsa.h>
+#include <beecrypt/endianness.h>
+#include <beecrypt/md5.h>
+#include <beecrypt/mp.h>
+#include <beecrypt/rsa.h>
+#include <beecrypt/rsapk.h>
+#include <beecrypt/sha1.h>
 #if HAVE_BEECRYPT_API_H
-#include <sha256.h>
-#include <sha384.h>
-#include <sha512.h>
+#include <beecrypt/sha256.h>
+#include <beecrypt/sha384.h>
+#include <beecrypt/sha512.h>
 #endif
 
 /** \ingroup rpmio