fix gdk-pixbuf-csource's double identity (was not detecting

2004-07-15  Bastien Nocera  <hadess@hadess.net>

	* configure.in: fix gdk-pixbuf-csource's double identity (was not
	detecting gdk-pixbuf-csource-32 from gtk2-devel), detect and
	substitute glib-genmarshal's binary
This commit is contained in:
Bastien Nocera 2004-07-15 22:29:37 +00:00 committed by Bastien Nocera
parent 05e8de7e2a
commit 7c244a15ff
2 changed files with 20 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2004-07-15 Bastien Nocera <hadess@hadess.net>
* configure.in: fix gdk-pixbuf-csource's double identity (was not
detecting gdk-pixbuf-csource-32 from gtk2-devel), detect and
substitute glib-genmarshal's binary
2004-05-17 Sergey V. Udaltsov <svu@gnome.org> 2004-05-17 Sergey V. Udaltsov <svu@gnome.org>
* Merged the preview tab branch. The module libkbdraw appended * Merged the preview tab branch. The module libkbdraw appended

View file

@ -278,11 +278,24 @@ AC_SUBST(ESD_SERVER)
AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
if test x"$GDK_PIXBUF_CSOURCE" = xno; then if test x"$GDK_PIXBUF_CSOURCE" = xno; then
AC_MSG_ERROR([gdk-pixbuf-csource executable not found in your path - should be installed with GTK]) AC_PATH_PROG(GDK_PIXBUF_CSOURCE_32, gdk-pixbuf-csource-32, no)
if test x"$GDK_PIXBUF_CSOURCE_32" = xno; then
AC_MSG_ERROR([gdk-pixbuf-csource executable not found in your path - should be installed with GTK])
else
GDK_PIXBUF_CSOURCE=$GDK_PIXBUF_CSOURCE_32
fi
fi fi
AC_SUBST(GDK_PIXBUF_CSOURCE) AC_SUBST(GDK_PIXBUF_CSOURCE)
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
if text x"$GLIB_GENMARSHAL" = xno; then
AC_MSG_ERROR([glib-genmarshal executable not found in your path - should be installed with glib])
fi
AC_SUBST(GLIB_GENMARSHAL)
dnl ============================================== dnl ==============================================
dnl Special GConf section dnl Special GConf section
dnl ============================================== dnl ==============================================