[f-spot] searches path for all gapi tools and uses resulting variables

[Carl James Adams-Collier <ccollier src gnome org>]

commit e8d12b8a729eb0670b3c48818e7e4b7e6b199e15
Author: C.J. Adams-Collier <cjac colliertech org>
Date:   Fri Aug 14 12:42:02 2009 -0700

    searches path for all gapi tools and uses resulting variables
    (re-resolves #591601)

 configure.ac                    |   15 ++++++++++++++-
 lib/GKeyFile/Makefile.am        |    6 +++---
 lib/gio-sharp/gio/Makefile.am   |    2 +-
 lib/gtk-sharp-beans/Makefile.am |    4 ++--
 4 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 321d3d9..83005ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ if test ! -x "$MCS"; then
 	AC_MSG_ERROR([No $CS compiler found])
 fi
 
-dnl --- Check for gapi post-processor
+dnl --- Check for gapi programs
 
 AC_PATH_PROG(GAPI2FIXUP, gapi2-fixup, no)
 
@@ -36,6 +36,19 @@ if test ! -x "$GAPI2FIXUP"; then
 	AC_MSG_ERROR([No gapi post-processor found])
 fi
 
+AC_PATH_PROG(GAPI2PARSER, gapi2-parser, no)
+
+if test ! -x "$GAPI2PARSER"; then
+	AC_MSG_ERROR([No gapi parser found])
+fi
+
+AC_PATH_PROG(GAPI2CODEGEN, gapi2-codegen, no)
+
+if test ! -x "$GAPI2CODEGEN"; then
+	AC_MSG_ERROR([No gapi code generator found])
+fi
+
+
 dnl -- Initialize docs
 
 GNOME_DOC_INIT
diff --git a/lib/GKeyFile/Makefile.am b/lib/GKeyFile/Makefile.am
index fc90e14..958b432 100644
--- a/lib/GKeyFile/Makefile.am
+++ b/lib/GKeyFile/Makefile.am
@@ -22,14 +22,14 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll
 all: $(ASSEMBLY)
 
 gkeyfile-api.raw: gkeyfile-sharp-sources.xml
-	gapi2-parser gkeyfile-sharp-sources.xml
+	$(GAPI2PARSER) gkeyfile-sharp-sources.xml
 
 gkeyfile-api.xml: gkeyfile-api.raw GKeyFile.metadata
 	cp gkeyfile-api.raw gkeyfile-api.xml
-	gapi2-fixup --api=gkeyfile-api.xml --metadata=GKeyFile.metadata
+	$(GAPI2FIXUP) --api=gkeyfile-api.xml --metadata=GKeyFile.metadata
 
 .generated_timestamp: gkeyfile-api.xml $(CUSTOMS)
-	gapi2-codegen --outdir=generated --customdir=$(srcdir) --generate gkeyfile-api.xml
+	$(GAPI2CODEGEN) --outdir=generated --customdir=$(srcdir) --generate gkeyfile-api.xml
 	touch $@
 $(ASSEMBLY): .generated_timestamp $(ASSEMBLY_SOURCES) $(ASSEMBLY_CUSTOMS)
 	$(CSC_LIB) -unsafe -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES) $(srcdir)/generated/*.cs
diff --git a/lib/gio-sharp/gio/Makefile.am b/lib/gio-sharp/gio/Makefile.am
index d4bfccf..7ebca2f 100644
--- a/lib/gio-sharp/gio/Makefile.am
+++ b/lib/gio-sharp/gio/Makefile.am
@@ -25,7 +25,7 @@ gio-api.xml: $(srcdir)/gio-api.raw $(srcdir)/Gio.metadata
 	@echo -e "\n*** Massaging the raw api into $@"
 	cp $(srcdir)/gio-api.raw gio-api.xml
 	chmod +w gio-api.xml
-	gapi2-fixup --api=gio-api.xml --metadata=$(srcdir)/Gio.metadata
+	$(GAPI2FIXUP) --api=gio-api.xml --metadata=$(srcdir)/Gio.metadata
 
 $(top_builddir)/gio-sharp/generator/gapi_codegen.exe:
 	$(MAKE) -C $(top_builddir)/lib/gio-sharp/generator
diff --git a/lib/gtk-sharp-beans/Makefile.am b/lib/gtk-sharp-beans/Makefile.am
index 81cb889..704bf17 100644
--- a/lib/gtk-sharp-beans/Makefile.am
+++ b/lib/gtk-sharp-beans/Makefile.am
@@ -32,11 +32,11 @@ gtk-api.xml: $(srcdir)/gtk-api.raw $(srcdir)/Gtk.metadata
 	@echo -e "\n*** Massaging the raw api into $@"
 	cp $(srcdir)/gtk-api.raw gtk-api.xml
 	chmod +w gtk-api.xml
-	gapi2-fixup --api=gtk-api.xml --metadata=$(srcdir)/Gtk.metadata
+	$(GAPI2FIXUP) --api=gtk-api.xml --metadata=$(srcdir)/Gtk.metadata
 
 gtk_generated/Builder.cs: gtk-api.xml $(GTK_CUSTOMS)
 	@echo -e "\n*** Generating C# code"
-	gapi2-codegen $(GLIBSHARP_CFLAGS) --outdir=gtk_generated --customdir=$(srcdir) --generate gtk-api.xml
+	$(GAPI2CODEGEN) $(GLIBSHARP_CFLAGS) --outdir=gtk_generated --customdir=$(srcdir) --generate gtk-api.xml
 
 gtk-sharp-beans.snk: $(SNK)
 	cp $< $@