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

[Richard Hughes]

 configure.ac                                    |    1 +
 lib/packagekit-glib/Makefile.am                 |    3 +++
 lib/packagekit-qt/modules/.gitignore            |    1 -
 lib/packagekit-qt/modules/FindQPackageKit.cmake |    2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit ab2fb18450039a6d3d9b0a364d238149686cd271
Author: Trever Fischer <wm161 at wm161.net>
Date:   Mon Nov 24 09:23:25 2008 +0000

    bugfix: Allow building the glib library outside the source tree

diff --git a/lib/packagekit-glib/Makefile.am b/lib/packagekit-glib/Makefile.am
index fd2d4f5..94ebd8b 100644
--- a/lib/packagekit-glib/Makefile.am
+++ b/lib/packagekit-glib/Makefile.am
@@ -7,6 +7,9 @@ INCLUDES = \
 	$(POLKIT_CFLAGS)					\
 	$(SQLITE_CFLAGS)					\
 	-I$(top_srcdir)/lib					\
+	-I$(top_builddir)/lib					\
+	-I$(top_builddir)/lib/packagekit-glib			\
+	-I.							\
 	-DPK_COMPILATION					\
 	-DPK_DB_DIR=\""$(PK_DB_DIR)"\" 				\
 	-DEGG_LOG_FILE=\""$(PK_LOG_DIR)/PackageKit"\"		\
commit f909725ac2fe6a0a585cc878e864907fac31f8ae
Author: Trever Fischer <wm161 at wm161.net>
Date:   Mon Nov 24 09:16:58 2008 +0000

    bugfix: correct the location of the QT library in the cmake file
    
    In KPackageKit, we simply include <QPackageKit>, but the cmake module sets our
    QPK include path to '/usr/include/packagekit-qt'. Before the move into
    /usr/include/PackageKit/packagekit-qt, things worked and now they don't.

diff --git a/lib/packagekit-qt/modules/FindQPackageKit.cmake b/lib/packagekit-qt/modules/FindQPackageKit.cmake
index 7074d78..5efc79a 100644
--- a/lib/packagekit-qt/modules/FindQPackageKit.cmake
+++ b/lib/packagekit-qt/modules/FindQPackageKit.cmake
@@ -24,7 +24,7 @@ ELSE (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIB)
    SET(QPACKAGEKIT_FOUND FALSE)
 ENDIF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIB)
 
-SET(QPACKAGEKIT_INCLUDE_DIR ${QPACKAGEKIT_INCLUDE_DIR}/packagekit-qt)
+SET(QPACKAGEKIT_INCLUDE_DIR ${QPACKAGEKIT_INCLUDE_DIR}/PackageKit/packagekit-qt)
 
 IF (QPACKAGEKIT_FOUND)
   IF (NOT QPACKAGEKIT_FIND_QUIETLY)
commit 84bff95855b6f75a67b60d420161bc188b0d84ee
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Nov 24 09:15:39 2008 +0000

    trivial: fix up a gitignore file

diff --git a/lib/packagekit-qt/modules/.gitignore b/lib/packagekit-qt/modules/.gitignore
index 82d1baf..15af000 100644
--- a/lib/packagekit-qt/modules/.gitignore
+++ b/lib/packagekit-qt/modules/.gitignore
@@ -1,3 +1,2 @@
 CMakeFiles
-*.cmake
 
commit 9761fcfebb3e3e2ec16cca60ce651c36eab089a3
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Nov 24 09:09:29 2008 +0000

    trivial: print CPPFLAGS in the configure output

diff --git a/configure.ac b/configure.ac
index b75b406..078487a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -630,6 +630,7 @@ echo "
         datadir:                   ${datadir}
         compiler:                  ${CC}
         cflags:                    ${CFLAGS}
+        cppflags:                  ${CPPFLAGS}
         Building unit tests:       ${enable_tests}
         Able to run locally:       ${enable_local}
         Developer warnings:        ${enable_developer}