* Check if g-ir-compiler is found to build GIR bindings

r2-bindings/config.mk.acr

@@ -23,6 +23,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_MAN=@INSTALL_MAN@
 
 DEVEL_MODE=@DEVEL_MODE@
+HAVE_GIRCOMPILER=@HAVE_GIRCOMPILER@
 HAVE_VALABIND=@HAVE_VALABIND@
 HAVE_SWIG=@HAVE_SWIG@
 

r2-bindings/configure

@@ -130,8 +130,8 @@ Fine tuning of the installation directories:
   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
   --libdir=DIR           object code libraries [EPREFIX/lib]
   --includedir=DIR       C header files [PREFIX/include]
-  --infodir=DIR          info documentation [DATADIR/info]
-  --mandir=DIR           man documentation [DATADIR/man]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
 
 System types:
   --build=BUILD          configure for building on BUILD [guessed]
@@ -253,7 +253,7 @@ parse_options $1
 shift
 done
 
-ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS LDFLAGS HAVE_LANG_C CXX CXXFLAGS HAVE_LANG_CXX HAVE_VALABIND VALABIND HAVE_SWIG SWIG DEVEL_MODE USERCC USERCXX USEROSTYPE FOO HAVE_PKGCFG_R_CORE"
+ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS LDFLAGS HAVE_LANG_C CXX CXXFLAGS HAVE_LANG_CXX HAVE_VALABIND VALABIND HAVE_SWIG SWIG HAVE_GIRCOMPILER GIRCOMPILER DEVEL_MODE USERCC USERCXX USEROSTYPE FOO HAVE_PKGCFG_R_CORE"
 
 create_environ
 
@@ -342,6 +342,26 @@ else
  HAVE_SWIG=0
  SWIG=swig
  echo no ; fi
+printf "checking for g-ir-compiler... "
+if [ -x "${GIRCOMPILER}" ]; then
+FIND=${GIRCOMPILER}
+else
+FIND=""
+for A in `echo ${PATH} | sed -e 's,:, ,g'`; do
+if [ -x "${A}/g-ir-compiler" ]; then
+        FIND="${A}/g-ir-compiler"
+        break;
+fi
+done
+fi
+if [ -n "${FIND}" ]; then 
+ echo ${FIND}; 
+ HAVE_GIRCOMPILER=1
+ GIRCOMPILER=${FIND}
+else
+ HAVE_GIRCOMPILER=0
+ GIRCOMPILER=g-ir-compiler
+ echo no ; fi
 if [ "$USEROSTYPE" = "auto" ]; then
 if [ "$HOST_OS" = "linux" ]; then
 USEROSTYPE="gnulinux"
@@ -414,7 +434,7 @@ done
 do_remove
 echo
 echo "Final report:"
-for A in  PREFIX HAVE_SWIG HAVE_VALABIND DEVEL_MODE ; do # REPORT
+for A in  PREFIX HAVE_SWIG HAVE_VALABIND HAVE_GIRCOMPILER DEVEL_MODE ; do # REPORT
 eval VAL="\$${A}"
 [ -z "${VAL}" ] && VAL="(null)"
 echo " - ${A} = ${VAL}"

r2-bindings/configure.acr

@@ -6,6 +6,7 @@ LANG_C!
 LANG_CXX!
 CHKPRG VALABIND valabind
 CHKPRG SWIG swig
+CHKPRG GIRCOMPILER g-ir-compiler
 
 ARG_ENABLE DEVEL_MODE devel Enable development mode (use valabind and swig) ;
 ARG_WITH USERCC=gcc cc Define C compiler to use (gcc by default) ;
@@ -33,4 +34,4 @@ PKGCFG! FOO FOO r_core
 
 SUBDIRS ./config.mk ;
 
-REPORT PREFIX HAVE_SWIG HAVE_VALABIND DEVEL_MODE ;
+REPORT PREFIX HAVE_SWIG HAVE_VALABIND HAVE_GIRCOMPILER DEVEL_MODE ;

r2-bindings/gir/Makefile

@@ -5,7 +5,7 @@ include ../libs.mk
 all: ${LIBS}
 
 ${LIBS}:
-ifeq ($(HAVE_VALABIND),1)
+ifeq ($(HAVE_VALABIND)$(HAVE_GIRCOMPILER),11)
 	@PKG=`echo $@|sed -e s,.gir,,` ; \
 	VAPI=`echo $@|sed -e s,.gir,.vapi,` ; \
 	DEPS="$$(cat ../vapi/$${PKG}.deps 2>/dev/null | awk '{print "--pkg "$$1}')" ; \