Don't ever reference lib/glib26 if the host system has glib 2.6 or

better installed. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14328 57a11ea4-9604-0410-9ed3-97b8803252fd
2024-12-02 05:29:20 -06:00 · 2006-06-05 02:44:25 +00:00 · 2006-06-05 02:44:25 +00:00 · d982c50662
commit d982c50662
parent e5c0029700
16 changed files with 106 additions and 31 deletions
--- a/3
+++ b/3
@ -1,5 +1,8 @@
 2006-05-04  David Hampton  <hampton@employees.org>

+	* various Makefile.am files: Don't ever reference lib/glib26 if
+	the host system has glib 2.6 or better installed.
+
 	* various Makefile.am files: Add lib/glib26 to the include and
 	library paths.

--- a/src/app-utils/Makefile.am
+++ b/src/app-utils/Makefile.am
@ -1,3 +1,8 @@
+if !HAVE_GLIB26
+  GLIB26_LIB = ${top_builddir}/lib/glib26/libgncglib.la
+  GLIB26_INC = -I${top_srcdir}/lib/glib26
+endif
+
 SUBDIRS = . test
 PWD := $(shell pwd)

@ -9,7 +14,7 @@ AM_CFLAGS = \
  -I${top_srcdir}/src/calculation \
  -I${top_srcdir}/src/core-utils \
  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/lib/glib26 \
+  ${GLIB26_INC} \
  ${GUILE_INCS} \
  ${G_WRAP_COMPILE_ARGS} \
  ${GLIB_CFLAGS} \
@ -74,7 +79,7 @@ libgncmod_app_utils_la_LIBADD = \
  ${top_builddir}/src/engine/libgw-engine.la \
  ${top_builddir}/src/calculation/libgncmod-calculation.la \
  ${top_builddir}/src/core-utils/libcore-utils.la \
-  ${top_builddir}/lib/glib26/libgncglib.la \
+  ${GLIB26_LIBS} \
  ${GCONF_LIBS} \
  ${GTK_LIBS} \
  ${G_WRAP_LINK_ARGS} \
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@ -1,3 +1,8 @@
+if !HAVE_GLIB26
+  GLIB26_LIB = ${top_builddir}/lib/glib26/libgncglib.la
+  GLIB26_INC = -I${top_srcdir}/lib/glib26
+endif
+
 # Order is important here.
 SUBDIRS = . overrides test

@ -8,7 +13,7 @@ AM_CFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
  -DDATADIR=\"${GNC_SHAREDIR}\" \
  -DLIBDIR=\"${GNC_LIBDIR}\" \
  -DGNC_HELPDIR=\"${GNC_HELPDIR}\" \
-  -I${top_srcdir}/lib/glib26 \
+  ${GLIB26_INC} \
  -I${top_srcdir}/src \
  -I${top_srcdir}/src/core-utils \
  -I${top_srcdir}/src/app-utils \
@ -22,7 +27,7 @@ bin_PROGRAMS = gnucash-bin
 gnucash_bin_SOURCES = gnucash-bin.c
 gnucash_bin_LDADD = ${GUILE_LIBS} ${GLIB_LIBS} ${GNOME_LIBS} ${GTK_LIBS} \
 ${QOF_LIBS} \
-${top_builddir}/lib/glib26/libgncglib.la \
+${GLIB26_LIBS} \
 ${top_builddir}/src/engine/libgncmod-engine.la \
 ${top_builddir}/src/gnome/libgncgnome.la \
 ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
--- a/src/business/business-gnome/Makefile.am
+++ b/src/business/business-gnome/Makefile.am
@ -1,3 +1,8 @@
+if !HAVE_GLIB26
+  GLIB26_LIB = ${top_builddir}/lib/glib26/libgncglib.la
+  GLIB26_INC = -I${top_srcdir}/lib/glib26
+endif
+
 SUBDIRS = . glade schemas ui
 PWD := $(shell pwd)

