[libgit2-glib] Fix ggit.h when ssh is not enabled

[Jesse van den Kieboom <jessevdk src gnome org>]

commit a758b5fe3d3b6b4d6beabd38ed995745ab320eb1
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Wed Sep 10 09:48:54 2014 +0200

    Fix ggit.h when ssh is not enabled

 configure.ac                       |    7 +++++++
 libgit2-glib/Makefile.am           |    3 ++-
 libgit2-glib/{ggit.h => ggit.h.in} |    7 +------
 3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4e664a7..8ff0a89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,8 +109,14 @@ LIBS="${libs_save}"
 if test "x$git_ssh" = "xyes"; then
        LIBGIT2_GLIB_CFLAGS="${LIBGIT2_GLIB_CFLAGS} -DGIT_SSH=1"
        LIBGIT2_GLIB_PCCFLAGS="-DGIT_SSH=1"
+
+    GGIT_SSH_INCLUDES="
+#include <libgit2-glib/ggit-cred-ssh-key-from-agent.h>
+#include <libgit2-glib/ggit-cred-ssh-interactive.h>
+"
 fi
 
+AC_SUBST(GGIT_SSH_INCLUDES)
 AC_SUBST(LIBGIT2_GLIB_PCCFLAGS)
 
 AM_CONDITIONAL(GIT_SSH, test x"$git_ssh" = "xyes")
@@ -154,6 +160,7 @@ AC_OUTPUT([
        docs/reference/version.xml
        examples/Makefile
        libgit2-glib/Makefile
+    libgit2-glib/ggit.h
        tests/Makefile
 ])
 
diff --git a/libgit2-glib/Makefile.am b/libgit2-glib/Makefile.am
index 21cf8cc..db2d17c 100644
--- a/libgit2-glib/Makefile.am
+++ b/libgit2-glib/Makefile.am
@@ -179,7 +179,8 @@ endif
 EXTRA_DIST =                           \
        Ggit.py                         \
        ggit-enum-types.h.template      \
-       ggit-enum-types.c.template
+       ggit-enum-types.c.template      \
+       ggit.h.in
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/libgit2-glib/ggit.h b/libgit2-glib/ggit.h.in
similarity index 95%
rename from libgit2-glib/ggit.h
rename to libgit2-glib/ggit.h.in
index 6c89d1e..9093a40 100644
--- a/libgit2-glib/ggit.h
+++ b/libgit2-glib/ggit.h.in
@@ -71,12 +71,7 @@
 #include <libgit2-glib/ggit-tree-entry.h>
 #include <libgit2-glib/ggit-tree.h>
 #include <libgit2-glib/ggit-types.h>
-
-#ifdef GIT_SSH
-#include <libgit2-glib/ggit-cred-ssh-key-from-agent.h>
-#include <libgit2-glib/ggit-cred-ssh-interactive.h>
-#endif
-
+ GGIT_SSH_INCLUDES@
 #endif
 
 /* ex:set ts=8 noet: */