Move the GLIB26 compatibility checks to configure.in.

Just modify GLIB_LIBS and GLIB_CFLAGS so everyone properly links against the glib26 compatibility library when necessary. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14330 57a11ea4-9604-0410-9ed3-97b8803252fd
2025-02-25 18:55:30 -06:00 · 2006-06-05 03:39:54 +00:00
parent d982c50662
commit 3366829dc2
18 changed files with 17 additions and 108 deletions
--- a/12
+++ b/12
@@ -1,4 +1,12 @@
-2006-05-04  David Hampton  <hampton@employees.org>
+2006-06-04  Derek Atkins  <derek@ihtfp.com>
+
+	* configure.in:
+	* various Makefile.am files:
+	  Move the GLIB26 compatibility checks to configure.in.
+	  Just modify GLIB_LIBS and GLIB_CFLAGS so everyone properly
+	  links against the glib26 compatibility library when necessary.
+
+2006-06-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.
@@ -10,7 +18,7 @@
 	explicitly declaring a data type. This prevents include file
 	ordering problems.

-2006-05-04  Derek Atkins  <derek@ihtfp.com>
+2006-06-04  Derek Atkins  <derek@ihtfp.com>

 	* src/gnome-utils/gnc-plugin-file-history.c:
 	  swap the #includes so it builds on FC3 w/ glib-2.4
--- a/configure.in
+++ b/configure.in
@@ -154,7 +154,11 @@ then
  AC_DEFINE(HAVE_GLIB26,1,[System has glib 2.6.0 or better])
  HAVE_GLIB26=yes
 else
+  GLIB24_LIBS="$GLIB_LIBS"
+  GLIB_LIBS="\${top_builddir}/lib/glib26/libgncglib.la $GLIB_LIBS"
+  GLIB_CFLAGS="-I\${top_srcdir}/lib/glib26 $GLIB_CFLAGS"
  AC_MSG_RESULT(no)
+  AC_SUBST(GLIB24_LIBS)
 fi
 AM_CONDITIONAL(HAVE_GLIB26, test "x$HAVE_GLIB26" = "xyes" )

--- a/lib/glib26/Makefile.am
+++ b/lib/glib26/Makefile.am
@@ -9,7 +9,7 @@ else
 libgncglib_la_SOURCES = $(REALSRCS)
 endif

-libgncglib_la_LIBADD = ${GLIB_LIBS}
+libgncglib_la_LIBADD = ${GLIB24_LIBS}

 AM_CFLAGS = ${GLIB_CFLAGS}

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

@@ -14,7 +9,6 @@ AM_CFLAGS = \
  -I${top_srcdir}/src/calculation \
  -I${top_srcdir}/src/core-utils \
  -I${top_srcdir}/src/engine \
-  ${GLIB26_INC} \
  ${GUILE_INCS} \
  ${G_WRAP_COMPILE_ARGS} \
  ${GLIB_CFLAGS} \
@@ -79,7 +73,6 @@ 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 \
-  ${GLIB26_LIBS} \
  ${GCONF_LIBS} \
  ${GTK_LIBS} \
  ${G_WRAP_LINK_ARGS} \
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,8 +1,3 @@
-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

@@ -13,7 +8,6 @@ AM_CFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
  -DDATADIR=\"${GNC_SHAREDIR}\" \
  -DLIBDIR=\"${GNC_LIBDIR}\" \
  -DGNC_HELPDIR=\"${GNC_HELPDIR}\" \
-  ${GLIB26_INC} \
  -I${top_srcdir}/src \
  -I${top_srcdir}/src/core-utils \
  -I${top_srcdir}/src/app-utils \
@@ -27,7 +21,6 @@ bin_PROGRAMS = gnucash-bin
 gnucash_bin_SOURCES = gnucash-bin.c
 gnucash_bin_LDADD = ${GUILE_LIBS} ${GLIB_LIBS} ${GNOME_LIBS} ${GTK_LIBS} \
 ${QOF_LIBS} \
-${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,8 +1,3 @@
-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)

@@ -32,8 +27,7 @@ AM_CFLAGS = \
  ${QOF_CFLAGS} \
  -I${top_srcdir}/src/register/register-core \
  -I${top_srcdir}/src/register/register-gnome \
-  -I${top_srcdir}/src/register/ledger-core \
-  ${GLIB26_INC}
+  -I${top_srcdir}/src/register/ledger-core

 libgncmod_business_gnome_la_SOURCES = \
  businessmod-gnome.c \
@@ -92,7 +86,6 @@ libgncmod_business_gnome_la_LIBADD = \
  ${GUILE_LIBS} \
  ${GLIB_LIBS} \
  ${QOF_LIBS} \
-  ${GLIB26_LIBS} \
  ${EFENCE_LIBS}


--- a/src/business/dialog-tax-table/Makefile.am
+++ b/src/business/dialog-tax-table/Makefile.am
@@ -1,14 +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-dialog-tax-table.la libgw-dialog-tax-table.la

 AM_CFLAGS = \
-  ${GLIB26_INC} \
  -I${top_srcdir}/src \
  -I${top_srcdir}/src/core-utils \
  -I${top_srcdir}/src/engine \
@@ -40,7 +34,6 @@ 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 \
-  ${GLIB26_LIBS} \
  ${GLADE_LIBS} \
  ${GUILE_LIBS} \
  ${GNOME_LIBS} \
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@@ -1,8 +1,3 @@
-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

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

 libcore_utils_la_LIBADD = \
-  ${GLIB26_LIBS} \
  ${GLIB_LIBS} \
  ${GCONF_LIBS} \
  ${GTK_LIBS}