@ -28,7 +33,7 @@ AM_CFLAGS = \
  -I${top_srcdir}/src/register/register-core \
  -I${top_srcdir}/src/register/register-gnome \
  -I${top_srcdir}/src/register/ledger-core \
-  -I${top_srcdir}/lib/glib26
+  ${GLIB26_INC}

 libgncmod_business_gnome_la_SOURCES = \
  businessmod-gnome.c \
@ -87,7 +92,7 @@ libgncmod_business_gnome_la_LIBADD = \
  ${GUILE_LIBS} \
  ${GLIB_LIBS} \
  ${QOF_LIBS} \
-  ${top_builddir}/lib/glib26/libgncglib.la \
+  ${GLIB26_LIBS} \
  ${EFENCE_LIBS}


--- a/src/business/dialog-tax-table/Makefile.am
+++ b/src/business/dialog-tax-table/Makefile.am
@ -1,9 +1,14 @@
+if !HAVE_GLIB26
+  GLIB26_LIB = ${top_builddir}/lib/glib26/libgncglib.la
+  GLIB26_INC = -I${top_srcdir}/lib/glib26
+endif
+
 PWD := $(shell pwd)

 pkglib_LTLIBRARIES = libgncmod-dialog-tax-table.la libgw-dialog-tax-table.la

 AM_CFLAGS = \
-  -I${top_srcdir}/lib/glib26 \
+  ${GLIB26_INC} \
  -I${top_srcdir}/src \
  -I${top_srcdir}/src/core-utils \
  -I${top_srcdir}/src/engine \
@ -35,7 +40,7 @@ libgncmod_dialog_tax_table_la_LIBADD = \
  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
  ${top_builddir}/src/engine/libgncmod-engine.la \
  ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_builddir}/lib/glib26/libgncglib.la \
+  ${GLIB26_LIBS} \
  ${GLADE_LIBS} \
  ${GUILE_LIBS} \
  ${GNOME_LIBS} \
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@ -1,3 +1,7 @@
+if !HAVE_GLIB26
+  GLIB26_LIB = ${top_builddir}/lib/glib26/libgncglib.la
+  GLIB26_INC = -I${top_srcdir}/lib/glib26
+endif

 lib_LTLIBRARIES = libcore-utils.la libgw-core-utils.la

@ -10,7 +14,7 @@ libcore_utils_la_SOURCES = \
  gnc-gobject-utils.c

 libcore_utils_la_LIBADD = \
-  ${top_builddir}/lib/glib26/libgncglib.la \
+  ${GLIB26_LIBS} \
  ${GLIB_LIBS} \
  ${GCONF_LIBS} \
  ${GTK_LIBS}
@ -36,7 +40,7 @@ noinst_HEADERS = \
 EXTRA_DIST = ${gwmod_DATA}

 AM_CFLAGS = \
-  -I${top_srcdir}/lib/glib26 \
+  ${GLIB26_INC} \
  ${G_WRAP_COMPILE_ARGS} \
  ${GUILE_INCS} \
  ${GLIB_CFLAGS} \
--- a/src/gnome-search/Makefile.am
+++ b/src/gnome-search/Makefile.am
@ -1,3 +1,8 @@
+if !HAVE_GLIB26
+  GLIB26_LIB = ${top_builddir}/lib/glib26/libgncglib.la
+  GLIB26_INC = -I${top_srcdir}/lib/glib26
+endif
+
 PWD := $(shell pwd)

 pkglib_LTLIBRARIES = libgncmod-gnome-search.la
@ -10,7 +15,7 @@ AM_CFLAGS = \
  -I${top_srcdir}/src/gnome-utils \
  -I${top_srcdir}/src/gnc-module \
  -I${top_srcdir}/src/business/business-core \
-  -I${top_srcdir}/lib/glib26 \
+  ${GLIB26_INC} \
  ${G_WRAP_COMPILE_ARGS} \
  ${GUILE_INCS} \
  ${GTKHTML_CFLAGS} \
