[PATCH] Fix build with ghex 2.90.0

[Kalev Lember <kalevlember gmail com>]

	* configure.ac: Depend on gtkhex-3
	* src/uicommon/nmv-hex-document.h:
	* src/uicommon/nmv-hex-editor.[cc,h]: When including gtkhex
	headers, include the files directly without directory prefix,
	because the -I from pkgconfig already specifies the directory.
---
Hello,

I just released gtkhex 2.90.0, which is the first version of gtkhex
with GTK+ 3 support. This patch fixes Nemiver to build against the
new gtkhex, completing Nemiver's GTK+ 3 port.

-- 
Kalev


 configure.ac                    |    4 ++--
 src/uicommon/nmv-hex-document.h |    2 +-
 src/uicommon/nmv-hex-editor.cc  |    2 +-
 src/uicommon/nmv-hex-editor.h   |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6478d35..b2cab9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,7 +169,7 @@ AC_ARG_ENABLE(memoryview,
               AS_HELP_STRING([--enable-memoryview=yes|no],
                              [enable the memory view hex editor (default is yes)]),
               ENABLE_MEMORYVIEW=$enableval,
-              [PKG_CHECK_EXISTS([gtkhex >= $GTKHEX_VERSION], [ENABLE_MEMORYVIEW=yes], [ENABLE_MEMORYVIEW=no])])
+              [PKG_CHECK_EXISTS([gtkhex-3 >= $GTKHEX_VERSION], [ENABLE_MEMORYVIEW=yes], [ENABLE_MEMORYVIEW=no])])
 if test x$ENABLE_MEMORYVIEW = xyes ; then
     AC_DEFINE([WITH_MEMORYVIEW], 1, [compile the the memory view widget])
 else
@@ -263,7 +263,7 @@ if test x$ENABLE_WORKBENCH = xyes ; then
 fi
 
 if test x$ENABLE_MEMORYVIEW = xyes ; then
-    DEP_MEMORYVIEW="gtkhex >= $GTKHEX_VERSION"
+    DEP_MEMORYVIEW="gtkhex-3 >= $GTKHEX_VERSION"
 fi
 
 dnl *******************
diff --git a/src/uicommon/nmv-hex-document.h b/src/uicommon/nmv-hex-document.h
index 640910c..8767630 100644
--- a/src/uicommon/nmv-hex-document.h
+++ b/src/uicommon/nmv-hex-document.h
@@ -28,7 +28,7 @@
 #include "common/nmv-object.h"
 #include "common/nmv-safe-ptr-utils.h"
 #include "common/nmv-ustring.h"
-#include <gtkhex/hex-document.h>
+#include <hex-document.h>
 #include <sigc++/signal.h>
 
 namespace Gtk {
diff --git a/src/uicommon/nmv-hex-editor.cc b/src/uicommon/nmv-hex-editor.cc
index a1544c7..cae7e4c 100644
--- a/src/uicommon/nmv-hex-editor.cc
+++ b/src/uicommon/nmv-hex-editor.cc
@@ -26,7 +26,7 @@
 #include <gtkmm/container.h>
 #include "common/nmv-exception.h"
 #include "nmv-hex-editor.h"
-#include <gtkhex/gtkhex.h>
+#include <gtkhex.h>
 
 NEMIVER_BEGIN_NAMESPACE (nemiver)
 NEMIVER_BEGIN_NAMESPACE (Hex)
diff --git a/src/uicommon/nmv-hex-editor.h b/src/uicommon/nmv-hex-editor.h
index 5abc3db..d868d78 100644
--- a/src/uicommon/nmv-hex-editor.h
+++ b/src/uicommon/nmv-hex-editor.h
@@ -29,7 +29,7 @@
 #include "common/nmv-safe-ptr-utils.h"
 #include "common/nmv-ustring.h"
 #include <uicommon/nmv-hex-document.h>
-#include <gtkhex/gtkhex.h>  // for GROUP_* defines
+#include <gtkhex.h>  // for GROUP_* defines
 
 namespace Gtk {
     class Widget;
-- 
1.7.6