[gexiv2] Fix --enable-introspection: Closes bgo#723705

[Jim Nelson <jnelson src gnome org>]

commit f343d9f3117e98a259d69bf076e57274a5b13109
Author: Jim Nelson <jim yorba org>
Date:   Wed Feb 5 12:06:17 2014 -0800

    Fix --enable-introspection: Closes bgo#723705
    
    Not only fixes the configure switch, but fixes the g-ir-scanner step
    itself and updates the namespace version.

 .gitignore   |    4 ++--
 Makefile.am  |    2 +-
 configure.ac |   34 +++++++++++++++++++---------------
 3 files changed, 22 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 63fde82..0fbe89e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,8 @@ gexiv2/gexiv2-version.h
 *.o
 *.la
 /configure.mk
-/GExiv2-0.4.gir
-/GExiv2-0.4.typelib
+/GExiv2-*.*.gir
+/GExiv2-*.*.typelib
 vapi/gexiv2.gi
 test/gexiv2-dump
 
diff --git a/Makefile.am b/Makefile.am
index fb76017..07b1a90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,6 +121,7 @@ endif
 
 if ENABLE_INTROSPECTION
 TYPELIB_FILES=GExiv2-$(GIR_VERSION).typelib GExiv2-$(GIR_VERSION).gir
+CLEANFILES=$(TYPELIB_FILES)
 endif
 
 BUILD_DIR=gexiv2
@@ -138,7 +139,6 @@ GExiv2-$(GIR_VERSION).gir: lib PACKAGE_NAME@.la
                --output $@                             \
                -I @PACKAGE_NAME@                           \
                $(GEXIV2_public_HEADERS)      \
-               $(GEXIV2_sources)                   \
                --library lib PACKAGE_NAME@.la                \
                $(LIBTOOL)                              \
                --pkg=gobject-2.0
diff --git a/configure.ac b/configure.ac
index c9b9881..bb7f4aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,13 @@ m4_define([gexiv2_real_version],
           [gexiv2_major_version.gexiv2_minor_version.gexiv2_micro_version])
 m4_define([gexiv2_version], [gexiv2_real_version])
 
+# Set to target (stable) major.minor version
+#
+# This was necessary because the typelib files don't seem to load if the
+# version info has more than one period in it.
+GIR_VERSION=0.10
+AC_SUBST(GIR_VERSION)
+
 m4_define([glib_required_version], [2.26.1])
 m4_define([exiv2_required_version], [0.21])
 
@@ -36,11 +43,6 @@ m4_define([exiv2_required_version], [0.21])
 GEXIV2_VERSION_INFO=2:0:0
 AC_SUBST(GEXIV2_VERSION_INFO)
 
-# This was necessary because the typelib files don't seem to load if the
-# version info has more than one period in it.
-GIR_VERSION=0.4
-AC_SUBST(GIR_VERSION)
-
 GEXIV2_MAJOR_VERSION=gexiv2_major_version
 GEXIV2_MINOR_VERSION=gexiv2_minor_version
 GEXIV2_MICRO_VERSION=gexiv2_micro_version
@@ -104,31 +106,33 @@ fi
 # Introspection #
 #################
 
-enable_introspection=no
-AC_MSG_CHECKING([enable instrospection])
+AC_MSG_CHECKING([enable introspection])
 AC_ARG_ENABLE(introspection,
-              [  --enable-introspection  enable instrospection [[default=no]]],
+              [  --enable-introspection  enable introspection [[default=no]]],
               if eval "test x$enable_introspection = xyes"; then
               enable_introspection="yes"
-              fi)
+              fi,
+              enable_introspection=no)
 
 AM_CONDITIONAL(ENABLE_INTROSPECTION, test "x$enable_introspection" = "xyes")
 AC_MSG_RESULT([$enable_introspection])
 
-enable_python2="no (instrospection disabled)"
-enable_python3="no (instrospection disabled)"
+enable_python2="no (introspection disabled)"
+enable_python3="no (introspection disabled)"
 if test "x$enable_introspection" = "xyes"; then
     # Used to determine where Python wants the .gi file to be installed ...
     # if Python is not installed, PYTHON2 and PYTHON3 will be empty
     PYTHON="import gi; print(gi._overridesdir)"
-    PYTHON2_GIDIR=$(python2 -c $PYTHON 2> /dev/null)
-    PYTHON3_GIDIR=$(python3 -c $PYTHON 2> /dev/null)
-    if test "x$PYTHON2" != "x"; then
+    PYTHON2_GIDIR=$(python2 -c "$PYTHON")
+    AC_MSG_RESULT([Python2 GObject Introspection directory: $PYTHON2_GIDIR])
+    PYTHON3_GIDIR=$(python3 -c "$PYTHON")
+    AC_MSG_RESULT([Python3 GObject Introspection directory: $PYTHON3_GIDIR])
+    if test "x$PYTHON2_GIDIR" != "x"; then
         enable_python2=yes
     else
         enable_python2=no
     fi
-    if test "x$PYTHON3" != "x"; then
+    if test "x$PYTHON3_GIDIR" != "x"; then
         enable_python3=yes
     else
         enable_python3=no