@ -56,7 +61,7 @@ libgncmod_gnome_search_la_LIBADD = \
  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
  ${top_builddir}/src/gnc-module/libgncmodule.la \
  ${top_builddir}/src/core-utils/libcore-utils.la \
-  ${top_builddir}/lib/glib26/libgncglib.la \
+  ${GLIB26_LIBS} \
  ${GUILE_LIBS} \
  ${GNOME_LIBS} \
  ${GTKHTML_LIBS} \
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@ -1,3 +1,8 @@
+if !HAVE_GLIB26
+  GLIB26_LIB = ${top_builddir}/lib/glib26/libgncglib.la
+  GLIB26_INC = -I${top_srcdir}/lib/glib26
+endif
+
 SUBDIRS = glade schemas . test ui
 PWD := $(shell pwd)

@ -17,7 +22,7 @@ AM_CFLAGS = \
  -I${top_srcdir}/src/network-utils \
  -I${top_srcdir}/src/app-utils \
  -I${top_srcdir}/src \
-  -I${top_srcdir}/lib/glib26 \
+  ${GLIB26_INC} \
  ${GLIB_CFLAGS} \
  ${GLADE_CFLAGS} \
  ${GTK_CFLAGS} \
@ -184,7 +189,7 @@ libgncmod_gnome_utils_la_LIBADD = \
  ${top_builddir}/src/calculation/libgncmod-calculation.la \
  ${top_builddir}/src/network-utils/libgncmod-network-utils.la \
  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/lib/glib26/libgncglib.la \
+  ${GLIB26_LIBS} \
  ${GNOME_LIBS} \
  ${GNOME_PRINT_LIBS} \
  ${GTKHTML_LIBS} \
--- a/src/gnome-utils/test/Makefile.am
+++ b/src/gnome-utils/test/Makefile.am
@ -1,3 +1,8 @@
+if !HAVE_GLIB26
+  GLIB26_LIB = ${top_builddir}/lib/glib26/libgncglib.la
+  GLIB26_INC = -I${top_srcdir}/lib/glib26
+endif
+
 TESTS =  \
  test-link-module test-load-module

@ -8,8 +13,6 @@ TESTS_GUI = test-gnc-recurrence test-gnc-dialog

 ##lib_LTLIBRARIES = libgncgnome.la

-
-
 GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
  --gnc-module-dir ${top_builddir}/src/core-utils \
  --gnc-module-dir ${top_builddir}/src/gnc-module \
@ -41,7 +44,7 @@ INCLUDES= \
  -I${top_srcdir}/src/gnome-utils \
  -I${top_srcdir}/src/gnc-module \
  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/lib/glib26 \
+  ${GLIB26_INC} \
  ${GLIB_CFLAGS} ${GUILE_INCS} ${GNOME_CFLAGS} ${GLADE_CFLAGS} ${QOF_CFLAGS}

 test_gnc_recurrence_SOURCES=test-gnc-recurrence.c
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@ -1,3 +1,8 @@
+if !HAVE_GLIB26
+  GLIB26_LIB = ${top_builddir}/lib/glib26/libgncglib.la
+  GLIB26_INC = -I${top_srcdir}/lib/glib26
+endif
+
 SUBDIRS = glade schemas ui

 lib_LTLIBRARIES = libgncgnome.la libgw-gnc.la 
@ -20,7 +25,7 @@ libgncgnome_la_LIBADD = \
  ${top_builddir}/src/engine/libgncmod-engine.la \
  ${top_builddir}/src/calculation/libgncmod-calculation.la \
  ${top_builddir}/src/core-utils/libcore-utils.la \
-  ${top_builddir}/lib/glib26/libgncglib.la \
+  ${GLIB26_LIBS} \
  ${GLADE_LIBS} \
  ${G_WRAP_LINK_ARGS} \
  ${GUILE_LIBS} ${GNOME_LIBS} ${GLIB_LIBS} ${QOF_LIBS}
