IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

* configure.in: add --enable-qof so build defaults to internal qof.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12331 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins 2006-01-12 21:44:08 +00:00
parent 7c04d41562
commit 49a17f3425
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2006-01-12 Derek Atkins <derek@ihtfp.com>
* configure.in: add --enable-qof so build defaults to internal qof.
2006-01-10 David Hampton <hampton@employees.org> 2006-01-10 David Hampton <hampton@employees.org>
* src/gnome-utils/gnc-gnome-utils.c: * src/gnome-utils/gnc-gnome-utils.c:

32
configure.in
View File

@ -401,15 +401,30 @@ dnl *************************************
dnl QOF dnl QOF
dnl ************************************* dnl *************************************
dnl XXX: FIXME: RELEASE HACK
dnl This makes sure that we default to using internal QOF for SVN.
dnl Make sure to enable this be default for stable releases!
dnl
AC_ARG_ENABLE(qof,
[ --enable-qof enable the search for an external QOF library (disabled)],
[case "${enableval}" in
yes) gnc_enable_qof=true ;;
no) gnc_enable_qof=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --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)])
QOF_REQUIRED=0.6.0 QOF_REQUIRED=0.6.0
AC_PATH_PROG(PKG_CONFIG, pkg-config, no) AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test pkg-config = no; then if test pkg-config = no; then
AC_MSG_ERROR([Please install pkgconfig]) AC_MSG_ERROR([Please install pkgconfig])
exit 1 exit 1
fi fi
AC_MSG_CHECKING([for QOF, version >= $QOF_REQUIRED]) if test "$gnc_enable_qof" = yes ; then
if test "$withval" != "yes"; 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=`$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_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_CFLAGS=`$PKG_CONFIG --silence-errors --cflags $withval/lib/pkgconfig/qof-1.pc`
@ -417,7 +432,7 @@ if test "$withval" != "yes"; then
QOF_PREFIX=`$PKG_CONFIG --silence-errors --variable=prefix $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_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` QOF_XML_DIR=`$PKG_CONFIG --silence-errors --variable=xmldir $withval/lib/pkgconfig/qof-1.pc`
else else
QOF=`$PKG_CONFIG --silence-errors --exists 'qof-1 >= $QOF_REQUIRED'` QOF=`$PKG_CONFIG --silence-errors --exists 'qof-1 >= $QOF_REQUIRED'`
QOF_LIBS=`$PKG_CONFIG --silence-errors --libs qof-1` QOF_LIBS=`$PKG_CONFIG --silence-errors --libs qof-1`
QOF_CFLAGS=`$PKG_CONFIG --silence-errors --cflags qof-1` QOF_CFLAGS=`$PKG_CONFIG --silence-errors --cflags qof-1`
@ -425,9 +440,16 @@ else
QOF_PREFIX=`$PKG_CONFIG --silence-errors --variable=prefix qof-1` QOF_PREFIX=`$PKG_CONFIG --silence-errors --variable=prefix qof-1`
QOF_LIB_DIR=`$PKG_CONFIG --silence-errors --variable=libdir qof-1` QOF_LIB_DIR=`$PKG_CONFIG --silence-errors --variable=libdir qof-1`
QOF_XML_DIR=`$PKG_CONFIG --silence-errors --variable=xmldir qof-1` QOF_XML_DIR=`$PKG_CONFIG --silence-errors --variable=xmldir qof-1`
fi
if test x$QOF_XML_DIR = x; then
AC_MSG_RESULT([no, will use internal QOF code])
else
AC_MSG_RESULT([yes])
fi
else
AC_MSG_NOTICE([External QOF Disabled. Using Internal QOF Code.])
fi fi
if test x$QOF_XML_DIR = x; then if test x$QOF_XML_DIR = x; then
AC_MSG_RESULT([no, will use internal QOF code])
QOF_LIB_DIR=`eval echo $libdir | sed "s%^NONE%$prefix%"` QOF_LIB_DIR=`eval echo $libdir | sed "s%^NONE%$prefix%"`
QOF_LIB_DIR=`eval echo $QOF_LIB_DIR | sed "s%^NONE%$prefix%"` QOF_LIB_DIR=`eval echo $QOF_LIB_DIR | sed "s%^NONE%$prefix%"`
QOF_CFLAGS="-I\${top_srcdir}/lib/libqof/qof" QOF_CFLAGS="-I\${top_srcdir}/lib/libqof/qof"
@ -442,8 +464,6 @@ if test x$QOF_XML_DIR = x; then
AC_SUBST(LIBQOF_BACKEND_QSF_LIBRARY_VERSION) AC_SUBST(LIBQOF_BACKEND_QSF_LIBRARY_VERSION)
AC_DEFINE(HAVE_LIBQOF,,[We will use the internal QOF code]) AC_DEFINE(HAVE_LIBQOF,,[We will use the internal QOF code])
HAVE_LIBQOF="use_internal" HAVE_LIBQOF="use_internal"
else
AC_MSG_RESULT([yes])
fi fi
AM_CONDITIONAL(USE_LIBQOF, [test x$HAVE_LIBQOF != x]) AM_CONDITIONAL(USE_LIBQOF, [test x$HAVE_LIBQOF != x])
AM_CONDITIONAL(USE_LIBQOF, [test "$HAVE_LIBQOF" = "use_internal"]) AM_CONDITIONAL(USE_LIBQOF, [test "$HAVE_LIBQOF" = "use_internal"])