[PackageKit-commit] packagekit: Branch 'master' - 2 commits

[Richard Hughes]

 client/Makefile.am                    |    1 +
 configure.ac                          |    3 ++-
 contrib/command-not-found/Makefile.am |    1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 547b93721a2fb872e501945c302ecd1921f5c273
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Apr 24 22:12:31 2009 +0100

    A few more trivial FreeBSD compile fixes

diff --git a/client/Makefile.am b/client/Makefile.am
index b6c644f..ccd24e4 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -6,6 +6,7 @@ NULL =
 INCLUDES =						\
 	$(GLIB_CFLAGS)					\
 	$(DBUS_CFLAGS)					\
+	$(SQLITE_CFLAGS)				\
 	-DBINDIR=\"$(bindir)\"			 	\
 	-DDATADIR=\"$(datadir)\"			\
 	-DPREFIX=\""$(prefix)"\" 			\
diff --git a/configure.ac b/configure.ac
index aaad218..0d70def 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,7 +409,7 @@ dnl ---------------------------------------------------------------------------
 AC_ARG_ENABLE(gtk_module, AS_HELP_STRING([--enable-gtk-module],[Build GTK module functionality]),
 	      enable_gtk_module=$enableval,enable_gtk_module=yes)
 if test x$enable_gtk_module = xyes; then
-	PKG_CHECK_MODULES(PK_GTK_MODULE, gtk+-2.0 pangoft2 fontconfig dbus-glib-1,
+	PKG_CHECK_MODULES(PK_GTK_MODULE, gtk+-2.0 >= 2.14.0 pangoft2 fontconfig dbus-glib-1,
 	                  build_gtk_module=yes, build_gtk_module=no)
 	AC_SUBST(PK_GTK_MODULE_CFLAGS)
 	AC_SUBST(PK_GTK_MODULE_LIBS)
diff --git a/contrib/command-not-found/Makefile.am b/contrib/command-not-found/Makefile.am
index 509f1e0..f59001d 100644
--- a/contrib/command-not-found/Makefile.am
+++ b/contrib/command-not-found/Makefile.am
@@ -4,6 +4,7 @@ AUTOMAKE_OPTIONS = 1.7
 INCLUDES =						\
 	$(GLIB_CFLAGS)					\
 	$(DBUS_CFLAGS)					\
+	$(SQLITE_CFLAGS)				\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"		\
 	-DSYSCONFDIR=\""$(sysconfdir)"\" 		\
 	-DEGG_LOG_FILE=\""$(PK_LOG_DIR)/PackageKit"\"	\
commit 666a063ecabdb0140a48f89170a6c51b409ffdaa
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Apr 24 21:40:20 2009 +0100

    trivial: one more FreeBSD fix for gmsgfmt compatibility

diff --git a/configure.ac b/configure.ac
index 260f9e5..aaad218 100644
--- a/configure.ac
+++ b/configure.ac
@@ -232,6 +232,7 @@ dnl - FreeBSD compatibility
 dnl ---------------------------------------------------------------------------
 AC_CHECK_HEADERS([execinfo.h])
 AC_CHECK_FUNCS(clearenv)
+AC_PATH_PROG(GMSGFMT, msgfmt, msgfmt)
 
 dnl ---------------------------------------------------------------------------
 dnl - xsltproc