@ -123,7 +128,7 @@ AM_CFLAGS = \
  -I${top_srcdir}/src/register/register-gnome \
  -I${top_srcdir}/src/report/report-system \
  -I${top_srcdir}/src/report/report-gnome \
-  -I${top_srcdir}/lib/glib26 \
+  ${GLIB26_INC} \
  -I${top_srcdir}/lib/libc \
  ${GUILE_INCS} \
  ${G_WRAP_COMPILE_ARGS} \
--- a/src/import-export/Makefile.am
+++ b/src/import-export/Makefile.am
@ -1,3 +1,8 @@
+if !HAVE_GLIB26
+  GLIB26_LIB = ${top_builddir}/lib/glib26/libgncglib.la
+  GLIB26_INC = -I${top_srcdir}/lib/glib26
+endif
+
 SUBDIRS = . schemas qif qif-import \
 	${OFX_DIR} ${HBCI_DIR} ${MT940_DIR} log-replay test
 DIST_SUBDIRS = schemas qif qif-import qif-io-core \
@ -45,7 +50,7 @@ libgncmod_generic_import_la_LIBADD = \
  ${top_builddir}/src/engine/libgncmod-engine.la \
  ${top_builddir}/src/core-utils/libcore-utils.la \
  ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_builddir}/lib/glib26/libgncglib.la \
+  ${GLIB26_LIBS} \
  ${GNOME_LIBS} \
  ${GLADE_LIBS} \
  ${QOF_LIBS} \
@ -57,7 +62,7 @@ glade_DATA = \
  import-provider-format.glade

 AM_CFLAGS = \
-  -I${top_srcdir}/lib/glib26 \
+  ${GLIB26_INC} \
  -I${top_srcdir}/src \
  -I${top_srcdir}/src/core-utils \
  -I${top_srcdir}/src/engine \
--- a/src/import-export/log-replay/Makefile.am
+++ b/src/import-export/log-replay/Makefile.am
@ -1,3 +1,8 @@
+if !HAVE_GLIB26
+  GLIB26_LIB = ${top_builddir}/lib/glib26/libgncglib.la
+  GLIB26_INC = -I${top_srcdir}/lib/glib26
+endif
+
 SUBDIRS = .

 pkglib_LTLIBRARIES=libgncmod-log-replay.la
@ -17,11 +22,11 @@ libgncmod_log_replay_la_LIBADD = \
  ${top_builddir}/src/engine/libgncmod-engine.la \
  ${top_builddir}/src/core-utils/libcore-utils.la \
  ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_builddir}/lib/glib26/libgncglib.la \
+  ${GLIB26_LIBS} \
  ${GLIB_LIBS} ${QOF_LIBS}

 AM_CFLAGS = \
-  -I${top_srcdir}/lib/glib26 \
+  ${GLIB26_INC} \
  -I${top_srcdir}/src \
  -I${top_srcdir}/src/core-utils \
  -I${top_srcdir}/src/engine \
--- a/src/import-export/ofx/Makefile.am
+++ b/src/import-export/ofx/Makefile.am
@ -1,3 +1,8 @@
+if !HAVE_GLIB26
+  GLIB26_LIB = ${top_builddir}/lib/glib26/libgncglib.la
+  GLIB26_INC = -I${top_srcdir}/lib/glib26
+endif
+
 SUBDIRS = . test

 pkglib_LTLIBRARIES=libgncmod-ofx.la
@ -18,13 +23,13 @@ libgncmod_ofx_la_LIBADD = \
  ${top_builddir}/src/engine/libgncmod-engine.la \
  ${top_builddir}/src/core-utils/libcore-utils.la \
  ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_builddir}/lib/glib26/libgncglib.la \
+  ${GLIB26_LIBS} \
  ${QOF_LIBS} \
  ${GLIB_LIBS} \
  ${LIBOFX_LIBS}

 AM_CFLAGS = \
