IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-22 17:06:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Disable the use of external QOF and make sure we can co-exist.

Browse Source 
* lib/libqof/qof/Makefile.am:
	  change the name of our qof library
	* lib/libqof/backend/file/Makefile.am:
	  change the name of our qsf library
	* lib/libqof/qof/qof.h:
	  point to the newly named qsf library
	* configure.in:
	  Error out if the user calls --enable-qof
	  Change the name of the internal qof library and directories
	  so that our qof can co-exist with a "native" qof



git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14032 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins 2006-05-12 16:23:00 +00:00
parent b2c7e1a016
commit 953d77f0ef
5 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -8,6 +8,17 @@
* src/engine/gnc-engine.c:
Use QSF #defines instead of hard-coding the library name and init-fcn
* lib/libqof/qof/Makefile.am:
change the name of our qof library
* lib/libqof/backend/file/Makefile.am:
change the name of our qsf library
* lib/libqof/qof/qof.h:
point to the newly named qsf library
* configure.in:
Error out if the user calls --enable-qof
Change the name of the internal qof library and directories
so that our qof can co-exist with a "native" qof
2006-05-12 Christian Stimming <stimming@tuhh.de>
* src/import-export/hbci/gnc-plugin-hbci.c: Add the Tools->HBCI

10
configure.in
View File

@ -442,10 +442,11 @@ LIBS="$oLIBS"
dnl XXX: FIXME: RELEASE HACK
dnl This makes sure that we default to using internal QOF for SVN.
dnl Make sure to enable this to be the default for stable releases!
dnl
AC_ARG_ENABLE(qof,
[ --enable-qof enable the search for an external QOF library (disabled)],
[case "${enableval}" in
[AC_MSG_ERROR([GnuCash has disabled use of external QOF.])
case "${enableval}" in
yes) gnc_enable_qof=true ;;
no) gnc_enable_qof=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-qof) ;;
@ -489,10 +490,10 @@ fi
if test x$QOF_XML_DIR = x; then
QOF_LIB_DIR='${libdir}'
QOF_CFLAGS='-I${top_builddir}/lib/libqof/qof -I${top_srcdir}/lib/libqof/qof'
QOF_LIBS='${top_builddir}/lib/libqof/qof/libqof.la'
QOF_LIBS='${top_builddir}/lib/libqof/qof/libgncqof.la'
QOF_VERSION="internal"
QOF_PREFIX="internal"
QOF_XML_DIR='${datadir}/xml/qsf'
QOF_XML_DIR='${pkgdatadir}/xml/qsf'
LIBQOF_LIBRARY_VERSION=1:4:0
LIBQOF_BACKEND_QSF_LIBRARY_VERSION=0:3:0
AC_SUBST(LIBQOF_LIBRARY_VERSION)
@ -2303,6 +2304,7 @@ AC_CONFIG_FILES(po/Makefile.in
)
AC_OUTPUT
pkgdatadir=${prefix}/${PACKAGE}
output_qof_prefix=`eval eval eval echo $QOF_PREFIX`
output_qof_lib_dir=`eval eval eval echo $QOF_LIB_DIR`
output_qof_xml_dir=`eval eval eval echo $QOF_XML_DIR`

6
lib/libqof/backend/file/Makefile.am
View File

@ -1,6 +1,6 @@
SUBDIRS = .
lib_LTLIBRARIES = libqof-backend-qsf.la
lib_LTLIBRARIES = libgncqof-backend-qsf.la
AM_CFLAGS = \
-I.. -I../.. \
@ -9,12 +9,12 @@ AM_CFLAGS = \
${LIBXML2_CFLAGS} \
${GLIB_CFLAGS}
libqof_backend_qsf_la_SOURCES = \
libgncqof_backend_qsf_la_SOURCES = \
qsf-backend.c \
qsf-xml-map.c \
qsf-xml.c
libqof_backend_qsf_la_LIBADD = \
libgncqof_backend_qsf_la_LIBADD = \
${QOF_LIBS} \
${GLIB_LIBS} \
${LIBXML2_LIBS}

8
lib/libqof/qof/Makefile.am
View File

@ -1,7 +1,7 @@
lib_LTLIBRARIES = libqof.la
lib_LTLIBRARIES = libgncqof.la
libqof_la_LDFLAGS= -version-info $(LIBQOF_LIBRARY_VERSION)
libqof_la_LIBADD= \
libgncqof_la_LDFLAGS= -version-info $(LIBQOF_LIBRARY_VERSION)
libgncqof_la_LIBADD= \
$(GLIB_LIBS) \
$(top_builddir)/lib/libc/libc-missing.la
@ -9,7 +9,7 @@ AM_CFLAGS = \
$(GLIB_CFLAGS) \
-I$(top_srcdir)/lib/libc
libqof_la_SOURCES = \
libgncqof_la_SOURCES = \
deprecated.c \
gnc-date.c \
gnc-numeric.c \

4
lib/libqof/qof/qof.h
View File

@ -104,9 +104,9 @@
#include "deprecated.h"
/** allow easy logging of QSF debug messages */
#define QOF_MOD_QSF "qof-backend-qsf"
#define QOF_MOD_QSF "gncqof-backend-qsf"
/** allow easy loading of the QSF backend */
#define QSF_BACKEND_LIB "libqof-backend-qsf"
#define QSF_BACKEND_LIB "libgncqof-backend-qsf"
/** allow easy loading of the QSF backend */
#define QSF_MODULE_INIT "qsf_provider_init"