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

[Richard Hughes]

 autogen.sh   |    8 ++++----
 configure.ac |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5e5a196f7025ed3015a946136cc5b0a91af0041c
Author: Tom Parker <palfrey at tevp.net>
Date:   Sun Nov 18 19:12:45 2007 +0100

    autogen.sh fixes
    - Fix quoting in echo statements
    - Don't print no argument warning if NOCONFIGURE is set

diff --git a/autogen.sh b/autogen.sh
index 50e0f6c..b881e24 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,15 +5,15 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 (test -f $srcdir/configure.ac) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo -n "**Error**: Directory \"\'$srcdir\'\" does not look like the"
     echo " top-level package directory"
     exit 1
 }
 
-if test -z "$*"; then
-  echo "**Warning**: I am going to run \`configure' with no arguments."
+if [[ -z "$*" && "x$NOCONFIGURE" == "x" ]] ; then
+  echo "**Warning**: I am going to run 'configure' with no arguments."
   echo "If you wish to pass any to it, please specify them on the"
-  echo \`$0\'" command line."
+  echo "'$0' command line."
   echo
 fi
 
commit 09470f47bb9d3cff70e7cb7ca397a6f9451e35e5
Author: Tom Parker <palfrey at tevp.net>
Date:   Sun Nov 18 19:09:44 2007 +0100

    Fix APT_SEARCH define with AC_DEFINE_UNQUOTED as well

diff --git a/configure.ac b/configure.ac
index c566a71..e9ae52f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -341,7 +341,7 @@ if test x$with_default_backend = xapt; then
 	if test x$with_aptsearch = x; then
 		with_aptsearch=plain
 	fi
-	AC_DEFINE(APT_SEARCH, "$with_aptsearch", [apt search type])
+	AC_DEFINE_UNQUOTED(APT_SEARCH, "$with_aptsearch", [apt search type])
 	AC_SUBST(APT_SEARCH, "$with_aptsearch")
 	AM_CONDITIONAL(APT_SEARCH_PLAIN, [test x$with_aptsearch = xplain], [using plain apt search])