-  -I${top_srcdir}/lib/glib26 \
+  ${GLIB26_INC} \
  -I${top_srcdir}/src \
  -I${top_srcdir}/src/core-utils \
  -I${top_srcdir}/src/engine \
--- a/src/import-export/qif-import/Makefile.am
+++ b/src/import-export/qif-import/Makefile.am
@ -1,3 +1,8 @@
+if !HAVE_GLIB26
+  GLIB26_LIB = ${top_builddir}/lib/glib26/libgncglib.la
+  GLIB26_INC = -I${top_srcdir}/lib/glib26
+endif
+
 SUBDIRS = . test

 pkglib_LTLIBRARIES=libgncmod-qif-import.la
@ -23,7 +28,7 @@ libgncmod_qif_import_la_LIBADD = \
  ${top_builddir}/src/core-utils/libcore-utils.la \
  ${top_builddir}/src/engine/libgncmod-engine.la \
  ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_builddir}/lib/glib26/libgncglib.la \
+  ${GLIB26_LIBS} \
  ${G_WRAP_LINK_ARGS} \
  ${GUILE_LIBS} \
  ${GNOME_LIBS} \
@ -52,7 +57,7 @@ gladedir = ${GNC_GLADE_DIR}
 glade_DATA = qif.glade

 AM_CFLAGS = \
-  -I${top_srcdir}/lib/glib26 \
+  ${GLIB26_INC} \
  -I${top_srcdir}/src \
  -I${top_srcdir}/src/core-utils \
  -I${top_srcdir}/src/engine \
--- a/src/report/report-gnome/Makefile.am
+++ b/src/report/report-gnome/Makefile.am
@ -1,3 +1,8 @@
+if !HAVE_GLIB26
+  GLIB26_LIB = ${top_builddir}/lib/glib26/libgncglib.la
+  GLIB26_INC = -I${top_srcdir}/lib/glib26
+endif
+
 SUBDIRS = .
 # test -- removed 'test' from SUBDIRS by jsled 2004.05.02 .. I don't know how
 # to get the test-link-mumble to link correctly; plz assist.
@ -14,7 +19,7 @@ AM_CFLAGS = \
  -I${top_srcdir}/src/gnome-utils \
  -I${top_srcdir}/src/gnome \
  -I${top_srcdir}/src/report/report-system \
-  -I${top_srcdir}/lib/glib26 \
+  ${GLIB26_INC} \
  ${GLADE_CFLAGS} \
  ${GUILE_INCS} \
  ${GTKHTML_CFLAGS} \
@ -44,7 +49,7 @@ libgncmod_report_gnome_la_LIBADD = \
  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
  ${top_builddir}/src/report/report-system/libgncmod-report-system.la \
-  ${top_builddir}/lib/glib26/libgncglib.la \
+  ${GLIB26_LIBS} \
  ${GLADE_LIBS} \
  ${G_WRAP_LINK_ARGS} \
  ${GUILE_LIBS} \
--- a/src/report/stylesheets/Makefile.am
+++ b/src/report/stylesheets/Makefile.am
@ -1,3 +1,8 @@
+if !HAVE_GLIB26
+  GLIB26_LIB = ${top_builddir}/lib/glib26/libgncglib.la
+  GLIB26_INC = -I${top_srcdir}/lib/glib26
+endif
+
 SUBDIRS = . test

 pkglib_LTLIBRARIES = libgncmod-stylesheets.la
@ -16,13 +21,13 @@ libgncmod_stylesheets_la_LIBADD = \
  ${top_builddir}/src/report/report-system/libgncmod-report-system.la \
  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
  ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_builddir}/lib/glib26/libgncglib.la \
+  ${GLIB26_LIBS} \
  ${QOF_LIBS} \
  ${GUILE_LIBS} \
  ${GLIB_LIBS}

 AM_CFLAGS = \
-  -I${top_srcdir}/lib/glib26 \
+  ${GLIB26_INC} \
  -I${top_srcdir}/src \
  -I${top_srcdir}/src/engine \
  -I${top_srcdir}/src/gnc-module \