@@ -40,7 +34,6 @@ noinst_HEADERS = \
 EXTRA_DIST = ${gwmod_DATA}

 AM_CFLAGS = \
-  ${GLIB26_INC} \
  ${G_WRAP_COMPILE_ARGS} \
  ${GUILE_INCS} \
  ${GLIB_CFLAGS} \
--- a/src/gnome-search/Makefile.am
+++ b/src/gnome-search/Makefile.am
@@ -1,8 +1,3 @@
-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
@@ -15,7 +10,6 @@ AM_CFLAGS = \
  -I${top_srcdir}/src/gnome-utils \
  -I${top_srcdir}/src/gnc-module \
  -I${top_srcdir}/src/business/business-core \
-  ${GLIB26_INC} \
  ${G_WRAP_COMPILE_ARGS} \
  ${GUILE_INCS} \
  ${GTKHTML_CFLAGS} \
@@ -61,7 +55,6 @@ 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 \
-  ${GLIB26_LIBS} \
  ${GUILE_LIBS} \
  ${GNOME_LIBS} \
  ${GTKHTML_LIBS} \
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -1,8 +1,3 @@
-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)

@@ -22,7 +17,6 @@ AM_CFLAGS = \
  -I${top_srcdir}/src/network-utils \
  -I${top_srcdir}/src/app-utils \
  -I${top_srcdir}/src \
-  ${GLIB26_INC} \
  ${GLIB_CFLAGS} \
  ${GLADE_CFLAGS} \
  ${GTK_CFLAGS} \
@@ -189,7 +183,6 @@ 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 \
-  ${GLIB26_LIBS} \
  ${GNOME_LIBS} \
  ${GNOME_PRINT_LIBS} \
  ${GTKHTML_LIBS} \
--- a/src/gnome-utils/test/Makefile.am
+++ b/src/gnome-utils/test/Makefile.am
@@ -1,8 +1,3 @@
-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

@@ -44,7 +39,6 @@ INCLUDES= \
  -I${top_srcdir}/src/gnome-utils \
  -I${top_srcdir}/src/gnc-module \
  -I${top_srcdir}/src/app-utils \
-  ${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,8 +1,3 @@
-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 
@@ -25,7 +20,6 @@ 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 \
-  ${GLIB26_LIBS} \
  ${GLADE_LIBS} \
  ${G_WRAP_LINK_ARGS} \
  ${GUILE_LIBS} ${GNOME_LIBS} ${GLIB_LIBS} ${QOF_LIBS}
@@ -128,7 +122,6 @@ AM_CFLAGS = \
  -I${top_srcdir}/src/register/register-gnome \
  -I${top_srcdir}/src/report/report-system \
  -I${top_srcdir}/src/report/report-gnome \
-  ${GLIB26_INC} \
  -I${top_srcdir}/lib/libc \
  ${GUILE_INCS} \
  ${G_WRAP_COMPILE_ARGS} \
@@ -137,6 +130,7 @@ AM_CFLAGS = \
  ${GDK_PIXBUF_CFLAGS} \
  ${GTKHTML_CFLAGS} \
  ${GLADE_CFLAGS} \
+  $(GLIB_CFLAGS) \
  ${QOF_CFLAGS}

 # We build this in an earlier directory.
--- a/src/import-export/Makefile.am
+++ b/src/import-export/Makefile.am
@@ -1,8 +1,3 @@
-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 \
@@ -50,7 +45,6 @@ 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 \
-  ${GLIB26_LIBS} \
  ${GNOME_LIBS} \
  ${GLADE_LIBS} \
  ${QOF_LIBS} \
@@ -62,7 +56,6 @@ glade_DATA = \
  import-provider-format.glade

 AM_CFLAGS = \
-  ${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,8 +1,3 @@
-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
@@ -22,11 +17,9 @@ 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 \
-  ${GLIB26_LIBS} \
  ${GLIB_LIBS} ${QOF_LIBS}

 AM_CFLAGS = \
-  ${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,8 +1,3 @@
-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
@@ -23,13 +18,11 @@ 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 \
-  ${GLIB26_LIBS} \
  ${QOF_LIBS} \
  ${GLIB_LIBS} \
  ${LIBOFX_LIBS}

 AM_CFLAGS = \
-  ${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,8 +1,3 @@
-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
@@ -28,7 +23,6 @@ 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 \
-  ${GLIB26_LIBS} \
  ${G_WRAP_LINK_ARGS} \
  ${GUILE_LIBS} \
  ${GNOME_LIBS} \
@@ -57,7 +51,6 @@ gladedir = ${GNC_GLADE_DIR}
 glade_DATA = qif.glade

 AM_CFLAGS = \
-  ${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,8 +1,3 @@
-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.
@@ -19,7 +14,6 @@ AM_CFLAGS = \
  -I${top_srcdir}/src/gnome-utils \
  -I${top_srcdir}/src/gnome \
  -I${top_srcdir}/src/report/report-system \
-  ${GLIB26_INC} \
  ${GLADE_CFLAGS} \
  ${GUILE_INCS} \
  ${GTKHTML_CFLAGS} \
@@ -49,7 +43,6 @@ 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 \
-  ${GLIB26_LIBS} \
  ${GLADE_LIBS} \
  ${G_WRAP_LINK_ARGS} \
  ${GUILE_LIBS} \
--- a/src/report/stylesheets/Makefile.am
+++ b/src/report/stylesheets/Makefile.am
@@ -1,8 +1,3 @@
-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
@@ -21,13 +16,11 @@ 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 \
-  ${GLIB26_LIBS} \
  ${QOF_LIBS} \
  ${GUILE_LIBS} \
  ${GLIB_LIBS}

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