From b5713ba30c0b0e4c5b174349e2a08b86ff96db5d Mon Sep 17 00:00:00 2001 From: Derek Atkins Date: Mon, 20 Feb 2006 21:45:11 +0000 Subject: [PATCH] * configure.in: fix the qof configure test for OSX. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13332 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 4 ++++ configure.in | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9909ebdf3..1da7d4f4ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-02-20 Derek Atkins + + * configure.in: fix the qof configure test for OSX. + 2006-02-20 David Hampton * lib/libqof/qof/guid.c: Don't reference uninitialized memory. diff --git a/configure.in b/configure.in index 41c078d8a2..dcdec0dbe5 100644 --- a/configure.in +++ b/configure.in @@ -427,20 +427,21 @@ AC_ARG_ENABLE(qof, 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`