[Gnucash-changes] r13332 - gnucash/trunk - * configure.in: fix the qof configure test for OSX.

[Derek Atkins]

Author: warlord
Date: 2006-02-20 16:45:11 -0500 (Mon, 20 Feb 2006)
New Revision: 13332
Trac: http://svn.gnucash.org/trac/changeset/13332

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/configure.in
Log:
* configure.in: fix the qof configure test for OSX.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-02-20 21:06:32 UTC (rev 13331)
+++ gnucash/trunk/ChangeLog	2006-02-20 21:45:11 UTC (rev 13332)
@@ -1,3 +1,7 @@
+2006-02-20  Derek Atkins  <derek at ihtfp.com>
+
+	* configure.in: fix the qof configure test for OSX.
+
 2006-02-20  David Hampton  <hampton at employees.org>
 
 	* lib/libqof/qof/guid.c: Don't reference uninitialized memory.

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2006-02-20 21:06:32 UTC (rev 13331)
+++ gnucash/trunk/configure.in	2006-02-20 21:45:11 UTC (rev 13332)
@@ -427,20 +427,21 @@
    esac],
    [gnc_enable_qof=false])
 
-AC_ARG_WITH(qof, [  --with-qof=path           prefix for Query Object Framework - QOF (auto)])
+AC_ARG_WITH(qof, [  --with-qof=path           prefix for Query Object Framework - QOF (auto)],
+	[gnc_with_qof=$withval], [gnc_with_qof=yes])
 
 # bug fixes between 0.6.1 and 0.6.2 mean gnucash runs best with 0.6.2
 QOF_REQUIRED=0.6.2
 if test "$gnc_enable_qof" = true ; then
   AC_MSG_CHECKING([for QOF, version >= $QOF_REQUIRED])
-  if test "$withval" != "yes"; then
-        QOF=`$PKG_CONFIG --silence-errors --exists '$withval/lib/pkgconfig/qof-1.pc >= $QOF_REQUIRED'`
-        QOF_LIBS=`$PKG_CONFIG --silence-errors --libs $withval/lib/pkgconfig/qof-1.pc`
-        QOF_CFLAGS=`$PKG_CONFIG --silence-errors --cflags $withval/lib/pkgconfig/qof-1.pc`
-        QOF_VERSION=`$PKG_CONFIG --silence-errors --modversion $withval/lib/pkgconfig/qof-1.pc`
-        QOF_PREFIX=`$PKG_CONFIG --silence-errors --variable=prefix $withval/lib/pkgconfig/qof-1.pc`
-        QOF_LIB_DIR=`$PKG_CONFIG --silence-errors --variable=libdir $withval/lib/pkgconfig/qof-1.pc`
-        QOF_XML_DIR=`$PKG_CONFIG --silence-errors --variable=xmldir $withval/lib/pkgconfig/qof-1.pc`
+  if test "$gnc_with_qof" != "yes"; then
+        QOF=`$PKG_CONFIG --silence-errors --exists '$gnc_with_qof/lib/pkgconfig/qof-1.pc >= $QOF_REQUIRED'`
+        QOF_LIBS=`$PKG_CONFIG --silence-errors --libs $gnc_with_qof/lib/pkgconfig/qof-1.pc`
+        QOF_CFLAGS=`$PKG_CONFIG --silence-errors --cflags $gnc_with_qof/lib/pkgconfig/qof-1.pc`
+        QOF_VERSION=`$PKG_CONFIG --silence-errors --modversion $gnc_with_qof/lib/pkgconfig/qof-1.pc`
+        QOF_PREFIX=`$PKG_CONFIG --silence-errors --variable=prefix $gnc_with_qof/lib/pkgconfig/qof-1.pc`
+        QOF_LIB_DIR=`$PKG_CONFIG --silence-errors --variable=libdir $gnc_with_qof/lib/pkgconfig/qof-1.pc`
+        QOF_XML_DIR=`$PKG_CONFIG --silence-errors --variable=xmldir $gnc_with_qof/lib/pkgconfig/qof-1.pc`
   else
         QOF=`$PKG_CONFIG --silence-errors --exists 'qof-1 >= $QOF_REQUIRED'`
         QOF_LIBS=`$PKG_CONFIG --silence-errors --libs qof-1`