gnucash-on-osx: New Branch 'master'
John Ralls
jralls at code.gnucash.org
Thu Oct 29 14:37:56 EDT 2015
New branch 'master' created at https://github.com/Gnucash/gnucash-on-osx/commit/5bc6bcd9 (commit)
commit 5bc6bcd9835edb38aec140104a0a08ce4be7dc45
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 15 12:37:39 2015 -0700
Bug 756562 - GNUCash for MacOSX contains symbolic link to files under /Users/john/Development
The links aren't used, so just remove them.
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index d90e226..b86136c 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -133,10 +133,6 @@
</data>
<data>
- ${prefix}/etc/fonts
- </data>
-
- <data>
${prefix}/share/glib-2.0/schemas
</data>
commit 5c50791923f58a7d06e9b06221596c8be5937a22
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Oct 5 15:54:37 2015 -0700
Release 2.6.9
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 2a23e91..20defd7 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.6.8 © 2015 Gnucash Contributors</string>
+ <string>Gnucash version 2.6.9 © 2015 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.6.8 © 2015 Gnucash Contributors</string>
+ <string>2.6.9 © 2015 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.6.8</string>
+ <string>2.6.9</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.6.8</string>
+ <string>2.6.9</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index e2a2ac8..a5d9870 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -220,7 +220,7 @@
<autotools id="gnucash"
autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-dbi-dbd-dir=$PREFIX/lib/dbd --with-html-engine='webkit'">
- <branch module="gnucash/stable/gnucash-2.6.8.tar.bz2" version="2.6.8"
+ <branch module="gnucash/stable/gnucash-2.6.9.tar.bz2" version="2.6.9"
repo="sourceforge">
</branch>
<dependencies>
@@ -280,8 +280,8 @@
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs=" html" makeinstallargs="install-html" >
- <branch module="gnucash/gnucash-docs/gnucash-docs-2.6.8.tar.gz"
- version="2.6.8" repo="sourceforge"/>
+ <branch module="gnucash/gnucash-docs/gnucash-docs-2.6.9.tar.gz"
+ version="2.6.9" repo="sourceforge"/>
</autotools>
<autotools id="scrollkeeper" autogen-sh="configure">
commit 7c0e9df0cb8a7c247da6a2a9f8bae85245a33eb2
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Sep 26 15:54:58 2015 -0700
Release 2.6.8
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 1830526..2a23e91 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.6.7 © 2015 Gnucash Contributors</string>
+ <string>Gnucash version 2.6.8 © 2015 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.6.7 © 2015 Gnucash Contributors</string>
+ <string>2.6.8 © 2015 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.6.7</string>
+ <string>2.6.8</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.6.7</string>
+ <string>2.6.8</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 0b43843..e2a2ac8 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -220,7 +220,7 @@
<autotools id="gnucash"
autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-dbi-dbd-dir=$PREFIX/lib/dbd --with-html-engine='webkit'">
- <branch module="gnucash/stable/gnucash-2.6.7.tar.bz2" version="2.6.7"
+ <branch module="gnucash/stable/gnucash-2.6.8.tar.bz2" version="2.6.8"
repo="sourceforge">
</branch>
<dependencies>
@@ -280,8 +280,8 @@
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs=" html" makeinstallargs="install-html" >
- <branch module="gnucash/gnucash-docs/gnucash-docs-2.6.7.tar.gz"
- version="2.6.7" repo="sourceforge"/>
+ <branch module="gnucash/gnucash-docs/gnucash-docs-2.6.8.tar.gz"
+ version="2.6.8" repo="sourceforge"/>
</autotools>
<autotools id="scrollkeeper" autogen-sh="configure">
commit f02837fbec07348678cff56d8295539d82456dfa
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 28 08:16:13 2015 -0700
Add doc update to release.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 21cdded..0b43843 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -280,8 +280,8 @@
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs=" html" makeinstallargs="install-html" >
- <branch module="gnucash/gnucash-docs/gnucash-docs-2.6.6.tar.gz"
- version="2.6.6" repo="sourceforge"/>
+ <branch module="gnucash/gnucash-docs/gnucash-docs-2.6.7.tar.gz"
+ version="2.6.7" repo="sourceforge"/>
</autotools>
<autotools id="scrollkeeper" autogen-sh="configure">
commit b8de89ba73f09239513a981a641c04c12c254d4e
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 28 08:13:33 2015 -0700
Release GnuCash 2.6.7
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index e4b53b6..1830526 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.6.6 © 2014 Gnucash Contributors</string>
+ <string>Gnucash version 2.6.7 © 2015 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.6.6 © 2014 Gnucash Contributors</string>
+ <string>2.6.7 © 2015 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.6.6</string>
+ <string>2.6.7</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.6.6</string>
+ <string>2.6.7</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index ca18cdc..21cdded 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -199,7 +199,7 @@
</autotools>
<!-- Goffice-0.9 is for Gtk3 -->
- <autotools id="goffice" autogenargs="--without-gconf" autogen-sh="configure">
+ <autotools id="goffice" autogen-sh="configure">
<branch module="goffice/0.8/goffice-0.8.17.tar.xz" version="0.8.17"
hash="sha256:165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15">
<patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/goffice-gsize.patch" strip="1"/>
@@ -220,7 +220,7 @@
<autotools id="gnucash"
autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-dbi-dbd-dir=$PREFIX/lib/dbd --with-html-engine='webkit'">
- <branch module="gnucash/stable/gnucash-2.6.6.tar.bz2" version="2.6.6"
+ <branch module="gnucash/stable/gnucash-2.6.7.tar.bz2" version="2.6.7"
repo="sourceforge">
</branch>
<dependencies>
commit 1c18772ae6418d512843bafa624767a0f12f7011
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Apr 14 13:57:08 2015 -0700
Make webkit/webkit1.6 soft dependencies for gnucash, add meta-gnucash
In order to build different webkit modules depending on SDK: 1.10 won't
build on Leopard so use 1.6 in that case, but 1.6 won't build on
Yosemite.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 940dd1e..d4b2cd6 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -12,10 +12,12 @@ prefix = os.path.join(os.environ["HOME"], "gnucash-stable")
#prefix = os.path.join(os.environ["HOME"], "gnucash-unstable")
#Select which modules to build. The only difference is which gnucash
-#module (and all of the dependencies, see above) get built:
-modules = ["meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash"]
-#modules = ["meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash-unstable"]
-#modules = ["meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash-svn"]
+#module (and all of the dependencies, see above) get built. N.B.: If
+#you are building with/for OS X 10.5, append "Leopard" to the
+#meta-gnucash module name, e.g. meta-gnucash-stable-Leopard."
+modules = ["meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "meta-gnucash-stable"]
+#modules = ["meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "meta-gnucash-unstable"]
+#modules = ["meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "meta-gnucash-git"]
#Setup the build. PPC users will need to replace "i386" with
#"ppc". Don't try to do a universal build, it doesn't work. x86_64 is
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 304ceb8..ca18cdc 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -211,7 +211,7 @@
</dependencies>
</autotools>
-<!--./b2 toolset=darwin address_model=32 cxxflags=$CXXFLAGS cflags=$CFLAGS compileflags=$CPPFLAGS linkflags=$LDFLAGS - -prefix=$PREFIX - -build-dir=$PREFIX/../build/boost_1_56_0-->
+<!--./b2 toolset=darwin address_model=32 cxxflags="$CPPFLAGS" cflags="$CPPFLAGS" linkflags="$LDFLAGS: -\-prefix=$PREFIX -\-build-dir=$PREFIX/../build/boost_1_56_0-->
<autotools id="boost" supports-non-srcdir-builds="no">
<branch module="boost/boost_1_56_0.tar.bz2" repo="sourceforge"
version="1.56.0"/>
@@ -228,13 +228,16 @@
<dep package="libofx"/>
<dep package="aqbanking"/>
<dep package="libgnomecanvas"/>
- <dep package="meta-gtk-osx-webkit1.6"/>
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="shared-mime-info"/>
<dep package="iso-codes"/>
<dep package="guile2"/>
</dependencies>
+ <after>
+ <dep package="meta-gtk-osx-webkit1.6"/>
+ <dep package="meta-gtk-osx-webkit"/>
+ </after>
</autotools>
@@ -249,7 +252,6 @@
<dep package="libofx"/>
<dep package="aqbanking"/>
<dep package="libgnomecanvas"/>
- <dep package="meta-gtk-osx-webkit"/>
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="shared-mime-info"/>
@@ -258,6 +260,10 @@
<dep package="swig"/>
<dep package="boost"/>
</dependencies>
+ <after>
+ <dep package="meta-gtk-osx-webkit1.6"/>
+ <dep package="meta-gtk-osx-webkit"/>
+ </after>
</autotools>
@@ -286,4 +292,45 @@
</dependencies>
</autotools>
+ <metamodule id="meta-gnucash-stable">
+ <dependencies>
+ <dep package="gnucash"/>
+ <dep package="meta-gtk-osx-webkit"/>
+ </dependencies>
+ </metamodule>
+
+ <metamodule id="meta-gnucash-stable-Leopard">
+ <dependencies>
+ <dep package="gnucash"/>
+ <dep package="meta-gtk-osx-webkit1.6"/>
+ </dependencies>
+ </metamodule>
+
+ <metamodule id="meta-gnucash-unstable">
+ <dependencies>
+ <dep package="gnucash-unstable"/>
+ <dep package="meta-gtk-osx-webkit"/>
+ </dependencies>
+ </metamodule>
+
+ <metamodule id="meta-gnucash-unstable-Leopard">
+ <dependencies>
+ <dep package="gnucash-unstable"/>
+ <dep package="meta-gtk-osx-webkit1.6"/>
+ </dependencies>
+ </metamodule>
+
+ <metamodule id="meta-gnucash-git">
+ <dependencies>
+ <dep package="gnucash-git"/>
+ <dep package="meta-gtk-osx-webkit"/>
+ </dependencies>
+ </metamodule>
+ <metamodule id="meta-gnucash-git-Leopard">
+ <dependencies>
+ <dep package="gnucash-git"/>
+ <dep package="meta-gtk-osx-webkit1.6"/>
+ </dependencies>
+ </metamodule>
+
</moduleset>
commit 73ee1cf085062f9a53b4071be58492da78349d19
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 5 16:15:10 2015 -0700
Repair gwen patch for whitespace changes.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 3b91d17..304ceb8 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -47,7 +47,7 @@
autogenargs="--with-guis=gtk2 --enable-local-install">
<branch module="gnucash/Dependencies/gwenhywfar-4.13.1.tar.gz" version="4.13.1"
repo="sourceforge">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='0'/>
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='1'/>
</branch>
<dependencies>
<dep package="libgcrypt"/>
diff --git a/patches/gwen-macos-bundle-path.patch b/patches/gwen-macos-bundle-path.patch
index 9c57e2c..5a2c027 100644
--- a/patches/gwen-macos-bundle-path.patch
+++ b/patches/gwen-macos-bundle-path.patch
@@ -1,24 +1,15 @@
-Index: src/os/posix/directory.c
-===================================================================
---- src/os/posix/directory.c (revision 2280)
-+++ src/os/posix/directory.c (working copy)
-@@ -28,7 +28,7 @@
-
- #include "directory_p.h"
- #if defined(OS_DARWIN) && defined(ENABLE_LOCAL_INSTALL)
--# include <CoreFoundation/CFBundle.h>
-+# include <mach-o/dyld.h>
- # include <sys/param.h>
- #else
- # include "binreloc.h"
+diff -c /Users/john/Development/Gnucash-Build/Gnucash-2.6-Leopard/src/gwenhywfar-4.12.0beta/src/os/posix/directory.c /Users/john/Development/Gnucash-Build/Gnucash-2.6-Leopard/src/gwenhywfar-4.13.1/src/os/posix/directory.c
+--- a/src/os/posix/directory.c Sun Mar 29 10:22:05 2015
++++ b/src/os/posix/directory.c Sat Dec 20 14:36:01 2014
@@ -229,9 +229,10 @@
/* remove "/bin/" or "MacOS" from path */
s=strrchr(realbuffer, '/');
if (s) {
- if (strcasecmp(s, "/bin")==0 ||
-- strcasecmp(s, "/MacOS")==0)
+- strcasecmp(s, "/MacOS")==0)
+- *s=0;
+ if (strcasecmp(s, "/bin")==0)
- *s=0;
++ *s=0;
+ if (strcasecmp(s, "/MacOS")==0)
+ strcpy(s, "/Resources");
}
commit 042a6a5986c10c07547767420f9937ef97faad68
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 3 14:03:57 2015 -0700
Remove GNC_DBD_DIR from the launcher, it's no longer required.
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 9f4bba2..c4d2872 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -77,7 +77,6 @@ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
export DYLD_FRAMEWORK_PATH="${bundle_fw}"
export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/scm/gnucash/report/standard-reports"
-#export GNC_DBD_DIR="${bundle_lib}/dbd"
export GSETTINGS_SCHEMA_DIR="${bundle_data}"
export GNC_MODULE_PATH
diff --git a/gnucash-bundler/gnucash.launcher b/gnucash-bundler/gnucash.launcher
index 3f1df4f..c4d2872 100755
--- a/gnucash-bundler/gnucash.launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -77,7 +77,6 @@ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
export DYLD_FRAMEWORK_PATH="${bundle_fw}"
export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/scm/gnucash/report/standard-reports"
-export GNC_DBD_DIR="${bundle_lib}/dbd"
export GSETTINGS_SCHEMA_DIR="${bundle_data}"
export GNC_MODULE_PATH
commit 972075af7b5ad5da89e90154466f8a696f7c25ae
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 3 13:56:47 2015 -0700
Bring unstable bundle & launcher up to date.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 8b09a4b..826aa7f 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -123,7 +123,7 @@
</data>
<data dest="${bundle}/Contents/Resources/lib/">
- ${prefix}/lib/libguile-srfi-srfi-*.la
+ ${prefix}/lib/libgnc-qof.la
</data>
<data dest="${bundle}/Contents/Resources/lib/">
@@ -147,6 +147,10 @@
</data>
<data>
+ ${prefix}/lib/guile
+ </data>
+
+ <data>
${prefix}/share/aqbanking
</data>
@@ -155,6 +159,10 @@
</data>
<data>
+ ${prefix}/share/ktoblzcheck
+ </data>
+
+ <data>
${prefix}/share/libofx
</data>
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 5fec879..9f4bba2 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -34,7 +34,7 @@ export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
if [ `uname -r | cut -d . -f 1` -ge 10 ]; then
export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
fi
-export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
+export GDK_PIXBUF_MODULE_FILE="$bundle_lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
export PANGO_SYSCONFDIR="$bundle_etc"
export PANGO_LIBDIR="$bundle_lib"
@@ -65,10 +65,8 @@ export GUILE_WARN_DEPRECATED
GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
-GUILE_LOAD_PATH="${bundle_data}/guile/1.8/"
-EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/guile-modules"
-EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/scm"
-GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
+GUILE_LIBS="${bundle_data}/guile/2.0/"
+GUILE_COMPILED_LIBS="${bundle_lib}/guile/2.0/ccache"
EXTRA_LIBS="${GNC_MODULE_PATH}"
EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
@@ -78,12 +76,13 @@ EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib/gnucash"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
export DYLD_FRAMEWORK_PATH="${bundle_fw}"
-export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/guile-modules/gnucash/report/standard-reports"
-export GNC_DBD_DIR="${bundle_lib}/dbd"
+export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/scm/gnucash/report/standard-reports"
+#export GNC_DBD_DIR="${bundle_lib}/dbd"
export GSETTINGS_SCHEMA_DIR="${bundle_data}"
export GNC_MODULE_PATH
-export GUILE_LOAD_PATH
+export GUILE_LIBS
+export GUILE_COMPILED_LIBS
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
export GNC_DOT_DIR="$HOME/Library/Application Support/Gnucash"
commit be36f08e77b673039ec019625667a7f9c6149ac6
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 3 13:56:26 2015 -0700
Bump docs to 2.6.6 to match the package.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index fa6d1cc..3b91d17 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -274,8 +274,8 @@
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs=" html" makeinstallargs="install-html" >
- <branch module="gnucash/gnucash-docs/gnucash-docs-2.6.5.tar.gz"
- version="2.6.5" repo="sourceforge"/>
+ <branch module="gnucash/gnucash-docs/gnucash-docs-2.6.6.tar.gz"
+ version="2.6.6" repo="sourceforge"/>
</autotools>
<autotools id="scrollkeeper" autogen-sh="configure">
commit b47da79b1bd560e308229fd6575a29b75d25c5ac
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 29 14:04:26 2015 -0700
Use Webkit 1.6 for Leopard compatibility.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index e6eccf5..fa6d1cc 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -228,7 +228,7 @@
<dep package="libofx"/>
<dep package="aqbanking"/>
<dep package="libgnomecanvas"/>
- <dep package="meta-gtk-osx-webkit"/>
+ <dep package="meta-gtk-osx-webkit1.6"/>
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="shared-mime-info"/>
commit 9a6a39598e43c88d7d01cfa331916555378213e7
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 29 14:03:46 2015 -0700
Fix typo in aqbanking tarball name.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index f3d2ba1..e6eccf5 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -84,7 +84,7 @@
<autotools id="aqbanking" autogen-sh="configure" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="gnucash/Dependencies/aqbanking-5.5.1..tar.gz" version="5.5.1"
+ <branch module="gnucash/Dependencies/aqbanking-5.5.1.tar.gz" version="5.5.1"
repo="sourceforge"/>
<dependencies>
<dep package="gwenhywfar"/>
commit f6605d7d33e17c007b70b81bd906d535dd87a32a
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 28 10:52:19 2015 +0900
Update for 2.6.6 release.
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 80fab5d..e4b53b6 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.6.5 © 2014 Gnucash Contributors</string>
+ <string>Gnucash version 2.6.6 © 2014 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.6.5 © 2014 Gnucash Contributors</string>
+ <string>2.6.6 © 2014 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.6.5</string>
+ <string>2.6.6</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.6.5</string>
+ <string>2.6.6</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
@@ -60,7 +60,7 @@
<key>LSRequiresCarbon</key>
<true/>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2014 Gnucash Contributors</string>
+ <string>Copyright 2015 Gnucash Contributors</string>
<key>NSHighResolutionCapable</key>
<true/>
</dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 961c676..f3d2ba1 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -35,7 +35,7 @@
<!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
<autotools id="libchipcard" autogen-sh="configure" >
- <branch module="gnucash/Dependencies/libchipcard-5.0.2.tar.gz" version="5.0.2"
+ <branch module="gnucash/Dependencies/libchipcard-5.0.3beta.tar.gz" version="5.0.3"
repo="sourceforge" />
<dependencies>
<dep package="libgcrypt"/>
@@ -45,7 +45,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis=gtk2 --enable-local-install">
- <branch module="gnucash/Dependencies/gwenhywfar-4.12.0beta.tar.gz" version="4.12.0"
+ <branch module="gnucash/Dependencies/gwenhywfar-4.13.1.tar.gz" version="4.13.1"
repo="sourceforge">
<patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='0'/>
</branch>
@@ -84,7 +84,7 @@
<autotools id="aqbanking" autogen-sh="configure" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="gnucash/Dependencies/aqbanking-5.5.0.2-git.tar.gz" version="5.5.0.2"
+ <branch module="gnucash/Dependencies/aqbanking-5.5.1..tar.gz" version="5.5.1"
repo="sourceforge"/>
<dependencies>
<dep package="gwenhywfar"/>
@@ -211,6 +211,7 @@
</dependencies>
</autotools>
+<!--./b2 toolset=darwin address_model=32 cxxflags=$CXXFLAGS cflags=$CFLAGS compileflags=$CPPFLAGS linkflags=$LDFLAGS - -prefix=$PREFIX - -build-dir=$PREFIX/../build/boost_1_56_0-->
<autotools id="boost" supports-non-srcdir-builds="no">
<branch module="boost/boost_1_56_0.tar.bz2" repo="sourceforge"
version="1.56.0"/>
@@ -219,7 +220,7 @@
<autotools id="gnucash"
autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-dbi-dbd-dir=$PREFIX/lib/dbd --with-html-engine='webkit'">
- <branch module="gnucash/stable/gnucash-2.6.5.tar.bz2" version="2.6.5"
+ <branch module="gnucash/stable/gnucash-2.6.6.tar.bz2" version="2.6.6"
repo="sourceforge">
</branch>
<dependencies>
commit b45f2172c99b75411e398682460a82563d4e6f2d
Merge: d68e836 ffdb19c
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Mar 12 08:48:37 2015 +0900
Merge pull request #4 from jeffsf/patch-xmlsec
Use the GNOME repo for xmlsec
Much better to use an official source.
commit ffdb19c2f37cc41f373b9b257f16d90c8ea4a20c
Author: Jeff Kletsky <git-commits at allycomm.com>
Date: Tue Mar 10 18:16:43 2015 -0700
Use the GNOME repo for xmlsec
The previous repository for xmlsec no longer exists
(mogigoma/xmlsec)
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index eaeff48..961c676 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -76,7 +76,7 @@
</autotools>
<autotools id="xmlsec">
- <branch module="mogigoma/xmlsec" repo="github"/>
+ <branch module="GNOME/xmlsec" repo="github"/>
<dependencies>
<dep package="openssl"/>
</dependencies>
commit d68e836fee0ac7df32e81c27ac0716ff2aa06089
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Feb 28 11:46:18 2015 -0800
Remove no-longer-needed skip.removes of gmp and guile.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 422d093..940dd1e 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -37,8 +37,6 @@ moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnuca
#module_extra_env["mysql"] = { "CMAKE_INSTALL_PREFIX": prefix }
#append_autogenargs("libdbi-drivers", "--with-mysql --with-mysql-incdir=" + prefix + "/include --with-mysql-libdir=" + prefix + "/lib")
-skip.remove("gmp")
-skip.remove("guile")
append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
append_autogenargs("libgnomeui", "--disable-static --enable-shared --disable-scrollkeeper --disable-xlib --without-x")
append_autogenargs("scrollkeeper", "--with-xml-catalog=" + os.path.join(prefix, "etc/xml/catalog"))
commit 774567480547a6d9a001ef0792c2fba6a30886e1
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 21 11:08:22 2014 -0800
Work with Guile variables in etc/gnucash/environment.
Instead of trying to manipulate them directly, only to be overridden.
diff --git a/gnucash-bundler/gnucash.launcher b/gnucash-bundler/gnucash.launcher
index 2fbd422..3f1df4f 100755
--- a/gnucash-bundler/gnucash.launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -65,11 +65,8 @@ export GUILE_WARN_DEPRECATED
GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
-GUILE_LOAD_PATH="${bundle_data}/guile/2.0/"
-EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/guile-modules"
-EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/scm"
-GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
-GUILE_LOAD_COMPILED_PATH="${bundle_lib}/guile/2.0/ccache:${bundle_data}/gnucash/scm/ccache/2.0:${GUILE_LOAD_COMPILED_PATH}"
+GUILE_LIBS="${bundle_data}/guile/2.0/"
+GUILE_COMPILED_LIBS="${bundle_lib}/guile/2.0/ccache"
EXTRA_LIBS="${GNC_MODULE_PATH}"
EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
@@ -84,8 +81,8 @@ export GNC_DBD_DIR="${bundle_lib}/dbd"
export GSETTINGS_SCHEMA_DIR="${bundle_data}"
export GNC_MODULE_PATH
-export GUILE_LOAD_PATH
-export GUILE_LOAD_COMPILED_PATH
+export GUILE_LIBS
+export GUILE_COMPILED_LIBS
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
export GNC_DOT_DIR="$HOME/Library/Application Support/Gnucash"
commit 43a123eb82d5a7061abfde8d8e2951723edc39ce
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 21 09:53:58 2014 -0800
Some bundle and launcher tweaks to get the precompiled guile modules to work.
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index b8947af..d90e226 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -122,8 +122,10 @@
${prefix}/etc/gnucash
</data>
+ <!-- Yes, this case is covered by the next one, but it raises an
+ error if it's missing. -->
<data dest="${bundle}/Contents/Resources/lib/">
- ${prefix}/lib/libguile-srfi-srfi-*.la
+ ${prefix}/lib/libgnc-qof.la
</data>
<data dest="${bundle}/Contents/Resources/lib/">
diff --git a/gnucash-bundler/gnucash.launcher b/gnucash-bundler/gnucash.launcher
index f05da7e..2fbd422 100755
--- a/gnucash-bundler/gnucash.launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -69,7 +69,7 @@ GUILE_LOAD_PATH="${bundle_data}/guile/2.0/"
EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/guile-modules"
EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/scm"
GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
-GUILE_LOAD_COMPILED_PATH="${bundle_data}/gnucash/scm/ccache:${bundle_lib}/guile/2.0/ccache:${GUILE_LOAD_COMPILED_PATH}"
+GUILE_LOAD_COMPILED_PATH="${bundle_lib}/guile/2.0/ccache:${bundle_data}/gnucash/scm/ccache/2.0:${GUILE_LOAD_COMPILED_PATH}"
EXTRA_LIBS="${GNC_MODULE_PATH}"
EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
@@ -79,7 +79,7 @@ EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib/gnucash"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
export DYLD_FRAMEWORK_PATH="${bundle_fw}"
-export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/scm/report/standard-reports"
+export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/scm/gnucash/report/standard-reports"
export GNC_DBD_DIR="${bundle_lib}/dbd"
export GSETTINGS_SCHEMA_DIR="${bundle_data}"
commit 96b7437ef2fbac4e393dae38087273a8f997b1e6
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 21 09:52:41 2014 -0800
Change openssl to 1.0.1j, which doesn't need patching and likely is more secure.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 9667375..eaeff48 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -72,7 +72,7 @@
<autotools id="openssl" autogen-sh="Configure"
autogen-template="%(srcdir)s/Configure --prefix=%(prefix)s darwin-i386-cc"
supports-non-srcdir-builds="no">
- <branch module="openssl-0.9.8x.tar.gz" version="0.9.8x" repo="openssl"/>
+ <branch module="openssl-1.0.1j.tar.gz" version="1.0.1j" repo="openssl"/>
</autotools>
<autotools id="xmlsec">
commit 627ac0b7a724da1c35f878505939a605419cd1af
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Dec 19 17:14:11 2014 -0800
Reset GDK_PIXBUF_MODULE_FILE, needed after all, just has a new location.
diff --git a/gnucash-bundler/gnucash.launcher b/gnucash-bundler/gnucash.launcher
index 6c7380e..f05da7e 100755
--- a/gnucash-bundler/gnucash.launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -34,6 +34,7 @@ export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
if [ `uname -r | cut -d . -f 1` -ge 10 ]; then
export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
fi
+export GDK_PIXBUF_MODULE_FILE="$bundle_lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
export PANGO_SYSCONFDIR="$bundle_etc"
export PANGO_LIBDIR="$bundle_lib"
@@ -68,7 +69,7 @@ GUILE_LOAD_PATH="${bundle_data}/guile/2.0/"
EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/guile-modules"
EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/scm"
GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
-GUILE_LOAD_COMPILED_PATH="${bundle_lib}/gnucash/scm/ccache:${GUILE_LOAD_COMPILED_PATH}"
+GUILE_LOAD_COMPILED_PATH="${bundle_data}/gnucash/scm/ccache:${bundle_lib}/guile/2.0/ccache:${GUILE_LOAD_COMPILED_PATH}"
EXTRA_LIBS="${GNC_MODULE_PATH}"
EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
commit 211b49856bbacd8bcf700768edccb96193928af8
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Dec 19 17:13:25 2014 -0800
Update docs to 2.6.5, should have been in last commit.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index b9d76f5..9667375 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -218,7 +218,7 @@
<autotools id="gnucash"
autogen-sh="configure"
- autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
+ autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-dbi-dbd-dir=$PREFIX/lib/dbd --with-html-engine='webkit'">
<branch module="gnucash/stable/gnucash-2.6.5.tar.bz2" version="2.6.5"
repo="sourceforge">
</branch>
@@ -273,8 +273,8 @@
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs=" html" makeinstallargs="install-html" >
- <branch module="gnucash/gnucash-docs/gnucash-docs-2.6.4.tar.gz"
- version="2.6.4" repo="sourceforge"/>
+ <branch module="gnucash/gnucash-docs/gnucash-docs-2.6.5.tar.gz"
+ version="2.6.5" repo="sourceforge"/>
</autotools>
<autotools id="scrollkeeper" autogen-sh="configure">
commit 1c09173a1baf8f58b481401adc1d084453b9b492
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Dec 15 15:50:38 2014 -0800
Release 2.6.5
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index bcac98b..80fab5d 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.6.4 © 2014 Gnucash Contributors</string>
+ <string>Gnucash version 2.6.5 © 2014 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.6.4 © 2014 Gnucash Contributors</string>
+ <string>2.6.5 © 2014 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.6.4</string>
+ <string>2.6.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.6.4</string>
+ <string>2.6.5</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 46b7826..b9d76f5 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -219,7 +219,7 @@
<autotools id="gnucash"
autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
- <branch module="gnucash/stable/gnucash-2.6.4.tar.bz2" version="2.6.4"
+ <branch module="gnucash/stable/gnucash-2.6.5.tar.bz2" version="2.6.5"
repo="sourceforge">
</branch>
<dependencies>
commit 4e14fb9cea7dfbc2a3de908cd1e85a8d6163bb81
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Dec 15 15:49:45 2014 -0800
Remove --libdir from autopen-template.
No longer used, never actually needed.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 38ee2ee..46b7826 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -238,8 +238,8 @@
</autotools>
<autotools id="gnucash-git"
- autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
- autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
+ autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-dbi-dbd-dir=$PREFIX/lib/dbd --with-html-engine="webkit"'>
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
<dependencies>
@@ -261,7 +261,7 @@
</autotools>
<autotools id="gnucash-docs-git" autogenargs="--disable-scrollkeeper"
- autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs=" html" makeinstallargs="install-html" >
<branch repo="github" module="Gnucash/gnucash-docs.git" revision="master"
checkoutdir="gnucash-docs-git"/>
@@ -271,7 +271,7 @@
</autotools>
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
- autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs=" html" makeinstallargs="install-html" >
<branch module="gnucash/gnucash-docs/gnucash-docs-2.6.4.tar.gz"
version="2.6.4" repo="sourceforge"/>
commit 33431ed42e0c510784070b3c4c7269bc27af426b
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Dec 15 15:49:01 2014 -0800
Add openssl to support xmlsec package required by aqbanking.
The openssl version provided by Leopard is too old.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index e486926..38ee2ee 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -28,6 +28,8 @@
href="http://devel.aqbanking.de/svn/"/>
<repository type="git" name="github"
href="git://github.com/"/>
+ <repository type="tarball" name="openssl"
+ href="https://www.openssl.org/source/"/>
<include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
<!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
@@ -67,8 +69,17 @@
repo="sourceforge"/>
</autotools>
+ <autotools id="openssl" autogen-sh="Configure"
+ autogen-template="%(srcdir)s/Configure --prefix=%(prefix)s darwin-i386-cc"
+ supports-non-srcdir-builds="no">
+ <branch module="openssl-0.9.8x.tar.gz" version="0.9.8x" repo="openssl"/>
+ </autotools>
+
<autotools id="xmlsec">
<branch module="mogigoma/xmlsec" repo="github"/>
+ <dependencies>
+ <dep package="openssl"/>
+ </dependencies>
</autotools>
<autotools id="aqbanking" autogen-sh="configure" makeargs="-j1"
commit f6a89716cd6a2208c9e2a29a777207f0d2e63eaf
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Dec 15 15:46:38 2014 -0800
Bundle updates.
Remove no-longer needed GDK_PIXBUF_MODULE_FILE entry, reflect change in
location of Scheme files in Gnucash.
diff --git a/gnucash-bundler/gnucash.launcher b/gnucash-bundler/gnucash.launcher
index 83f6742..6c7380e 100755
--- a/gnucash-bundler/gnucash.launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -34,7 +34,6 @@ export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
if [ `uname -r | cut -d . -f 1` -ge 10 ]; then
export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
fi
-export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
export PANGO_SYSCONFDIR="$bundle_etc"
export PANGO_LIBDIR="$bundle_lib"
@@ -69,7 +68,7 @@ GUILE_LOAD_PATH="${bundle_data}/guile/2.0/"
EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/guile-modules"
EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/scm"
GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
-GUILE_LOAD_COMPILED_PATH="${bundle_lib}/guile/2.0/ccache:${GUILE_LOAD_COMPILED_PATH}"
+GUILE_LOAD_COMPILED_PATH="${bundle_lib}/gnucash/scm/ccache:${GUILE_LOAD_COMPILED_PATH}"
EXTRA_LIBS="${GNC_MODULE_PATH}"
EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
@@ -79,7 +78,7 @@ EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib/gnucash"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
export DYLD_FRAMEWORK_PATH="${bundle_fw}"
-export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/guile-modules/gnucash/report/standard-reports"
+export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/scm/report/standard-reports"
export GNC_DBD_DIR="${bundle_lib}/dbd"
export GSETTINGS_SCHEMA_DIR="${bundle_data}"
commit 5b38cad12b043cd98e01fbf3f6b96cfd95102d40
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Oct 13 10:46:32 2014 -0700
Restore gwen-macos-bundle-path.patch
Still needed, though it's fixed in SVN.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 17aa4ca..e486926 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -45,7 +45,7 @@
autogenargs="--with-guis=gtk2 --enable-local-install">
<branch module="gnucash/Dependencies/gwenhywfar-4.12.0beta.tar.gz" version="4.12.0"
repo="sourceforge">
- <!--patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='0'/-->
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='0'/>
</branch>
<dependencies>
<dep package="libgcrypt"/>
commit fcd86c7d7f9a063eb21946168a44a1ed0690ccf6
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Oct 13 10:37:18 2014 -0700
Fix CFLAGS in libdbi-0.8.4
Overwrote CFLAGS so build architecture was wrong.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 4191092..17aa4ca 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -156,9 +156,10 @@
</dependencies>
</cmake>
- <autotools id="libdbi" autogen-sh="configure" autogenargs="--disable-docs">
+ <autotools id="libdbi" autogen-sh="autoreconf" autogenargs="--disable-docs">
<branch repo="sourceforge" module="libdbi/libdbi-0.8.4.tar.gz"
version="0.8.4">
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/libdbi-fix-cflags.patch" strip="1"/>
</branch>
</autotools>
diff --git a/patches/libdbi-fix-cflags.patch b/patches/libdbi-fix-cflags.patch
new file mode 100644
index 0000000..a384821
--- /dev/null
+++ b/patches/libdbi-fix-cflags.patch
@@ -0,0 +1,39 @@
+--- a/configure.in Tue Aug 31 15:35:12 2010
++++ b/configure.in Mon Oct 13 10:29:50 2014
+@@ -3,7 +3,7 @@
+ AM_MAINTAINER_MODE
+
+ AM_INIT_AUTOMAKE(libdbi, 0.8.4)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+
+ dnl Library versioning
+@@ -47,9 +47,9 @@
+ CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
+ PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
+ *)
+- DEBUG="-g"
+- CFLAGS="-O"
+- PROFILE="-g -p" ;;
++ DEBUG="$CFLAGS -g"
++ CFLAGS="$CFLAGS -O"
++ PROFILE="$CFLAGS -g -p" ;;
+ esac
+ else
+
+@@ -63,9 +63,9 @@
+ CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
+ PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99" ;;
+ *)
+- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
+- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
+- PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char -std=gnu99" ;;
++ DEBUG="$CFLAGS -g -Wall -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
++ CFLAGS="$CFLAGS -O20 -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
++ PROFILE="$CFLAGS -O20 -g -pg -D__NO_MATH_INLINES -fsigned-char -std=gnu99" ;;
+ esac
+ fi
+
+
+Diff finished. Mon Oct 13 10:30:08 2014
commit f0dbd876777c61897866693dcc380ae02669f113
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Sep 29 11:22:29 2014 -0700
Update bundle for Guile-2.0
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 2246f7e..b8947af 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -147,6 +147,10 @@
</data>
<data>
+ ${prefix}/lib/guile
+ </data>
+
+ <data>
${prefix}/share/aqbanking
</data>
diff --git a/gnucash-bundler/gnucash.launcher b/gnucash-bundler/gnucash.launcher
index 5fec879..83f6742 100755
--- a/gnucash-bundler/gnucash.launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -65,10 +65,11 @@ export GUILE_WARN_DEPRECATED
GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
-GUILE_LOAD_PATH="${bundle_data}/guile/1.8/"
+GUILE_LOAD_PATH="${bundle_data}/guile/2.0/"
EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/guile-modules"
EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/scm"
GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
+GUILE_LOAD_COMPILED_PATH="${bundle_lib}/guile/2.0/ccache:${GUILE_LOAD_COMPILED_PATH}"
EXTRA_LIBS="${GNC_MODULE_PATH}"
EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
@@ -84,6 +85,7 @@ export GSETTINGS_SCHEMA_DIR="${bundle_data}"
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
+export GUILE_LOAD_COMPILED_PATH
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
export GNC_DOT_DIR="$HOME/Library/Application Support/Gnucash"
commit 465f1aeeaaf78655bfa8354b80935482d551b947
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 28 13:52:47 2014 -0700
Update gnucash-docs version. Sigh.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index f9e8746..4191092 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -261,8 +261,8 @@
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
makeargs=" html" makeinstallargs="install-html" >
- <branch module="gnucash/gnucash-docs/gnucash-docs-2.6.3.tar.gz"
- version="2.6.3" repo="sourceforge"/>
+ <branch module="gnucash/gnucash-docs/gnucash-docs-2.6.4.tar.gz"
+ version="2.6.4" repo="sourceforge"/>
</autotools>
<autotools id="scrollkeeper" autogen-sh="configure">
commit 8cb4a71056a823c604120e93f16908cfca5ceeaa
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 28 13:12:57 2014 -0700
Update version in Info.plist
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index f517b72..bcac98b 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.6.3 © 2014 Gnucash Contributors</string>
+ <string>Gnucash version 2.6.4 © 2014 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.6.3 © 2014 Gnucash Contributors</string>
+ <string>2.6.4 © 2014 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.6.3</string>
+ <string>2.6.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.6.3</string>
+ <string>2.6.4</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
commit 41994f8a311b5b829fb9287f79f20f5f5cc62289
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 28 11:06:02 2014 -0700
Release 2.6.4
Includes changing to Guile2 and updates to aqbanking, libofx, swig, and
libdbi.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 86b211b..f9e8746 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -43,9 +43,9 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis=gtk2 --enable-local-install">
- <branch module="gnucash/Dependencies/gwenhywfar-4.3.3.tar.gz" version="4.3.3"
+ <branch module="gnucash/Dependencies/gwenhywfar-4.12.0beta.tar.gz" version="4.12.0"
repo="sourceforge">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='0'/>
+ <!--patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='0'/-->
</branch>
<dependencies>
<dep package="libgcrypt"/>
@@ -63,18 +63,23 @@
</autotools>
<autotools id="ktoblzcheck" autogen-sh="configure">
- <branch module="ktoblzcheck/ktoblzcheck-1.46.tar.gz" version="1.46"
+ <branch module="ktoblzcheck/ktoblzcheck-1.47.tar.gz" version="1.47"
repo="sourceforge"/>
</autotools>
+ <autotools id="xmlsec">
+ <branch module="mogigoma/xmlsec" repo="github"/>
+ </autotools>
+
<autotools id="aqbanking" autogen-sh="configure" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="gnucash/Dependencies/aqbanking-5.0.25.tar.gz" version="5.0.25"
+ <branch module="gnucash/Dependencies/aqbanking-5.5.0.2-git.tar.gz" version="5.5.0.2"
repo="sourceforge"/>
<dependencies>
<dep package="gwenhywfar"/>
<dep package="gmp"/>
<dep package="ktoblzcheck"/>
+ <dep package="xmlsec"/>
</dependencies>
</autotools>
@@ -106,8 +111,8 @@
</autotools>
<autotools id="libofx" autogen-sh='configure'>
- <branch repo="sourceforge" module="libofx/libofx-0.9.8.tar.gz"
- version="0.9.8"/>
+ <branch repo="sourceforge" module="libofx/libofx-0.9.10.tar.gz"
+ version="0.9.10"/>
<dependencies>
<dep package="OpenSP"/>
</dependencies>
@@ -120,8 +125,8 @@
</autotools>
<autotools id="swig" autogen-sh="configure">
- <branch repo="sourceforge" module="swig/swig-2.0.10.tar.gz"
- version="2.0.10"/>
+ <branch repo="sourceforge" module="swig/swig-2.0.11.tar.gz"
+ version="2.0.11"/>
<dependencies>
<dep package="pcre"/>
</dependencies>
@@ -151,10 +156,9 @@
</dependencies>
</cmake>
- <autotools id="libdbi" autogen-sh='autoreconf' autogenargs="--disable-docs">
- <branch repo="sourceforge" module="libdbi/libdbi-0.8.3.tar.gz"
+ <autotools id="libdbi" autogen-sh="configure" autogenargs="--disable-docs">
+ <branch repo="sourceforge" module="libdbi/libdbi-0.8.4.tar.gz"
version="0.8.4">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/dbi.patch" strip="1"/>
</branch>
</autotools>
@@ -203,7 +207,7 @@
<autotools id="gnucash"
autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
- <branch module="gnucash/stable/gnucash-2.6.3.tar.bz2" version="2.6.3"
+ <branch module="gnucash/stable/gnucash-2.6.4.tar.bz2" version="2.6.4"
repo="sourceforge">
</branch>
<dependencies>
commit 3b8033fbd1fec8f4876061d99c3e325230dfe7b8
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 19 16:08:14 2014 -0700
Switch to Guile2.
It's past time, but in addition it's needed to build with Xcode 5.1 and 6.0.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 49c9ea9..86b211b 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -216,7 +216,7 @@
<dep package="libdbi-drivers"/>
<dep package="shared-mime-info"/>
<dep package="iso-codes"/>
- <dep package="guile"/>
+ <dep package="guile2"/>
</dependencies>
</autotools>
@@ -237,7 +237,7 @@
<dep package="libdbi-drivers"/>
<dep package="shared-mime-info"/>
<dep package="iso-codes"/>
- <dep package="guile"/>
+ <dep package="guile2"/>
<dep package="swig"/>
<dep package="boost"/>
</dependencies>
commit f74c95c6147f9369db3fb4999ffebf98b0d02030
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Sep 13 09:43:34 2014 -0700
Add boost dependency
N.B.: Jhbuild doesn't know how to build boost, so select 4 and build it by hand.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 242574f..49c9ea9 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -195,6 +195,10 @@
</dependencies>
</autotools>
+ <autotools id="boost" supports-non-srcdir-builds="no">
+ <branch module="boost/boost_1_56_0.tar.bz2" repo="sourceforge"
+ version="1.56.0"/>
+ </autotools>
<autotools id="gnucash"
autogen-sh="configure"
@@ -235,6 +239,7 @@
<dep package="iso-codes"/>
<dep package="guile"/>
<dep package="swig"/>
+ <dep package="boost"/>
</dependencies>
</autotools>
commit 1098cd12331c69427c0a888b0f543888f53c4d0f
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Aug 18 12:35:58 2014 -0700
Update Ktoblzcheck to 1.46 and add its data to the bundle.
Uses XDG_DATA_DIRS to find its bank data, needed for SEPA.
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 76b83c0..2246f7e 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -155,6 +155,10 @@
</data>
<data>
+ ${prefix}/share/ktoblzcheck
+ </data>
+
+ <data>
${prefix}/share/libofx
</data>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 9dc1583..242574f 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -63,7 +63,7 @@
</autotools>
<autotools id="ktoblzcheck" autogen-sh="configure">
- <branch module="ktoblzcheck/ktoblzcheck-1.41.tar.gz" version="1.41"
+ <branch module="ktoblzcheck/ktoblzcheck-1.46.tar.gz" version="1.46"
repo="sourceforge"/>
</autotools>
commit e8eb43f9e9c601069b0a5db01380a0e0002b8f06
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 29 17:16:42 2014 -0700
Release Gnucash 2.6.3
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 1914c01..f517b72 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.6.2 © 2014 Gnucash Contributors</string>
+ <string>Gnucash version 2.6.3 © 2014 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.6.2 © 2014 Gnucash Contributors</string>
+ <string>2.6.3 © 2014 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.6.2</string>
+ <string>2.6.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.6.2</string>
+ <string>2.6.3</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 5012671..9dc1583 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -199,7 +199,7 @@
<autotools id="gnucash"
autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
- <branch module="gnucash/stable/gnucash-2.6.2.tar.bz2" version="2.6.2"
+ <branch module="gnucash/stable/gnucash-2.6.3.tar.bz2" version="2.6.3"
repo="sourceforge">
</branch>
<dependencies>
@@ -252,7 +252,8 @@
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
makeargs=" html" makeinstallargs="install-html" >
- <branch repo="github" module="Gnucash/gnucash-docs.git" revision="master"/>
+ <branch module="gnucash/gnucash-docs/gnucash-docs-2.6.3.tar.gz"
+ version="2.6.3" repo="sourceforge"/>
</autotools>
<autotools id="scrollkeeper" autogen-sh="configure">
commit 7b7c5a289359dd64474b3b98ca260dc1c6943275
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 29 17:16:24 2014 -0700
Add to comment instructions for users of 10.7 and later
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 02896f6..422d093 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -19,7 +19,8 @@ modules = ["meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash"]
#Setup the build. PPC users will need to replace "i386" with
#"ppc". Don't try to do a universal build, it doesn't work. x86_64 is
-#untested, as is building against the 10.6 or 10.7 SDKs.
+#untested. Users on systems later than 10.6 will need to replace both
+#instances of "10.5" below with their OS version:
setup_sdk("10.5", "10.5",["i386"])
moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
commit dc4c9200f5cc7ac2cdad625292d5926875d2b261
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 2 08:11:49 2014 -0800
Release 2.6.2
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index da20da2..1914c01 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.6.1 © 2014 Gnucash Contributors</string>
+ <string>Gnucash version 2.6.2 © 2014 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.6.1 © 2014 Gnucash Contributors</string>
+ <string>2.6.2 © 2014 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.6.1</string>
+ <string>2.6.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.6.1</string>
+ <string>2.6.2</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 67dbced..5012671 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -199,7 +199,7 @@
<autotools id="gnucash"
autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
- <branch module="gnucash/stable/gnucash-2.6.1.tar.bz2" version="2.6.1"
+ <branch module="gnucash/stable/gnucash-2.6.2.tar.bz2" version="2.6.2"
repo="sourceforge">
</branch>
<dependencies>
commit b98aea9716c9317f142b65ddcec6dbf1800b27bc
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Feb 25 15:41:23 2014 -0800
Change the gnucash-git revision to 'master' from 'trunk'
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 61384d2..67dbced 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -220,7 +220,7 @@
<autotools id="gnucash-git"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch repo="github" module="Gnucash/gnucash.git" revision="trunk"
+ <branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit 7ffa589388a32559040f8c3ec2dacd40548e2e6f
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Feb 25 15:40:32 2014 -0800
Patch goffice for gsize->size_t implicit cast errors.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 86894d5..61384d2 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -185,7 +185,9 @@
<!-- Goffice-0.9 is for Gtk3 -->
<autotools id="goffice" autogenargs="--without-gconf" autogen-sh="configure">
<branch module="goffice/0.8/goffice-0.8.17.tar.xz" version="0.8.17"
- hash="sha256:165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15"/>
+ hash="sha256:165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15">
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/goffice-gsize.patch" strip="1"/>
+ </branch>
<dependencies>
<dep package="gtk+"/>
<dep package="libgsf"/>
diff --git a/patches/goffice-gsize.patch b/patches/goffice-gsize.patch
new file mode 100644
index 0000000..c34d6d0
--- /dev/null
+++ b/patches/goffice-gsize.patch
@@ -0,0 +1,23 @@
+diff -c /Users/john/Development/Gnucash-Build/Gnucash-master-git-Leopard/src/goffice-0.8.17/goffice/utils/go-glib-extras.c\~ /Users/john/Development/Gnucash-Build/Gnucash-master-git-Leopard/src/goffice-0.8.17/goffice/utils/go-glib-extras.c
+--- a/goffice/utils/go-glib-extras.c SatAug 21 05:20:49 2010
++++ b/goffice/utils/go-glib-extras.c Tue Feb 25 11:16:31 2014
+@@ -452,7 +452,7 @@
+
+
+ GOMemChunk *
+-go_mem_chunk_new (char const *name, size_t user_atom_size, size_t chunk_size)
++go_mem_chunk_new (char const *name, gsize user_atom_size, gsize chunk_size)
+ {
+ int atoms_per_block;
+ GOMemChunk *res;
+@@ -694,7 +694,7 @@
+
+
+ const char *
+-go_guess_encoding (const char *raw, size_t len, const char *user_guess,
++go_guess_encoding (const char *raw, gsize len, const char *user_guess,
+ char **utf8_str)
+ {
+ int try;
+
+Diff finished. Tue Feb 25 11:17:18 2014
commit 4c27f30f922b9a3ed2c18eab16d25dacb04c6504
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Feb 25 15:36:04 2014 -0800
Adjust unstable bundle for two-letter documentation locales.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 2746a94..8b09a4b 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -187,23 +187,23 @@
</data>
<data dest="${bundle}/Contents/Resources/de.lproj/GnuCash Help/">
- ${prefix}/share/doc/gnucash-docs/de_DE/gnucash-help/
+ ${prefix}/share/doc/gnucash-docs/de/gnucash-help/
</data>
<data dest="${bundle}/Contents/Resources/de.lproj/GnuCash Guide/">
- ${prefix}/share/doc/gnucash-docs/de_DE/gnucash-guide/
+ ${prefix}/share/doc/gnucash-docs/de/gnucash-guide/
</data>
<data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Help/">
- ${prefix}/share/doc/gnucash-docs/it_IT/gnucash-help/
+ ${prefix}/share/doc/gnucash-docs/it/gnucash-help/
</data>
<data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Guide/">
- ${prefix}/share/doc/gnucash-docs/it_IT/gnucash-guide/
+ ${prefix}/share/doc/gnucash-docs/it/gnucash-guide/
</data>
<data dest="${bundle}/Contents/Resources/ja.lproj/GnuCash Guide/">
- ${prefix}/share/doc/gnucash-docs/ja_JP/gnucash-guide/
+ ${prefix}/share/doc/gnucash-docs/ja/gnucash-guide/
</data>
<data>
commit 3beb8e559f51ba514c75cb9abd7b0d9c916ec733
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Feb 24 11:55:52 2014 -0800
Change revision trunk to master, reflecting git conversion.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index c16d978..86894d5 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -240,7 +240,7 @@
<autotools id="gnucash-docs-git" autogenargs="--disable-scrollkeeper"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
makeargs=" html" makeinstallargs="install-html" >
- <branch repo="github" module="Gnucash/gnucash-docs.git" revision="trunk"
+ <branch repo="github" module="Gnucash/gnucash-docs.git" revision="master"
checkoutdir="gnucash-docs-git"/>
<dependencies>
<!-- dep package="scrollkeeper"/ -->
@@ -250,7 +250,7 @@
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
makeargs=" html" makeinstallargs="install-html" >
- <branch repo="github" module="Gnucash/gnucash-docs.git" revision="trunk"/>
+ <branch repo="github" module="Gnucash/gnucash-docs.git" revision="master"/>
</autotools>
<autotools id="scrollkeeper" autogen-sh="configure">
commit 4013bf17df741d38a5b7cd6dbc845c20b73d06a9
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Feb 5 08:51:36 2014 -0700
Comment out local include URL
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index db8c184..c16d978 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -30,7 +30,7 @@
href="git://github.com/"/>
<include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
- <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
+ <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
<autotools id="libchipcard" autogen-sh="configure" >
<branch module="gnucash/Dependencies/libchipcard-5.0.2.tar.gz" version="5.0.2"
commit 346c3032cccec9bc6cc31fada13b0b70d4346b30
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jan 26 18:26:42 2014 -0800
Prevent loading gtk.immodules on Tiger or Leopard
the quartz im uses 10.6 API
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 395b8f9..5fec879 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -31,7 +31,9 @@ export GTK_EXE_PREFIX="$bundle_res"
export GTK_PATH="$bundle_res"
export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
-export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
+if [ `uname -r | cut -d . -f 1` -ge 10 ]; then
+ export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
+fi
export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
export PANGO_SYSCONFDIR="$bundle_etc"
diff --git a/gnucash-bundler/gnucash.launcher b/gnucash-bundler/gnucash.launcher
index 395b8f9..5fec879 100755
--- a/gnucash-bundler/gnucash.launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -31,7 +31,9 @@ export GTK_EXE_PREFIX="$bundle_res"
export GTK_PATH="$bundle_res"
export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
-export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
+if [ `uname -r | cut -d . -f 1` -ge 10 ]; then
+ export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
+fi
export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
export PANGO_SYSCONFDIR="$bundle_etc"
commit 0e27c86ca50f4df615a00769120f71b73a4f722f
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jan 25 16:45:46 2014 -0800
Release Gnucash 2.6.1
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 5530420..db8c184 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -30,7 +30,7 @@
href="git://github.com/"/>
<include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
- <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
+ <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
<autotools id="libchipcard" autogen-sh="configure" >
<branch module="gnucash/Dependencies/libchipcard-5.0.2.tar.gz" version="5.0.2"
@@ -238,7 +238,7 @@
</autotools>
<autotools id="gnucash-docs-git" autogenargs="--disable-scrollkeeper"
- autogen-sh='autoreconf'
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
makeargs=" html" makeinstallargs="install-html" >
<branch repo="github" module="Gnucash/gnucash-docs.git" revision="trunk"
checkoutdir="gnucash-docs-git"/>
@@ -248,7 +248,7 @@
</autotools>
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
- autogen='autoreconf'
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
makeargs=" html" makeinstallargs="install-html" >
<branch repo="github" module="Gnucash/gnucash-docs.git" revision="trunk"/>
</autotools>
commit 84f4e916cbd246de83502122aefaeb6eab3f6d3f
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jan 25 16:45:46 2014 -0800
Release Gnucash 2.6.1
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 1c1f727..da20da2 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.6.0 © 2013 Gnucash Contributors</string>
+ <string>Gnucash version 2.6.1 © 2014 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.6.0 © 2013 Gnucash Contributors</string>
+ <string>2.6.1 © 2014 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.6.0</string>
+ <string>2.6.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.6.0</string>
+ <string>2.6.1</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
@@ -60,7 +60,7 @@
<key>LSRequiresCarbon</key>
<true/>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2013 Gnucash Contributors</string>
+ <string>Copyright 2014 Gnucash Contributors</string>
<key>NSHighResolutionCapable</key>
<true/>
</dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index b04c2ef..5530420 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -197,7 +197,7 @@
<autotools id="gnucash"
autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
- <branch module="gnucash/stable/gnucash-2.6.0.tar.bz2" version="2.6.0"
+ <branch module="gnucash/stable/gnucash-2.6.1.tar.bz2" version="2.6.1"
repo="sourceforge">
</branch>
<dependencies>
commit c56c23b4936fcbbf66cf10b4c4ca66c59bccd9bf
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Dec 31 15:04:21 2013 -0800
Fix some unstable references, and the old location of the gnucash docs
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index c420d3e..76b83c0 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -31,7 +31,7 @@
not needed. If the source path is left out, the default
script will be used.
-->
- <launcher-script>${project}/gnucash-unstable.launcher</launcher-script>
+ <launcher-script>${project}/gnucash.launcher</launcher-script>
<!-- Not implemented: Optional runtime, could be python or mono
for example.
@@ -43,7 +43,7 @@
this bundle file is located. The application name and bundle
identifier are taken from the plist file.
-->
- <plist>${project}/Info-unstable.plist</plist>
+ <plist>${project}/Info.plist</plist>
<main-binary>${prefix}/bin/gnucash</main-binary>
@@ -207,7 +207,7 @@
</data>
<data>
- ${prefix}/share/gnucash/doc/
+ ${prefix}/share/doc/gnucash/
</data>
<translations name="gnucash">
commit e365e79ebc3b9695748e4b0e5702a3b01d2acbbe
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Dec 31 12:20:39 2013 -0800
Two more missing dependencies for gnucash
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index aceda3e..b04c2ef 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -208,7 +208,9 @@
<dep package="meta-gtk-osx-webkit"/>
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
+ <dep package="shared-mime-info"/>
<dep package="iso-codes"/>
+ <dep package="guile"/>
</dependencies>
</autotools>
@@ -227,7 +229,9 @@
<dep package="meta-gtk-osx-webkit"/>
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
+ <dep package="shared-mime-info"/>
<dep package="iso-codes"/>
+ <dep package="guile"/>
<dep package="swig"/>
</dependencies>
commit 3ce477ae12c3cce10b70609153a2d376327af159
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Dec 31 12:32:51 2013 -0800
Update translation directories in bundle file
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 2746a94..c420d3e 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -187,27 +187,27 @@
</data>
<data dest="${bundle}/Contents/Resources/de.lproj/GnuCash Help/">
- ${prefix}/share/doc/gnucash-docs/de_DE/gnucash-help/
+ ${prefix}/share/doc/gnucash-docs/de/gnucash-help/
</data>
<data dest="${bundle}/Contents/Resources/de.lproj/GnuCash Guide/">
- ${prefix}/share/doc/gnucash-docs/de_DE/gnucash-guide/
+ ${prefix}/share/doc/gnucash-docs/de/gnucash-guide/
</data>
<data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Help/">
- ${prefix}/share/doc/gnucash-docs/it_IT/gnucash-help/
+ ${prefix}/share/doc/gnucash-docs/it/gnucash-help/
</data>
<data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Guide/">
- ${prefix}/share/doc/gnucash-docs/it_IT/gnucash-guide/
+ ${prefix}/share/doc/gnucash-docs/it/gnucash-guide/
</data>
<data dest="${bundle}/Contents/Resources/ja.lproj/GnuCash Guide/">
- ${prefix}/share/doc/gnucash-docs/ja_JP/gnucash-guide/
+ ${prefix}/share/doc/gnucash-docs/ja/gnucash-guide/
</data>
<data>
- ${prefix}/share/doc/gnucash/
+ ${prefix}/share/gnucash/doc/
</data>
<translations name="gnucash">
commit 9a45d50057b2d2acc5c480eb0f3a0ad9d93052de
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 29 14:25:32 2013 -0800
Fix error in gnucash dependencies
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 953db63..aceda3e 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -204,13 +204,11 @@
<dep package="meta-gtk-osx-core"/>
<dep package="libofx"/>
<dep package="aqbanking"/>
- <dep package="libgnomeui"/>
+ <dep package="libgnomecanvas"/>
<dep package="meta-gtk-osx-webkit"/>
- <dep package="Slib"/>
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
- <dep package="gconf2"/>
</dependencies>
</autotools>
@@ -227,7 +225,6 @@
<dep package="aqbanking"/>
<dep package="libgnomecanvas"/>
<dep package="meta-gtk-osx-webkit"/>
- <dep package="Slib"/> <!-- Needed only for the 2.4 branch -->
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
@@ -247,11 +244,10 @@
</autotools>
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
- autogen='autreconf'
- makeargs=" html" makeinstallargs="install-html" >
- <branch repo="svn.gnucash.org" module="gnucash-docs" revision="trunk"
- />
- </autotools>
+ autogen='autoreconf'
+ makeargs=" html" makeinstallargs="install-html" >
+ <branch repo="github" module="Gnucash/gnucash-docs.git" revision="trunk"/>
+ </autotools>
<autotools id="scrollkeeper" autogen-sh="configure">
<branch repo="sourceforge" module="scrollkeeper/scrollkeeper-0.3.14.tar.gz"
commit 2ea3eb658c27faf58a295bf87ec44d78d9376199
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 29 12:25:09 2013 -0800
Release 2.6.0, end 2.4 series, remove SVN builds
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 2314d5a..1c1f727 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.4.14 © 2013 Gnucash Contributors</string>
+ <string>Gnucash version 2.6.0 © 2013 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4.14 © 2013 Gnucash Contributers</string>
+ <string>2.6.0 © 2013 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4.14</string>
+ <string>2.6.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.4.14</string>
+ <string>2.6.0</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
@@ -59,11 +59,9 @@
<true/>
<key>LSRequiresCarbon</key>
<true/>
- <key>LSMinimumSystemVersion</key>
- <string>10.5.0</string>
- <key>NSHighResolutionCapable</key>
- <true/>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2013 Gnucash Contributors</string>
+ <key>NSHighResolutionCapable</key>
+ <true/>
</dict>
</plist>
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 25b2081..2746a94 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -31,7 +31,7 @@
not needed. If the source path is left out, the default
script will be used.
-->
- <launcher-script>${project}/gnucash.launcher</launcher-script>
+ <launcher-script>${project}/gnucash-unstable.launcher</launcher-script>
<!-- Not implemented: Optional runtime, could be python or mono
for example.
@@ -43,7 +43,7 @@
this bundle file is located. The application name and bundle
identifier are taken from the plist file.
-->
- <plist>${project}/Info.plist</plist>
+ <plist>${project}/Info-unstable.plist</plist>
<main-binary>${prefix}/bin/gnucash</main-binary>
@@ -74,44 +74,28 @@
${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
</binary>
- <binary>
- ${prefix}/lib/GConf/2/*.so
- </binary>
-
<!-- Seems to get missed by the dependency resolver -->
<binary>
${prefix}/lib/libguile-srfi*
</binary>
- <binary>
+ <binary loadable="True">
${prefix}/lib/gnucash
</binary>
- <binary>
+ <binary loadable="True">
${prefix}/lib/aqbanking
</binary>
- <binary>
+ <binary loadable="True">
${prefix}/lib/gwenhywfar
</binary>
<binary>
- ${prefix}/lib/libglade
- </binary>
-
- <binary>
${prefix}/libexec
</binary>
<binary>
- ${prefix}/bin/dbus-launch
- </binary>
-
- <binary>
- ${prefix}/bin/dbus-daemon
- </binary>
-
- <binary>
${prefix}/bin/gnc-*
</binary>
@@ -123,7 +107,7 @@
${prefix}/lib/goffice
</binary>
- <binary>
+ <binary loadable="True">
${prefix}/lib/dbd
</binary>
@@ -151,7 +135,7 @@
</data>
<data>
- ${prefix}/etc/gconf
+ ${prefix}/share/glib-2.0/schemas
</data>
<data>
@@ -163,14 +147,6 @@
</data>
<data>
- ${prefix}/share/GConf
- </data>
-
- <data>
- ${prefix}/share/dbus-1/
- </data>
-
- <data>
${prefix}/share/aqbanking
</data>
@@ -190,29 +166,12 @@
${prefix}/share/themes
</data>
- <!--data dest="${bundle}/Contents/Resources/slib"-->
- <data>
- ${prefix}/lib/slib
- </data>
-
<data dest="${bundle}/Contents/Resources">
${project}/gnucash.icns
</data>
- <data dest="${bundle}/Contents/Resources">
- ${prefix}/share/strings
- </data>
-
- <data dest='${bundle}/Contents/Resources/var/lib/dbus/machine-id'>
- ${prefix}/var/lib/dbus/machine-id
- </data>
-
- <data dest='${bundle}/Contents/Resources/etc/dbus-1/'>
- ${prefix}/etc/dbus-1/
- </data>
-
<data dest="${bundle}/Contents/Resources/License">
- ${prefix}/share/gnucash/doc/LICENSE
+ ${prefix}/share/doc/gnucash/LICENSE
</data>
<data dest="${bundle}/Contents/Resources/Sources">
diff --git a/gnucash-bundler/gnucash.launcher b/gnucash-bundler/gnucash.launcher
index d7bb732..395b8f9 100755
--- a/gnucash-bundler/gnucash.launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -10,9 +10,6 @@ else
EXEC=exec
fi
-export PREFIX=/Library/Gnucash-2.4
-export PREFIXDIR="`dirname $PREFIX`"
-
name=`basename "$0"`
tmp="$0"
tmp=`dirname "$tmp"`
@@ -28,7 +25,7 @@ bundle_etc="$bundle_res"/etc
export DYLD_LIBRARY_PATH="$bundle_lib"
export XDG_CONFIG_DIRS="$bundle_etc"/xdg
-export XDG_DATA_DIRS="$PREFIX/share"
+export XDG_DATA_DIRS="$bundle_data"
export GTK_DATA_PREFIX="$bundle_res"
export GTK_EXE_PREFIX="$bundle_res"
export GTK_PATH="$bundle_res"
@@ -63,62 +60,10 @@ export PATH
GUILE_WARN_DEPRECATED="no"
export GUILE_WARN_DEPRECATED
-if [ -w "$PREFIXDIR" ]; then
- if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
- if [ ! -d "$PREFIX" ]; then
- rm "$PREFIX"; else
- mv "$PREFIX" "$PREFIX.Save";
- fi
- ln -s "$RESPFX" "$PREFIX"
- elif [ ! -e "$PREFIX" ] ; then
- echo "Linking $RESPFX to $PREFIX"
- if [ ! -d "$PREFIXDIR" ]; then
- mkdir -p "$PREFIXDIR";
- fi
- ln -s "$RESPFX" "$PREFIX"
- fi
-else
- echo "Don't have write access to $PREFIXDIR"
- if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
- echo "moving the $PREFIX directory to $PREFIX.save"
- osascript <<EOF
-display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
-do shell script "echo foo; if [ ! -d \"$PREFIX\" ]; then rm \"$PREFIX\"; else mv \"$PREFIX\" \"$PREFIX.Save\"; fi; ln -s \"$RESPFX\" \"$PREFIX\" " with administrator privileges
-
-EOF
-
- elif [ ! -e "$PREFIX" ] ;
- then
- echo "Linking $RESPFX to $PREFIX"
- osascript <<EOF
-display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
-do shell script "if [ ! -d \"$PREFIXDIR\" ]; then mkdir -p \"$PREFIXDIR\"; fi; ln -s \"$RESPFX\" \"$PREFIX\"" with administrator privileges
-
-EOF
-
-
- fi
-fi
-
-if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
- # If we get here without a way to connect to an instance of dbus-daemon,
- # then we can kill any existing instances of dbus-daemon that originate
- # in this copy of Gnucash.
-
- DBUS_PIDS=`ps ux | grep dbus-daemon | grep "${PREFIX}" | awk '{print $2}'`
-
- if /bin/test "$DBUS_PIDS"; then
- for DBUS_PID in ${DBUS_PIDS}
- do
- /bin/kill "${DBUS_PID}"
- done
- fi
-
- eval `"$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
-fi
GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
+GUILE_LOAD_PATH="${bundle_data}/guile/1.8/"
EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/guile-modules"
EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/scm"
GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
@@ -133,12 +78,14 @@ DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
export DYLD_FRAMEWORK_PATH="${bundle_fw}"
export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/guile-modules/gnucash/report/standard-reports"
export GNC_DBD_DIR="${bundle_lib}/dbd"
+export GSETTINGS_SCHEMA_DIR="${bundle_data}"
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
export GNC_DOT_DIR="$HOME/Library/Application Support/Gnucash"
+export OFX_DTD_PATH="${bundle_data}/libofx/dtd"
if test -f "$GNC_DOT_DIR/gnucashrc"; then
source "$GNC_DOT_DIR/gnucashrc"
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index cc042a6..953db63 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -31,7 +31,6 @@
<include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
<!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
- <include href="gtkhtml.modules"/>
<autotools id="libchipcard" autogen-sh="configure" >
<branch module="gnucash/Dependencies/libchipcard-5.0.2.tar.gz" version="5.0.2"
@@ -170,6 +169,19 @@
</dependencies>
</autotools>
+ <autotools id="libgnomecanvas" autogen-sh="configure">
+ <branch module="libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2"
+ version="2.26.0" md5sum="9bbc635e5ae70e63af071af74ba7e72f"/>
+ <dependencies>
+ <dep package="libart_lgpl"/>
+ <dep package="libglade"/>
+ </dependencies>
+ <after>
+ <dep package="meta-gtk-osx-bootstrap"/>
+ <dep package="meta-gtk-osx-core"/>
+ </after>
+ </autotools>
+
<!-- Goffice-0.9 is for Gtk3 -->
<autotools id="goffice" autogenargs="--without-gconf" autogen-sh="configure">
<branch module="goffice/0.8/goffice-0.8.17.tar.xz" version="0.8.17"
@@ -185,7 +197,7 @@
<autotools id="gnucash"
autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
- <branch module="gnucash/stable/gnucash-2.4.14.tar.bz2" version="2.4.14"
+ <branch module="gnucash/stable/gnucash-2.6.0.tar.bz2" version="2.6.0"
repo="sourceforge">
</branch>
<dependencies>
@@ -203,46 +215,6 @@
</autotools>
- <autotools id="gnucash-unstable" autogen-sh='configure'
- autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash/unstable/gnucash-2.5.10.tar.bz2" version="2.5.10"
- repo="sourceforge"/>
- <dependencies>
- <dep package="meta-gtk-osx-core"/>
- <dep package="libofx"/>
- <dep package="aqbanking"/>
- <dep package="libgnomecanvas"/>
- <dep package="meta-gtk-osx-webkit"/>
- <dep package="shared-mime-info"/>
- <dep package="goffice"/>
- <dep package="libdbi-drivers"/>
- <dep package="iso-codes"/>
- <dep package="guile"/>
- <dep package="swig"/>
- </dependencies>
-
- </autotools>
-
- <autotools id="gnucash-svn"
- autogen-template="GNOME2_PATH=%(prefix)s %(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
- autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch repo="svn.gnucash.org" module="gnucash"/>
- <dependencies>
- <dep package="meta-gtk-osx-core"/>
- <dep package="libofx"/>
- <dep package="aqbanking"/>
- <dep package="libgnomecanvas"/>
- <dep package="meta-gtk-osx-webkit"/>
- <dep package="Slib"/> <!-- Needed only for the 2.4 branch -->
- <dep package="guile"/>
- <dep package="goffice"/>
- <dep package="libdbi-drivers"/>
- <dep package="iso-codes"/>
- <dep package="swig"/>
- </dependencies>
-
- </autotools>
-
<autotools id="gnucash-git"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
@@ -264,36 +236,6 @@
</autotools>
- <autotools id="gnucash-2.4"
- autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
- autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
- <branch repo="github" module="Gnucash/gnucash.git" revision="2.4"
- checkoutdir="gnucash-2.4"/>
- <dependencies>
- <dep package="meta-gtk-osx-core"/>
- <dep package="libofx"/>
- <dep package="aqbanking"/>
- <dep package="libgnomeui"/>
- <dep package="meta-gtk-osx-webkit"/>
- <dep package="Slib"/>
- <dep package="goffice"/>
- <dep package="libdbi-drivers"/>
- <dep package="iso-codes"/>
- <dep package="swig"/>
- <dep package="gconf2"/>
- </dependencies>
-
- </autotools>
-
- <autotools id="gnucash-docs-svn" autogenargs="--disable-scrollkeeper"
- autogen-sh='autoreconf'
- makeargs=" html" makeinstallargs="install-html" >
- <branch repo="svn.gnucash.org" module="gnucash-docs"/>
- <dependencies>
- <!-- dep package="scrollkeeper"/ -->
- </dependencies>
- </autotools>
-
<autotools id="gnucash-docs-git" autogenargs="--disable-scrollkeeper"
autogen-sh='autoreconf'
makeargs=" html" makeinstallargs="install-html" >
@@ -307,7 +249,7 @@
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
autogen='autreconf'
makeargs=" html" makeinstallargs="install-html" >
- <branch repo="svn.gnucash.org" module="gnucash-docs" revision="2.4"
+ <branch repo="svn.gnucash.org" module="gnucash-docs" revision="trunk"
/>
</autotools>
diff --git a/modulesets/goffice.modules b/modulesets/goffice.modules
deleted file mode 100644
index 8e6373c..0000000
--- a/modulesets/goffice.modules
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Moduleset for building goffice libraries needed for GnuCash -->
-
-<moduleset>
- <repository type="tarball" name="ftp.gnome.org" default="yes"
- href="http://ftp.gnome.org/pub/GNOME/sources/"/>
-
- <metamodule id="meta-goffice">
- <dependencies>
- <dep package="goffice"/>
- <dep package="libart_lgpl"/>
- <dep package="libgsf"/>
- </dependencies>
- </metamodule>
-
-
-
-
-
-</moduleset>
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
deleted file mode 100644
index 8f4eba6..0000000
--- a/modulesets/gtkhtml.modules
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Modules required to build gtkhtml required by GnuCash -->
-
-<moduleset>
-
- <repository type="tarball" name="ftp.gnome.org" default="yes"
- href="http://ftp.gnome.org/pub/GNOME/sources/"/>
- <repository type='tarball' name='rpm5.org'
- href="http://rpm5.org/files/"/>
- <repository type="tarball" name="abisource/enchant"
- href="http://www.abisource.com/downloads/enchant/" />
- <repository type='tarball' name='michael.68k.org'
- href="http://www.68k.org/~michael/"/>
- <repository type="tarball" name="ftp.gnu.org"
- href="ftp://ftp.gnu.org/gnu/"/>
- <repository type="tarball" name="xmlsoft"
- href="ftp://xmlsoft.org/libxml2/python/"/>
- <repository type="tarball" name="freedesktop.org"
- href="http://dbus.freedesktop.org/releases/"/>
- <repository type="tarball" name="sourceforge.net"
- href ="http://downloads.sourceforge.net/"/>
-
- <metamodule id="meta-gtkhtml">
- <dependencies>
- <dep package="gtkhtml"/>
- <dep package="libgnomeui"/>
- <dep package="libbonoboui"/>
- <dep package="libgnome"/>
- <dep package="libgnomeprint"/>
- <dep package="libgnomeprintui"/>
- <dep package="libgnomecups"/>
- <dep package="libgnomecanvas"/>
- <dep package="gnome-vfs"/>
- <dep package="libbonobo"/>
-<!-- <dep package="esound"/> -->
- <dep package="enchant"/>
-<!-- <dep package="audiofile"/> -->
- <dep package="dbus"/>
- <dep package="dbus-glib"/>
- <dep package="libgnome-keyring"/>
- <dep package="libtasn1"/>
- </dependencies>
- </metamodule>
-
- <distutils id="libxml-py" suports-non-srcdir-builds="no">
- <branch module="libxml2-python-2.6.15.tar.gz" version="2.6.15"
- repo="xmlsoft"/>
- </distutils>
-
- <autotools id="gtkhtml" autogenargs="--disable-deprecated-warning-flags">
- <!--
-In order to compile GtkHTML, you need libgnome[ui] 1.112.1 (or later),
-Bonobo 1.112.1 (or later), gnome-print 2.2.0 (or later) and GAL 2.1.0 (or
-later).
-
-Optionally you may want to install GConf 1.0.7 (or later).
--->
-<!-- The last version which works with Gtk2 -->
- <branch module="gtkhtml/3.32/gtkhtml-3.32.2.tar.bz2" version="3.32.2"
- hash="sha2556:8746053cf709e1de37c7ac775ab1364ddda4b75167660ed7f98a237b3797e39f"/>
- <dependencies>
- <dep package="gtk+"/>
- <dep package="iso-codes"/>
- <dep package="enchant"/>
- <dep package="gconf2"/>
- <dep package="libsoup"/>
-<!-- dep package="gnome-icon-theme" -->
- </dependencies>
- </autotools>
-<!-- Most of the following packages are deprecated -->
- <autotools id="libgnomecups">
- <branch module="libgnomecups/0.2/libgnomecups-0.2.3.tar.bz2" version="0.2.3"
- md5sum="dc4920c15c9f886f73ea74fbff0ae48b"/>
- <dependencies>
- <dep package="glib"/>
- <dep package="gnome-common"/>
- </dependencies>
- </autotools>
-
- <autotools id="libgnomeprint" autogen.sh="autoreconf"
- autogenargs="--disable-gtk-doc" >
- <branch module="libgnomeprint/2.18/libgnomeprint-2.18.6.tar.gz"
- repo="ftp.gnome.org" version="2.18.6"
- md5sum="10a9e58aabecf541bc6852f64b3a9294">
- <!-- Note: A fix was committed to SVN 9APR2009, so this patch should be removed when this module is upgraded to the next release. -->
- <patch file="http://raw.github.com/jralls/gnucash-on-osx/raw/master/patches/libgnomeprint.patch" skip="0"/>
- </branch>
- <dependencies>
- <dep package="bison"/>
- <dep package="intltool"/>
- <dep package="libart_lgpl"/>
- <dep package="glib"/>
- <dep package="gnome-common"/>
- <dep package="pango"/>
- <dep package="libgnomecups"/>
- <dep package="freetype"/>
- </dependencies>
- </autotools>
-
- <autotools id="libgnomeprintui">
- <branch module="libgnomeprintui/2.18/libgnomeprintui-2.18.4.tar.bz2"
- version="2.18.4" md5sum="e76d763f6279b900a63e5fb2909f8810"/>
- <dependencies>
- <dep package="libgnomeprint"/>
- <dep package="gtk+"/>
- <dep package="libgnomecanvas"/>
- <dep package="gnome-icon-theme"/>
- </dependencies>
- </autotools>
-
-
- <autotools id="popt" autogen-sh='configure'>
- <branch module="popt/popt-1.14.tar.gz" version="1.14" repo="rpm5.org"/>
- </autotools>
-
-<!-- Encountered a problem with linking libgnomevfs: For some reason it didn't include libresolv in the link list. Added it manually to Makefile and it worked, need a better solution. -->
- <autotools id="gnome-vfs" autogen-sh="configure" autogenargs='LDFLAGS="$LDFLAGS -lresolv"'>
- <branch module="gnome-vfs/2.24/gnome-vfs-2.24.2.tar.bz2" version="2.24.2"
- hash="sha256:50ecf5f37d377492e8943a3c359ffe64176d4e7f045e9980790eca999a1c6856">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/gnome-vfs-glib-2_36.patch" skip='1'/>
- </branch>
- <dependencies>
- <dep package="gconf2"/>
- <dep package="shared-mime-info"/>
- <dep package="gnome-mime-data"/>
- <dep package="dbus-glib"/>
- </dependencies>
- </autotools>
-
-
- <autotools id="libgnomeui" autogen-sh="configure">
- <branch module="libgnomeui/2.24/libgnomeui-2.24.2.tar.bz2" version="2.24.2"
- repo="ftp.gnome.org" hash="sha256:ae7459b3ddee78258bb2d619fd199b0b24647f1df45fc397fee83d659c354910">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/libgnomeui.patch" skip="0"/>
- </branch>
- <dependencies>
- <dep package="libbonoboui"/>
- <dep package="libglade"/>
- <dep package="gnome-icon-theme"/>
- <dep package="libgnome-keyring"/>
- </dependencies>
- </autotools>
-
-
- <autotools id="libbonobo" autogen-sh="configure">
-<!-- DEPENDS says "ORBit" -->
- <branch module="libbonobo/2.24/libbonobo-2.24.2.tar.bz2" version="2.24.2"
- hash="sha256:95c0230a31a657e1873fc601318bbaa16722986699219317053f1cd1aa2a28bf">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/libbonobo-glib-2_36.patch" skip='1'/>
- </branch>
- <dependencies>
- <dep package="popt"/>
- <dep package="ORBit2"/>
- <dep package="intltool"/>
- <dep package="gnome-common"/>
- <dep package="dbus-glib"/>
- </dependencies>
- </autotools>
-
- <autotools id="libbonoboui" autogenargs="--without-x" autogen-sh="configure">
- <branch module="libbonoboui/2.24/libbonoboui-2.24.2.tar.bz2"
- version="2.24.2" hash="sha256:aebcf9dc56a76f4ab1ae2134920d962e12c6f7397028052658dad5b1bebdbe00"/>
- <dependencies>
- <dep package="libgnome"/>
- <dep package="libbonobo"/>
- <dep package="libgnomecanvas"/>
- <dep package="libglade"/>
- </dependencies>
- </autotools>
-
- <autotools id="libgnome" autogenargs="--disable-esd" autogen-sh="configure">
- <branch module="libgnome/2.26/libgnome-2.26.0.tar.bz2" version="2.26.0"
- md5sum="a5634fe9ddc54bbb726cbaaa35abc0b9">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/libgnome-glib-2_36.patch" skip='1'/>
- </branch>
- <dependencies>
- <dep package="libbonobo"/>
- <dep package="gnome-vfs"/>
- <dep package="gconf2"/>
-<!-- <dep package="esound"/> -->
- </dependencies>
- </autotools>
-
- <autotools id="libgnomecanvas" autogen-sh="configure">
- <branch module="libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2"
- version="2.26.0" md5sum="9bbc635e5ae70e63af071af74ba7e72f"/>
- <dependencies>
- <dep package="libart_lgpl"/>
- <dep package="libglade"/>
- </dependencies>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="meta-gtk-osx-core"/>
- </after>
- </autotools>
-
-</moduleset>
\ No newline at end of file
commit 27b01d5b50ac10112a7a8954606f9af37157006c
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 29 11:45:36 2013 -0800
Fix some misdirected patches, set docs to 2.4 for stable
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index f13288b..cc042a6 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -307,7 +307,7 @@
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
autogen='autreconf'
makeargs=" html" makeinstallargs="install-html" >
- <branch repo="svn.gnucash.org" module="gnucash-docs"
+ <branch repo="svn.gnucash.org" module="gnucash-docs" revision="2.4"
/>
</autotools>
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index 6b9c313..8f4eba6 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -118,7 +118,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
<autotools id="gnome-vfs" autogen-sh="configure" autogenargs='LDFLAGS="$LDFLAGS -lresolv"'>
<branch module="gnome-vfs/2.24/gnome-vfs-2.24.2.tar.bz2" version="2.24.2"
hash="sha256:50ecf5f37d377492e8943a3c359ffe64176d4e7f045e9980790eca999a1c6856">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/gnome-vfs-glib-2_36.patch" skip='1'/>
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/gnome-vfs-glib-2_36.patch" skip='1'/>
</branch>
<dependencies>
<dep package="gconf2"/>
@@ -147,7 +147,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
<!-- DEPENDS says "ORBit" -->
<branch module="libbonobo/2.24/libbonobo-2.24.2.tar.bz2" version="2.24.2"
hash="sha256:95c0230a31a657e1873fc601318bbaa16722986699219317053f1cd1aa2a28bf">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/libbonobo-glib-2_36.patch" skip='1'/>
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/libbonobo-glib-2_36.patch" skip='1'/>
</branch>
<dependencies>
<dep package="popt"/>
@@ -172,7 +172,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
<autotools id="libgnome" autogenargs="--disable-esd" autogen-sh="configure">
<branch module="libgnome/2.26/libgnome-2.26.0.tar.bz2" version="2.26.0"
md5sum="a5634fe9ddc54bbb726cbaaa35abc0b9">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/libgnome-glib-2_36.patch" skip='1'/>
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/libgnome-glib-2_36.patch" skip='1'/>
</branch>
<dependencies>
<dep package="libbonobo"/>
commit 752a9c87126479063b6e0a1efaa89ad9d3bfb5f3
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 29 09:46:38 2013 -0800
Release 2.4.14
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index dcf422f..2314d5a 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.4.13 © 2013 Gnucash Contributors</string>
+ <string>Gnucash version 2.4.14 © 2013 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4.13 © 2013 Gnucash Contributers</string>
+ <string>2.4.14 © 2013 Gnucash Contributers</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4.13</string>
+ <string>2.4.14</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.4.13</string>
+ <string>2.4.14</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 2ac4aaa..f13288b 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -185,7 +185,7 @@
<autotools id="gnucash"
autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
- <branch module="gnucash/stable/gnucash-2.4.13.tar.bz2" version="2.4.13"
+ <branch module="gnucash/stable/gnucash-2.4.14.tar.bz2" version="2.4.14"
repo="sourceforge">
</branch>
<dependencies>
commit c9a9476970842dd940af7645caf4a0c4d5fa7551
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Dec 16 13:50:52 2013 -0800
Copy Bundle Extension Info to Info-Unstable.plist
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 1c5c897..689c760 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -26,6 +26,35 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>2.5.10</string>
+ <key>CFBundleDocumentTypes</key>
+ <array>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Gnucash Document</string>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>gnucash</string>
+ </array>
+ <key>CFBundleTypeIconFile</key>
+ <string>gnucash.icns</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Gnucash Import/Export</string>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>qif</string>
+ <string>ofx</string>
+ <string>txf</string>
+ </array>
+ <key>CFBundleTypeIconFile</key>
+ <string>gnucash.icns</string>
+ <key>CFBundleTypeRole</key>
+ <string>Viewer</string>
+ </dict>
+ </array>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
commit 858361f852a919da6ecf8f9fb62552c9942eabac
Merge: 3c58890 f670a55
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Dec 16 13:46:22 2013 -0800
Merge pull request #3 from clepple/Info.plist-fix
Info.plist: fix spelling of CFBundleTypeIconFile
commit 3c588901c9ba7237dc7d59d886aad5d825f2c4a7
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 15 10:01:17 2013 -0800
Use new loadable flag to ensure libtool library stubs are included in the bundle for libraries that are dlopened.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index a55bd71..2746a94 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -79,15 +79,15 @@
${prefix}/lib/libguile-srfi*
</binary>
- <binary>
+ <binary loadable="True">
${prefix}/lib/gnucash
</binary>
- <binary>
+ <binary loadable="True">
${prefix}/lib/aqbanking
</binary>
- <binary>
+ <binary loadable="True">
${prefix}/lib/gwenhywfar
</binary>
@@ -107,7 +107,7 @@
${prefix}/lib/goffice
</binary>
- <binary>
+ <binary loadable="True">
${prefix}/lib/dbd
</binary>
commit 71c8afc3225e5ae38db4b7c4fa8e43d057ae4352
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Dec 7 18:18:31 2013 -0800
Add flags to gwen & aqb to turn on relocation (bundle) support
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 0a20254..2ac4aaa 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -43,7 +43,7 @@
</autotools>
<autotools id="gwenhywfar" autogen-sh="configure"
- autogenargs="--disable-qt4 --with-guis=gtk2">
+ autogenargs="--with-guis=gtk2 --enable-local-install">
<branch module="gnucash/Dependencies/gwenhywfar-4.3.3.tar.gz" version="4.3.3"
repo="sourceforge">
<patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='0'/>
@@ -55,7 +55,7 @@
</autotools>
<autotools id="gwenhywfar-svn" autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
- autogenargs="--disable-qt4 --with-guis=gtk2">
+ autogenargs="--with-guis=gtk2 --enable-local-install">
<branch module="gwenhywfar" repo="aquamaniac"/>
<dependencies>
<dep package="libgcrypt"/>
@@ -68,7 +68,8 @@
repo="sourceforge"/>
</autotools>
- <autotools id="aqbanking" autogen-sh="configure" makeargs="-j1">
+ <autotools id="aqbanking" autogen-sh="configure" makeargs="-j1"
+ autogenargs="--enable-local-install">
<branch module="gnucash/Dependencies/aqbanking-5.0.25.tar.gz" version="5.0.25"
repo="sourceforge"/>
<dependencies>
@@ -79,7 +80,7 @@
</autotools>
<autotools id="aqbanking-svn"
- autogenargs='--enable-ofx=yes --disable-kde --disable-chipcard-client --disable-python --with-frontends="cbanking g2banking"'
+ autogenargs='--enable-local-install"'
autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" >
<branch module="aqbanking" repo="aquamaniac" >
</branch>
commit 800206b223ac6754dc8c99717db854d21db08f3e
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 15 09:55:55 2013 -0800
Update gnucash-unstable to 2.5.10
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 960d2cd..1c5c897 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.5.9 © 2013 Gnucash Contributors</string>
+ <string>Gnucash version 2.5.10 © 2013 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.5.9 © 2013 Gnucash Contributors</string>
+ <string>2.5.10 © 2013 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.5.9</string>
+ <string>2.5.10</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.5.9</string>
+ <string>2.5.10</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index f3b104a..0a20254 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -204,7 +204,7 @@
<autotools id="gnucash-unstable" autogen-sh='configure'
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash/unstable/gnucash-2.5.9.tar.bz2" version="2.5.9"
+ <branch module="gnucash/unstable/gnucash-2.5.10.tar.bz2" version="2.5.10"
repo="sourceforge"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit f670a55c454bc38aa8ea527982df6455cd38da61
Author: Charles Lepple <clepple+git at gmail.com>
Date: Tue Dec 10 15:45:55 2013 -0500
Info.plist: fix spelling of CFBundleTypeIconFile
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 8b07c5f..dcf422f 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -35,7 +35,7 @@
<array>
<string>gnucash</string>
</array>
- <key>CFBundlieTypeIconFile</key>
+ <key>CFBundleTypeIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
@@ -49,7 +49,7 @@
<string>ofx</string>
<string>txf</string>
</array>
- <key>CFBundlieTypeIconFile</key>
+ <key>CFBundleTypeIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
commit 56f262c8a266fb9870757fed5208ec48d3021b42
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Dec 7 15:27:56 2013 -0800
Patch Gwenhywfar so that it can find its bits in a bundle
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 177e9e7..f3b104a 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -45,7 +45,9 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--disable-qt4 --with-guis=gtk2">
<branch module="gnucash/Dependencies/gwenhywfar-4.3.3.tar.gz" version="4.3.3"
- repo="sourceforge" />
+ repo="sourceforge">
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='0'/>
+ </branch>
<dependencies>
<dep package="libgcrypt"/>
<dep package="gnutls"/>
@@ -99,8 +101,7 @@
autogenargs="--disable-static --enable-shared --disable-doc-build --disable-nls">
<branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
version='1.5.2'>
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/OpenSP-AC_CONFIG_HEADERS.patch" strip='0'>
- </patch>
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/OpenSP-AC_CONFIG_HEADERS.patch" strip='0'/>
</branch>
</autotools>
diff --git a/patches/gwen-macos-bundle-path.patch b/patches/gwen-macos-bundle-path.patch
new file mode 100644
index 0000000..9c57e2c
--- /dev/null
+++ b/patches/gwen-macos-bundle-path.patch
@@ -0,0 +1,26 @@
+Index: src/os/posix/directory.c
+===================================================================
+--- src/os/posix/directory.c (revision 2280)
++++ src/os/posix/directory.c (working copy)
+@@ -28,7 +28,7 @@
+
+ #include "directory_p.h"
+ #if defined(OS_DARWIN) && defined(ENABLE_LOCAL_INSTALL)
+-# include <CoreFoundation/CFBundle.h>
++# include <mach-o/dyld.h>
+ # include <sys/param.h>
+ #else
+ # include "binreloc.h"
+@@ -229,9 +229,10 @@
+ /* remove "/bin/" or "MacOS" from path */
+ s=strrchr(realbuffer, '/');
+ if (s) {
+- if (strcasecmp(s, "/bin")==0 ||
+- strcasecmp(s, "/MacOS")==0)
++ if (strcasecmp(s, "/bin")==0)
+ *s=0;
++ if (strcasecmp(s, "/MacOS")==0)
++ strcpy(s, "/Resources");
+ }
+ }
+
commit c91262f3917df5e19b0072bc017124c06012f79b
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Nov 30 21:19:28 2013 -0800
Update for Gnucash 2.5.9
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index f7fbc73..960d2cd 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.5.8 © 2013 Gnucash Contributors</string>
+ <string>Gnucash version 2.5.9 © 2013 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.5.8 © 2013 Gnucash Contributors</string>
+ <string>2.5.9 © 2013 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.5.8</string>
+ <string>2.5.9</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.5.8</string>
+ <string>2.5.9</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 4b700d7..395b8f9 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -85,7 +85,7 @@ export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
export GNC_DOT_DIR="$HOME/Library/Application Support/Gnucash"
-export OFX_DTD_PATH="{bundle_data}/libofx/dtd"
+export OFX_DTD_PATH="${bundle_data}/libofx/dtd"
if test -f "$GNC_DOT_DIR/gnucashrc"; then
source "$GNC_DOT_DIR/gnucashrc"
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 81f4f51..177e9e7 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -203,7 +203,7 @@
<autotools id="gnucash-unstable" autogen-sh='configure'
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash/unstable/gnucash-2.5.8.tar.bz2" version="2.5.8"
+ <branch module="gnucash/unstable/gnucash-2.5.9.tar.bz2" version="2.5.9"
repo="sourceforge"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit b52afdec882a9065afc853ad68bb77563acae5dd
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Nov 19 14:16:05 2013 -0800
Add makeargs=-j1 to aqbanking to prevent race condition in link phase
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 0d7e25f..81f4f51 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -66,7 +66,7 @@
repo="sourceforge"/>
</autotools>
- <autotools id="aqbanking" autogen-sh="configure">
+ <autotools id="aqbanking" autogen-sh="configure" makeargs="-j1">
<branch module="gnucash/Dependencies/aqbanking-5.0.25.tar.gz" version="5.0.25"
repo="sourceforge"/>
<dependencies>
commit ef35a832aa64bab082cc44fb0c87436e684018eb
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 17 14:59:54 2013 -0800
Bug 710514: QFX import fails in Mac OSX 2.5.6
Add OFX_DTD_PATH to bundle launcher.
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 0730189..4b700d7 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -85,6 +85,7 @@ export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
export GNC_DOT_DIR="$HOME/Library/Application Support/Gnucash"
+export OFX_DTD_PATH="{bundle_data}/libofx/dtd"
if test -f "$GNC_DOT_DIR/gnucashrc"; then
source "$GNC_DOT_DIR/gnucashrc"
commit 02718c37908695aae569600e3c6fe40dea4ad555
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Nov 16 17:19:29 2013 -0800
Update for Gnucash 2.5.8
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 46ed74f..f7fbc73 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.5.7 © 2013 Gnucash Contributors</string>
+ <string>Gnucash version 2.5.8 © 2013 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.5.7 © 2013 Gnucash Contributors</string>
+ <string>2.5.8 © 2013 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.5.7</string>
+ <string>2.5.8</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.5.7</string>
+ <string>2.5.8</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 1600c2a..0d7e25f 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -203,7 +203,7 @@
<autotools id="gnucash-unstable" autogen-sh='configure'
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash/unstable/gnucash-2.5.7.tar.bz2" version="2.5.7"
+ <branch module="gnucash/unstable/gnucash-2.5.8.tar.bz2" version="2.5.8"
repo="sourceforge"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit 980dd4aac9384be1042d80ebe3fd44e865beaec0
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 3 12:01:04 2013 -0800
Update for Gnucash-2.5.7
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index b790bf3..46ed74f 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.5.6 © 2013 Gnucash Contributors</string>
+ <string>Gnucash version 2.5.7 © 2013 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.5.6 © 2013 Gnucash Contributors</string>
+ <string>2.5.7 © 2013 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.5.6</string>
+ <string>2.5.7</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.5.6</string>
+ <string>2.5.7</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index db5217e..0730189 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -63,6 +63,7 @@ export GUILE_WARN_DEPRECATED
GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
+GUILE_LOAD_PATH="${bundle_data}/guile/1.8/"
EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/guile-modules"
EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/scm"
GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
@@ -78,6 +79,7 @@ export DYLD_FRAMEWORK_PATH="${bundle_fw}"
export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/guile-modules/gnucash/report/standard-reports"
export GNC_DBD_DIR="${bundle_lib}/dbd"
export GSETTINGS_SCHEMA_DIR="${bundle_data}"
+
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 1fcc5de..1600c2a 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -203,7 +203,7 @@
<autotools id="gnucash-unstable" autogen-sh='configure'
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash/unstable/gnucash-2.5.6.tar.bz2" version="2.5.6"
+ <branch module="gnucash/unstable/gnucash-2.5.7.tar.bz2" version="2.5.7"
repo="sourceforge"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit 041ba740cbdc7b01994339fc03a6cf4e192ac074
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 10 13:10:28 2013 -0700
Fix typo in gnucash-unstable.launcher
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index b7fd0f2..db5217e 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -77,7 +77,7 @@ DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
export DYLD_FRAMEWORK_PATH="${bundle_fw}"
export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/guile-modules/gnucash/report/standard-reports"
export GNC_DBD_DIR="${bundle_lib}/dbd"
-export GSETTINGS_SCHEMA_DIR="${bundle_data}
+export GSETTINGS_SCHEMA_DIR="${bundle_data}"
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
commit c7420803f32e359938dcd5495fac182637159257
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Oct 9 12:54:47 2013 -0700
More launcher and bundle adjustments
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 7b9df51..a55bd71 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -135,7 +135,7 @@
</data>
<data>
- ${prefix}/etc/gconf
+ ${prefix}/share/glib-2.0/schemas
</data>
<data>
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 24b51fb..b7fd0f2 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -10,9 +10,6 @@ else
EXEC=exec
fi
-export PREFIX=/Library/Gnucash-2.5
-export PREFIXDIR="`dirname $PREFIX`"
-
name=`basename "$0"`
tmp="$0"
tmp=`dirname "$tmp"`
@@ -28,7 +25,7 @@ bundle_etc="$bundle_res"/etc
export DYLD_LIBRARY_PATH="$bundle_lib"
export XDG_CONFIG_DIRS="$bundle_etc"/xdg
-export XDG_DATA_DIRS="$PREFIX/share"
+export XDG_DATA_DIRS="$bundle_data"
export GTK_DATA_PREFIX="$bundle_res"
export GTK_EXE_PREFIX="$bundle_res"
export GTK_PATH="$bundle_res"
@@ -80,7 +77,7 @@ DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
export DYLD_FRAMEWORK_PATH="${bundle_fw}"
export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/guile-modules/gnucash/report/standard-reports"
export GNC_DBD_DIR="${bundle_lib}/dbd"
-
+export GSETTINGS_SCHEMA_DIR="${bundle_data}
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
commit 9eba29b56c4daebe79174a02fb2530d8e54020a0
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Oct 8 07:37:28 2013 -0700
Change commenting on include lines
Don't use private modulesets
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 662f8ff..1fcc5de 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -29,8 +29,8 @@
<repository type="git" name="github"
href="git://github.com/"/>
- <!--include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/-->
- <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
+ <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
+ <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
<include href="gtkhtml.modules"/>
<autotools id="libchipcard" autogen-sh="configure" >
commit f8681bcda2c80e6433703a1e5c7ddb7934683f70
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Oct 8 07:24:22 2013 -0700
Release 2.5.6
Including module updates removing GConf
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 6c540ac..b790bf3 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.5.5 © 2013 Gnucash Contributors</string>
+ <string>Gnucash version 2.5.6 © 2013 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.5.5 © 2013 Gnucash Contributors</string>
+ <string>2.5.6 © 2013 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.5.5</string>
+ <string>2.5.6</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.5.5</string>
+ <string>2.5.6</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index dbbc1cb..7b9df51 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -74,10 +74,6 @@
${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
</binary>
- <binary>
- ${prefix}/lib/GConf/2/*.so
- </binary>
-
<!-- Seems to get missed by the dependency resolver -->
<binary>
${prefix}/lib/libguile-srfi*
@@ -100,14 +96,6 @@
</binary>
<binary>
- ${prefix}/bin/dbus-launch
- </binary>
-
- <binary>
- ${prefix}/bin/dbus-daemon
- </binary>
-
- <binary>
${prefix}/bin/gnc-*
</binary>
@@ -159,14 +147,6 @@
</data>
<data>
- ${prefix}/share/GConf
- </data>
-
- <data>
- ${prefix}/share/dbus-1/
- </data>
-
- <data>
${prefix}/share/aqbanking
</data>
@@ -190,18 +170,6 @@
${project}/gnucash.icns
</data>
- <data dest="${bundle}/Contents/Resources">
- ${prefix}/share/strings
- </data>
-
- <data dest='${bundle}/Contents/Resources/var/lib/dbus/machine-id'>
- ${prefix}/var/lib/dbus/machine-id
- </data>
-
- <data dest='${bundle}/Contents/Resources/etc/dbus-1/'>
- ${prefix}/etc/dbus-1/
- </data>
-
<data dest="${bundle}/Contents/Resources/License">
${prefix}/share/doc/gnucash/LICENSE
</data>
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 4fa28de..24b51fb 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -63,59 +63,6 @@ export PATH
GUILE_WARN_DEPRECATED="no"
export GUILE_WARN_DEPRECATED
-if [ -w "$PREFIXDIR" ]; then
- if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
- if [ ! -d "$PREFIX" ]; then
- rm "$PREFIX"; else
- mv "$PREFIX" "$PREFIX.Save";
- fi
- ln -s "$RESPFX" "$PREFIX"
- elif [ ! -e "$PREFIX" ] ; then
- echo "Linking $RESPFX to $PREFIX"
- if [ ! -d "$PREFIXDIR" ]; then
- mkdir -p "$PREFIXDIR";
- fi
- ln -s "$RESPFX" "$PREFIX"
- fi
-else
- echo "Don't have write access to $PREFIXDIR"
- if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
- echo "moving the $PREFIX directory to $PREFIX.save"
- osascript <<EOF
-display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
-do shell script "echo foo; if [ ! -d \"$PREFIX\" ]; then rm \"$PREFIX\"; else mv \"$PREFIX\" \"$PREFIX.Save\"; fi; ln -s \"$RESPFX\" \"$PREFIX\" " with administrator privileges
-
-EOF
-
- elif [ ! -e "$PREFIX" ] ;
- then
- echo "Linking $RESPFX to $PREFIX"
- osascript <<EOF
-display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
-do shell script "if [ ! -d \"$PREFIXDIR\" ]; then mkdir -p \"$PREFIXDIR\"; fi; ln -s \"$RESPFX\" \"$PREFIX\"" with administrator privileges
-
-EOF
-
-
- fi
-fi
-
-if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
- # If we get here without a way to connect to an instance of dbus-daemon,
- # then we can kill any existing instances of dbus-daemon that originate
- # in this copy of Gnucash.
-
- DBUS_PIDS=`ps ux | grep dbus-daemon | grep "${PREFIX}" | awk '{print $2}'`
-
- if /bin/test "$DBUS_PIDS"; then
- for DBUS_PID in ${DBUS_PIDS}
- do
- /bin/kill "${DBUS_PID}"
- done
- fi
-
- eval `"$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
-fi
GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 9880dab..662f8ff 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -29,8 +29,8 @@
<repository type="git" name="github"
href="git://github.com/"/>
- <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
- <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
+ <!--include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/-->
+ <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
<include href="gtkhtml.modules"/>
<autotools id="libchipcard" autogen-sh="configure" >
@@ -203,7 +203,7 @@
<autotools id="gnucash-unstable" autogen-sh='configure'
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash/unstable/gnucash-2.5.5.tar.bz2" version="2.5.5"
+ <branch module="gnucash/unstable/gnucash-2.5.6.tar.bz2" version="2.5.6"
repo="sourceforge"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
@@ -217,7 +217,6 @@
<dep package="iso-codes"/>
<dep package="guile"/>
<dep package="swig"/>
- <dep package="gconf2"/>
</dependencies>
</autotools>
@@ -238,7 +237,6 @@
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
<dep package="swig"/>
- <dep package="gconf2"/>
</dependencies>
</autotools>
@@ -260,7 +258,6 @@
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
<dep package="swig"/>
- <dep package="gconf2"/>
</dependencies>
</autotools>
commit 517a432ce4016ce31cd7c35ad6e3a6361c598b0d
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Sep 30 22:50:25 2013 -0700
Fix messed up dbi-drv.patch. Hope this one works.
diff --git a/patches/dbi-drv.patch b/patches/dbi-drv.patch
index 97855af..016b0ef 100644
--- a/patches/dbi-drv.patch
+++ b/patches/dbi-drv.patch
@@ -1,23 +1,21 @@
-diff -c /usr/local/src/gnucash/libdbi-drivers-0.8.3-1/configure.in\~ /usr/local/src/gnucash/libdbi-drivers-0.8.3-1/configure.in
---- a/configure.in Mon Mar 3 09:41:41 2008
-+++ b/configure.in Tue Dec 8 17:05:50 2009
-@@ -3,1 +3,1 @@
+--- a/configure.in 2013-09-30 22:43:48.000000000 -0700
++++ b/configure.in 2013-08-03 09:14:47.000000000 -0700
+@@ -3,7 +3,7 @@
AM_MAINTAINER_MODE
-
+
AM_INIT_AUTOMAKE(libdbi-drivers, 0.8.3-1)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
-AC_LIBTOOL_WIN32_DLL
-
-dnl library versioning currently unnecessary...
+ AC_LIBTOOL_WIN32_DLL
+
+ dnl library versioning currently unnecessary...
@@ -63,6 +63,8 @@
DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8"
CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
+ *-*-darwin*)
-+ ;;
++ ;;
*)
DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
-Diff finished. Tue Dec 8 17:06:44 2009
commit 0701cfd6bc7f2b38aef666d259c3f4bd3b393edf
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Sep 30 22:39:23 2013 -0700
Fix more bad lines in dbi-drv.patch
diff --git a/patches/dbi-drv.patch b/patches/dbi-drv.patch
index 80df765..97855af 100644
--- a/patches/dbi-drv.patch
+++ b/patches/dbi-drv.patch
@@ -7,9 +7,9 @@ diff -c /usr/local/src/gnucash/libdbi-drivers-0.8.3-1/configure.in\~ /usr/local/
AM_INIT_AUTOMAKE(libdbi-drivers, 0.8.3-1)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
+AC_LIBTOOL_WIN32_DLL
- dnl Library versioning
- LIB_CURRENT=0
+dnl library versioning currently unnecessary...
@@ -63,6 +63,8 @@
DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8"
CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
commit 57a6895b21ee490ac8ed994be760dc9a4a88954c
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Sep 30 22:35:46 2013 -0700
Fix bad line in dbi-drv.patch
diff --git a/patches/dbi-drv.patch b/patches/dbi-drv.patch
index c64697b..80df765 100644
--- a/patches/dbi-drv.patch
+++ b/patches/dbi-drv.patch
@@ -1,10 +1,10 @@
diff -c /usr/local/src/gnucash/libdbi-drivers-0.8.3-1/configure.in\~ /usr/local/src/gnucash/libdbi-drivers-0.8.3-1/configure.in
--- a/configure.in Mon Mar 3 09:41:41 2008
+++ b/configure.in Tue Dec 8 17:05:50 2009
-@@ -3,5 +3,5 @@
+@@ -3,1 +3,1 @@
AM_MAINTAINER_MODE
- AM_INIT_AUTOMAKE(libdbi, 0.8.3)
+ AM_INIT_AUTOMAKE(libdbi-drivers, 0.8.3-1)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
commit 754f630c8114cfde7bf970d747dba03365eb4b86
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Sep 30 22:26:28 2013 -0700
Change obsolete AM_CONFIG_HEADER for dbi.patch
diff --git a/patches/dbi.patch b/patches/dbi.patch
index 1c3ad7b..b17f33c 100644
--- a/patches/dbi.patch
+++ b/patches/dbi.patch
@@ -1,5 +1,14 @@
diff -c /Users/john/gtk/source/libdbi-0.8.3/configure.in\~ /Users/john/gtk/source/libdbi-0.8.3/configure.in
--- a/configure.in Wed Feb 6 08:03:27 2008
+@@ -3,5 +3,5 @@
+ AM_MAINTAINER_MODE
+
+ AM_INIT_AUTOMAKE(libdbi, 0.8.3)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ dnl Library versioning
+ LIB_CURRENT=0
+++ b/configure.in Mon Sep 30 22:10:00 2013
@@ -61,6 +61,8 @@
DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
commit dc6df4edf07577558da72b548c0b4a48338aa812
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Sep 30 22:19:48 2013 -0700
Convert dbi-drv.patch to universal so older diffs can digest it
diff --git a/patches/dbi-drv.patch b/patches/dbi-drv.patch
index 42bf51f..c64697b 100644
--- a/patches/dbi-drv.patch
+++ b/patches/dbi-drv.patch
@@ -1,9 +1,7 @@
diff -c /usr/local/src/gnucash/libdbi-drivers-0.8.3-1/configure.in\~ /usr/local/src/gnucash/libdbi-drivers-0.8.3-1/configure.in
-*** a/configure.in Mon Mar 3 09:41:41 2008
---- b/configure.in Tue Dec 8 17:05:50 2009
-***************
-*** 3,7 ****
---- 3,7 ----
+--- a/configure.in Mon Mar 3 09:41:41 2008
++++ b/configure.in Tue Dec 8 17:05:50 2009
+@@ -3,5 +3,5 @@
AM_MAINTAINER_MODE
AM_INIT_AUTOMAKE(libdbi, 0.8.3)
@@ -12,16 +10,14 @@ diff -c /usr/local/src/gnucash/libdbi-drivers-0.8.3-1/configure.in\~ /usr/local/
dnl Library versioning
LIB_CURRENT=0
-***************
-*** 63,68 ****
---- 63,70 ----
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8"
- CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
-+ *-*-darwin*)
-+ ;;
- *)
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
+@@ -63,6 +63,8 @@
+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8"
+ CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
+ PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
++ *-*-darwin*)
++ ;;
+ *)
+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+ CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
Diff finished. Tue Dec 8 17:06:44 2009
commit 582970725c1dd2e3d79b703720c3da1aab7daf8e
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Sep 30 22:18:34 2013 -0700
Convert dbi.patch to universal so older diffs can digest it
diff --git a/patches/dbi.patch b/patches/dbi.patch
index 8d9b220..1c3ad7b 100644
--- a/patches/dbi.patch
+++ b/patches/dbi.patch
@@ -1,27 +1,14 @@
-diff -c /usr/local/src/gnucash/libdbi-0.8.3/configure.in\~ /usr/local/src/gnucash/libdbi-0.8.3/configure.in
-*** a/configure.in Wed Feb 6 08:03:27 2008
---- b/configure.in Tue Dec 8 17:09:30 2009
-***************
-*** 3,7 ****
---- 3,7 ----
- AM_MAINTAINER_MODE
+diff -c /Users/john/gtk/source/libdbi-0.8.3/configure.in\~ /Users/john/gtk/source/libdbi-0.8.3/configure.in
+--- a/configure.in Wed Feb 6 08:03:27 2008
++++ b/configure.in Mon Sep 30 22:10:00 2013
+@@ -61,6 +61,8 @@
+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
+ CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
+ PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99" ;;
++ *-*-darwin*)
++ ;;
+ *)
+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
+ CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
- AM_INIT_AUTOMAKE(libdbi, 0.8.3)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- dnl Library versioning
- LIB_CURRENT=0
-***************
-*** 61,66 ****
---- 61,68 ----
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
- CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99" ;;
-+ *-*-darwin*)
-+ ;;
- *)
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
-
-Diff finished. Tue Dec 8 17:09:36 2009
+Diff finished. Mon Sep 30 22:10:24 2013
commit e8f671705ea2df63d987af7b6b2a8ca2acf216bb
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Sep 21 18:17:22 2013 -0700
Bug 708526 - GnuCash Crashes when opening About page
Add missing doc files to bundle
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index b634c99..dbbc1cb 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -238,6 +238,10 @@
${prefix}/share/doc/gnucash-docs/ja_JP/gnucash-guide/
</data>
+ <data>
+ ${prefix}/share/doc/gnucash/
+ </data>
+
<translations name="gnucash">
${prefix}/share/locale
</translations>
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index ef815b3..25b2081 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -247,6 +247,10 @@
${prefix}/share/doc/gnucash-docs/ja_JP/gnucash-guide/
</data>
+ <data>
+ ${prefix}/share/doc/gnucash/
+ </data>
+
<translations name="gnucash">
${prefix}/share/locale
</translations>
commit a7d6f51795018532733a38d9ee34aa1460e865f3
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Sep 9 21:38:47 2013 -0700
Update for Gnucash-2.5.5
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index f6ff596..6c540ac 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.5.4 © 2013 Gnucash Contributors</string>
+ <string>Gnucash version 2.5.5 © 2013 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.5.4 © 2013 Gnucash Contributors</string>
+ <string>2.5.5 © 2013 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.5.4</string>
+ <string>2.5.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.5.4</string>
+ <string>2.5.5</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index de25d4f..9880dab 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -203,7 +203,7 @@
<autotools id="gnucash-unstable" autogen-sh='configure'
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash/unstable/gnucash-2.5.4.tar.bz2" version="2.5.4"
+ <branch module="gnucash/unstable/gnucash-2.5.5.tar.bz2" version="2.5.5"
repo="sourceforge"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit df7926ceb048ea3651200c286a7a5500a62ce20f
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Sep 9 21:35:24 2013 -0700
Patches to support building with glib-2.36
diff --git a/patches/gnome-vfs-glib-2_36.patch b/patches/gnome-vfs-glib-2_36.patch
new file mode 100644
index 0000000..0214e46
--- /dev/null
+++ b/patches/gnome-vfs-glib-2_36.patch
@@ -0,0 +1,1199 @@
+--- ./daemon/daemon-connection.c 2009-04-20 03:46:46.000000000 -0700
++++ ./daemon/daemon-connection.c 2013-08-26 14:56:03.000000000 -0700
+@@ -67,14 +67,14 @@
+ gint32 id;
+ } FileHandle;
+
+-static GStaticMutex cancellations_lock = G_STATIC_MUTEX_INIT;
++static GMutex cancellations_lock;
+ static GHashTable *cancellations;
+
+-static GStaticMutex directory_handles_lock = G_STATIC_MUTEX_INIT;
++static GMutex directory_handles_lock;
+ static GHashTable *directory_handles;
+ static guint next_directory_id = 1;
+
+-static GStaticMutex file_handles_lock = G_STATIC_MUTEX_INIT;
++static GMutex file_handles_lock;
+ static GHashTable *file_handles;
+ static guint next_file_id = 1;
+
+@@ -239,21 +239,21 @@
+ }
+ dbus_connection_unref (conn->conn);
+
+- g_static_mutex_lock (&directory_handles_lock);
++ g_mutex_lock (&directory_handles_lock);
+ if (directory_handles) {
+ g_hash_table_foreach_remove (directory_handles,
+ directory_handle_last_conn_is,
+ conn);
+ }
+- g_static_mutex_unlock (&directory_handles_lock);
++ g_mutex_unlock (&directory_handles_lock);
+
+- g_static_mutex_lock (&file_handles_lock);
++ g_mutex_lock (&file_handles_lock);
+ if (file_handles) {
+ g_hash_table_foreach_remove (file_handles,
+ file_handle_last_conn_is,
+ conn);
+ }
+- g_static_mutex_unlock (&file_handles_lock);
++ g_mutex_unlock (&file_handles_lock);
+
+ g_assert (!g_main_loop_is_running (conn->main_loop));
+
+@@ -320,14 +320,14 @@
+
+ handle = cancellation_handle_new (id, conn->conn_id);
+
+- g_static_mutex_lock (&cancellations_lock);
++ g_mutex_lock (&cancellations_lock);
+ if (cancellations == NULL) {
+ cancellations = g_hash_table_new_full (cancellation_handle_hash, cancellation_handle_equal,
+ NULL, (GDestroyNotify) cancellation_handle_free);
+ }
+
+ g_hash_table_insert (cancellations, handle, handle);
+- g_static_mutex_unlock (&cancellations_lock);
++ g_mutex_unlock (&cancellations_lock);
+
+ return handle;
+ }
+@@ -338,11 +338,11 @@
+ {
+ d(g_print ("Removing cancellation handle %d\n", handle->id));
+
+- g_static_mutex_lock (&cancellations_lock);
++ g_mutex_lock (&cancellations_lock);
+ if (!g_hash_table_remove (cancellations, handle)) {
+ g_warning ("Could't remove cancellation.");
+ }
+- g_static_mutex_unlock (&cancellations_lock);
++ g_mutex_unlock (&cancellations_lock);
+ }
+
+ /* Note: This is called from the main thread. */
+@@ -354,7 +354,7 @@
+
+ handle = NULL;
+
+- g_static_mutex_lock (&cancellations_lock);
++ g_mutex_lock (&cancellations_lock);
+
+ lookup.conn_id = conn_id;
+ lookup.id = cancellation_id;
+@@ -368,7 +368,7 @@
+ }
+ }
+
+- g_static_mutex_unlock (&cancellations_lock);
++ g_mutex_unlock (&cancellations_lock);
+ }
+
+
+@@ -408,7 +408,7 @@
+ {
+ DirectoryHandle *handle;
+
+- g_static_mutex_lock (&directory_handles_lock);
++ g_mutex_lock (&directory_handles_lock);
+ handle = directory_handle_new (conn, vfs_handle, next_directory_id++);
+
+ if (directory_handles == NULL) {
+@@ -418,7 +418,7 @@
+
+ g_hash_table_insert (directory_handles,
+ GINT_TO_POINTER (handle->id), handle);
+- g_static_mutex_unlock (&directory_handles_lock);
++ g_mutex_unlock (&directory_handles_lock);
+
+ return handle;
+ }
+@@ -426,13 +426,13 @@
+ static void
+ remove_directory_handle (DirectoryHandle *handle)
+ {
+- g_static_mutex_lock (&directory_handles_lock);
++ g_mutex_lock (&directory_handles_lock);
+ if (!g_hash_table_remove (directory_handles,
+ GINT_TO_POINTER (handle->id))) {
+ g_warning ("Couldn't remove directory handle %d\n",
+ handle->id);
+ }
+- g_static_mutex_unlock (&directory_handles_lock);
++ g_mutex_unlock (&directory_handles_lock);
+ }
+
+ static DirectoryHandle *
+@@ -441,13 +441,13 @@
+ {
+ DirectoryHandle *handle;
+
+- g_static_mutex_lock (&directory_handles_lock);
++ g_mutex_lock (&directory_handles_lock);
+ handle = g_hash_table_lookup (directory_handles,
+ GINT_TO_POINTER (id));
+ if (handle) {
+ handle->last_connection = conn;
+ }
+- g_static_mutex_unlock (&directory_handles_lock);
++ g_mutex_unlock (&directory_handles_lock);
+ return handle;
+ }
+
+@@ -487,7 +487,7 @@
+ {
+ FileHandle *handle;
+
+- g_static_mutex_lock (&file_handles_lock);
++ g_mutex_lock (&file_handles_lock);
+ handle = file_handle_new (conn, vfs_handle, next_file_id++);
+
+ if (file_handles == NULL) {
+@@ -497,7 +497,7 @@
+
+ g_hash_table_insert (file_handles,
+ GINT_TO_POINTER (handle->id), handle);
+- g_static_mutex_unlock (&file_handles_lock);
++ g_mutex_unlock (&file_handles_lock);
+
+ return handle;
+ }
+@@ -505,12 +505,12 @@
+ static void
+ remove_file_handle (FileHandle *handle)
+ {
+- g_static_mutex_lock (&file_handles_lock);
++ g_mutex_lock (&file_handles_lock);
+ if (!g_hash_table_remove (file_handles,
+ GINT_TO_POINTER (handle->id))) {
+ g_warning ("Couldn't remove file handle %d\n", handle->id);
+ }
+- g_static_mutex_unlock (&file_handles_lock);
++ g_mutex_unlock (&file_handles_lock);
+ }
+
+ static FileHandle *
+@@ -519,13 +519,13 @@
+ {
+ FileHandle *handle;
+
+- g_static_mutex_lock (&file_handles_lock);
++ g_mutex_lock (&file_handles_lock);
+ handle = g_hash_table_lookup (file_handles,
+ GINT_TO_POINTER (id));
+ if (handle) {
+ handle->last_connection = conn;
+ }
+- g_static_mutex_unlock (&file_handles_lock);
++ g_mutex_unlock (&file_handles_lock);
+
+ return handle;
+ }
+--- ./libgnomevfs/gnome-vfs-async-job-map.c 2009-04-20 03:46:46.000000000 -0700
++++ ./libgnomevfs/gnome-vfs-async-job-map.c 2013-08-26 13:49:26.000000000 -0700
+@@ -27,14 +27,14 @@
+ #include <glib.h>
+
+ /* job map bits guarded by this lock */
+-static GStaticRecMutex async_job_map_lock = G_STATIC_REC_MUTEX_INIT;
++static GRecMutex async_job_map_lock;
+ static guint async_job_map_next_id;
+ static int async_job_map_locked = 0;
+ static gboolean async_job_map_shutting_down;
+ static GHashTable *async_job_map;
+
+ /* callback map bits guarded by this lock */
+-static GStaticMutex async_job_callback_map_lock = G_STATIC_MUTEX_INIT;
++static GMutex async_job_callback_map_lock;
+ static GHashTable *async_job_callback_map;
+ static guint async_job_callback_map_next_id;
+
+@@ -161,7 +161,7 @@
+ void
+ _gnome_vfs_async_job_map_lock (void)
+ {
+- g_static_rec_mutex_lock (&async_job_map_lock);
++ g_rec_mutex_lock (&async_job_map_lock);
+ async_job_map_locked++;
+ }
+
+@@ -169,7 +169,7 @@
+ _gnome_vfs_async_job_map_unlock (void)
+ {
+ async_job_map_locked--;
+- g_static_rec_mutex_unlock (&async_job_map_lock);
++ g_rec_mutex_unlock (&async_job_map_lock);
+ }
+
+ void
+@@ -185,7 +185,7 @@
+ {
+ GnomeVFSNotifyResult *notify_result;
+
+- g_static_mutex_lock (&async_job_callback_map_lock);
++ g_mutex_lock (&async_job_callback_map_lock);
+
+ if (async_job_callback_map == NULL) {
+ g_assert (async_job_map_shutting_down);
+@@ -199,7 +199,7 @@
+ *valid = notify_result != NULL;
+ *cancelled = notify_result != NULL && notify_result->cancelled;
+
+- g_static_mutex_unlock (&async_job_callback_map_lock);
++ g_mutex_unlock (&async_job_callback_map_lock);
+ }
+
+ gboolean
+@@ -207,7 +207,7 @@
+ {
+ gboolean cancelled;
+
+- g_static_mutex_lock (&async_job_callback_map_lock);
++ g_mutex_lock (&async_job_callback_map_lock);
+
+ g_assert (!async_job_map_shutting_down);
+
+@@ -232,7 +232,7 @@
+ g_hash_table_insert (async_job_callback_map, GUINT_TO_POINTER (notify_result->callback_id),
+ notify_result);
+ }
+- g_static_mutex_unlock (&async_job_callback_map_lock);
++ g_mutex_unlock (&async_job_callback_map_lock);
+
+ return !cancelled;
+ }
+@@ -243,11 +243,11 @@
+ g_assert (async_job_callback_map != NULL);
+
+ JOB_DEBUG (("removing callback %d ", callback_id));
+- g_static_mutex_lock (&async_job_callback_map_lock);
++ g_mutex_lock (&async_job_callback_map_lock);
+
+ g_hash_table_remove (async_job_callback_map, GUINT_TO_POINTER (callback_id));
+
+- g_static_mutex_unlock (&async_job_callback_map_lock);
++ g_mutex_unlock (&async_job_callback_map_lock);
+ }
+
+ static void
+@@ -268,7 +268,7 @@
+ void
+ _gnome_vfs_async_job_cancel_job_and_callbacks (GnomeVFSAsyncHandle *job_handle, GnomeVFSJob *job)
+ {
+- g_static_mutex_lock (&async_job_callback_map_lock);
++ g_mutex_lock (&async_job_callback_map_lock);
+
+ if (job != NULL) {
+ job->cancelled = TRUE;
+@@ -282,18 +282,18 @@
+ callback_map_cancel_one, job_handle);
+ }
+
+- g_static_mutex_unlock (&async_job_callback_map_lock);
++ g_mutex_unlock (&async_job_callback_map_lock);
+ }
+
+ void
+ async_job_callback_map_destroy (void)
+ {
+- g_static_mutex_lock (&async_job_callback_map_lock);
++ g_mutex_lock (&async_job_callback_map_lock);
+
+ if (async_job_callback_map) {
+ g_hash_table_destroy (async_job_callback_map);
+ async_job_callback_map = NULL;
+ }
+
+- g_static_mutex_unlock (&async_job_callback_map_lock);
++ g_mutex_unlock (&async_job_callback_map_lock);
+ }
+--- ./libgnomevfs/gnome-vfs-daemon-method.c 2009-04-20 03:46:46.000000000 -0700
++++ ./libgnomevfs/gnome-vfs-daemon-method.c 2013-08-26 14:31:45.000000000 -0700
+@@ -82,7 +82,7 @@
+ DBusMessage *message,
+ gpointer data);
+
+-static GStaticPrivate local_connection_private = G_STATIC_PRIVATE_INIT;
++static GPrivate local_connection_private;
+
+
+ static DBusObjectPathVTable connection_vtable = {
+@@ -356,7 +356,7 @@
+ static void
+ private_connection_died (LocalConnection *connection)
+ {
+- g_static_private_set (&local_connection_private, NULL, NULL);
++ g_private_set (&local_connection_private, NULL);
+ }
+
+ static LocalConnection *
+@@ -370,7 +370,7 @@
+ dbus_int32_t conn_id;
+ LocalConnection *ret;
+
+- ret = g_static_private_get (&local_connection_private);
++ ret = g_private_get (&local_connection_private);
+ if (ret != NULL) {
+ return ret;
+ }
+@@ -438,8 +438,7 @@
+ ret->conn_id = conn_id;
+ ret->handle = 0;
+
+- g_static_private_set (&local_connection_private,
+- ret, destroy_private_connection);
++ g_private_set (&local_connection_private, ret);
+
+ return ret;
+ }
+--- ./libgnomevfs/gnome-vfs-dbus-utils.c 2009-04-20 03:46:46.000000000 -0700
++++ ./libgnomevfs/gnome-vfs-dbus-utils.c 2013-08-26 14:41:09.000000000 -0700
+@@ -187,16 +187,16 @@
+ return main_dbus;
+ }
+
+-static GStaticPrivate daemon_connection_private = G_STATIC_PRIVATE_INIT;
++static GPrivate daemon_connection_private;
+
+ DBusConnection *
+ _gnome_vfs_daemon_get_current_connection (void)
+ {
+- return g_static_private_get (&daemon_connection_private);
++ return g_private_get (&daemon_connection_private);
+ }
+
+ void
+ gnome_vfs_daemon_set_current_connection (DBusConnection *conn)
+ {
+- g_static_private_set (&daemon_connection_private, conn, NULL);
++ g_private_set (&daemon_connection_private, conn);
+ }
+--- ./libgnomevfs/gnome-vfs-dns-sd.c 2009-04-20 03:46:46.000000000 -0700
++++ ./libgnomevfs/gnome-vfs-dns-sd.c 2013-08-26 14:40:48.000000000 -0700
+@@ -1142,74 +1142,80 @@
+ gpointer callback_data,
+ GDestroyNotify callback_data_destroy_func)
+ {
+- GnomeVFSDNSSDBrowseHandle *handle;
++ GnomeVFSDNSSDBrowseHandle *handle;
+
+- *handle_out = NULL;
++ *handle_out = NULL;
+
+- handle = g_new0 (GnomeVFSDNSSDBrowseHandle, 1);
+- handle->domain = g_strdup (domain);
+- handle->type = g_strdup (type);
+- handle->callback = callback;
+- handle->callback_data = callback_data;
+- handle->callback_data_destroy_func = callback_data_destroy_func;
++ handle = g_new0 (GnomeVFSDNSSDBrowseHandle, 1);
++ handle->domain = g_strdup (domain);
++ handle->type = g_strdup (type);
++ handle->callback = callback;
++ handle->callback_data = callback_data;
++ handle->callback_data_destroy_func = callback_data_destroy_func;
+
+- if (strcmp (domain, "local") == 0) {
++ if (strcmp (domain, "local") == 0)
++ {
+ #ifdef HAVE_AVAHI
+- AvahiClient *client;
+- AvahiServiceBrowser *sb;
++ AvahiClient *client;
++ AvahiServiceBrowser *sb;
+
+- handle->is_local = TRUE;
+- client = get_global_avahi_client ();
+- if (client) {
+- sb = avahi_service_browser_new (client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, type, NULL,
+- AVAHI_LOOKUP_USE_MULTICAST,
+- avahi_browse_callback, handle);
+- if (sb != NULL) {
+- handle->avahi_sb = sb;
+- *handle_out = handle;
+- browse_handles = g_slist_append (browse_handles, handle);
+- return GNOME_VFS_OK;
+- }
+- g_warning ("Failed to create service browser: %s\n", avahi_strerror( avahi_client_errno (client)));
+- }
+- return GNOME_VFS_ERROR_GENERIC;
++ handle->is_local = TRUE;
++ client = get_global_avahi_client ();
++ if (client) {
++ sb = avahi_service_browser_new (client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, type, NULL,
++ AVAHI_LOOKUP_USE_MULTICAST,
++ avahi_browse_callback, handle);
++ if (sb != NULL)
++ {
++ handle->avahi_sb = sb;
++ *handle_out = handle;
++ browse_handles = g_slist_append (browse_handles, handle);
++ return GNOME_VFS_OK;
++ }
++ g_warning ("Failed to create service browser: %s\n", avahi_strerror( avahi_client_errno (client)));
++ }
++ return GNOME_VFS_ERROR_GENERIC;
+ #elif defined (HAVE_HOWL)
+- sw_result res;
+- sw_discovery session;
++ sw_result res;
++ sw_discovery session;
+
+- handle->is_local = TRUE;
++ handle->is_local = TRUE;
+
+- session = get_global_howl_session ();
+- if (session) {
+- res = sw_discovery_browse (session,
+- 0,
+- type, domain,
+- howl_browse_reply,
+- handle,
+- &handle->howl_id);
++ session = get_global_howl_session ();
++ if (session)
++ {
++ res = sw_discovery_browse (session,
++ 0,
++ type, domain,
++ howl_browse_reply,
++ handle,
++ &handle->howl_id);
+
+- if (res == SW_OKAY) {
+- *handle_out = handle;
+- return GNOME_VFS_OK;
+- }
+- }
+- return GNOME_VFS_ERROR_GENERIC;
++ if (res == SW_OKAY)
++ {
++ *handle_out = handle;
++ return GNOME_VFS_OK;
++ }
++ }
++ return GNOME_VFS_ERROR_GENERIC;
+ #else
+- free_browse_handle (handle);
+- return GNOME_VFS_ERROR_NOT_SUPPORTED;
++ free_browse_handle (handle);
++ return GNOME_VFS_ERROR_NOT_SUPPORTED;
+ #endif
+- } else {
+- handle->is_local = FALSE;
+- if (g_thread_create (unicast_browse_thread, handle,
+- FALSE, NULL) == NULL) {
+- g_free (handle->domain);
+- g_free (handle->type);
+- g_free (handle);
+- return GNOME_VFS_ERROR_INTERNAL;
+- }
+- *handle_out = handle;
+- return GNOME_VFS_OK;
+- }
++ }
++ else
++ {
++ handle->is_local = FALSE;
++ if (g_thread_new ("foo", unicast_browse_thread, handle) == NULL)
++ {
++ g_free (handle->domain);
++ g_free (handle->type);
++ g_free (handle);
++ return GNOME_VFS_ERROR_INTERNAL;
++ }
++ *handle_out = handle;
++ return GNOME_VFS_OK;
++ }
+ }
+
+ /**
+@@ -1705,80 +1711,91 @@
+ gpointer callback_data,
+ GDestroyNotify callback_data_destroy_func)
+ {
+- GnomeVFSDNSSDResolveHandle *handle;
++ GnomeVFSDNSSDResolveHandle *handle;
+
+- *handle_out = NULL;
++ *handle_out = NULL;
+
+- handle = g_new0 (GnomeVFSDNSSDResolveHandle, 1);
+- handle->name = g_strdup (name);
+- handle->domain = g_strdup (domain);
+- handle->type = g_strdup (type);
+- handle->callback = callback;
+- handle->callback_data = callback_data;
+- handle->callback_data_destroy_func = callback_data_destroy_func;
++ handle = g_new0 (GnomeVFSDNSSDResolveHandle, 1);
++ handle->name = g_strdup (name);
++ handle->domain = g_strdup (domain);
++ handle->type = g_strdup (type);
++ handle->callback = callback;
++ handle->callback_data = callback_data;
++ handle->callback_data_destroy_func = callback_data_destroy_func;
+
+- if (strcmp (domain, "local") == 0) {
++ if (strcmp (domain, "local") == 0)
++ {
+ #ifdef HAVE_AVAHI
+- AvahiClient *client;
+- AvahiServiceResolver *sr;
++ AvahiClient *client;
++ AvahiServiceResolver *sr;
+
+- handle->is_local = TRUE;
+- client = get_global_avahi_client ();
+- if (client) {
+- sr = avahi_service_resolver_new (client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
+- name, type, domain, AVAHI_PROTO_UNSPEC,
+- AVAHI_LOOKUP_NO_ADDRESS,
+- avahi_resolve_async_callback, handle);
+- if (sr != NULL) {
+- handle->avahi_sr = sr;
+- *handle_out = handle;
+- return GNOME_VFS_OK;
+- }
+- }
+- return GNOME_VFS_ERROR_GENERIC;
++ handle->is_local = TRUE;
++ client = get_global_avahi_client ();
++ if (client)
++ {
++ sr = avahi_service_resolver_new (client, AVAHI_IF_UNSPEC,
++ AVAHI_PROTO_UNSPEC,
++ name, type, domain,
++ AVAHI_PROTO_UNSPEC,
++ AVAHI_LOOKUP_NO_ADDRESS,
++ avahi_resolve_async_callback,
++ handle);
++ if (sr != NULL)
++ {
++ handle->avahi_sr = sr;
++ *handle_out = handle;
++ return GNOME_VFS_OK;
++ }
++ }
++ return GNOME_VFS_ERROR_GENERIC;
+ #elif defined (HAVE_HOWL)
+- sw_result res;
+- sw_discovery session;
++ sw_result res;
++ sw_discovery session;
+
+- handle->is_local = TRUE;
++ handle->is_local = TRUE;
+
+- session = get_global_howl_session ();
+- if (session) {
+- res = sw_discovery_resolve (session,
+- 0,
+- name,
+- type,
+- domain,
+- howl_resolve_reply,
+- handle,
+- &handle->howl_id);
+- if (res == SW_OKAY) {
+- if (timeout != 0) {
+- handle->timeout_tag = g_timeout_add (timeout,
+- howl_resolve_timeout,
+- handle);
+- }
+-
+- *handle_out = handle;
+- return GNOME_VFS_OK;
+- }
++ session = get_global_howl_session ();
++ if (session)
++ {
++ res = sw_discovery_resolve (session,
++ 0,
++ name,
++ type,
++ domain,
++ howl_resolve_reply,
++ handle,
++ &handle->howl_id);
++ if (res == SW_OKAY)
++ {
++ if (timeout != 0)
++ {
++ handle->timeout_tag = g_timeout_add (timeout,
++ howl_resolve_timeout,
++ handle);
+ }
+- return GNOME_VFS_ERROR_GENERIC;
++
++ *handle_out = handle;
++ return GNOME_VFS_OK;
++ }
++ }
++ return GNOME_VFS_ERROR_GENERIC;
+ #else
+- return GNOME_VFS_ERROR_NOT_SUPPORTED;
++ return GNOME_VFS_ERROR_NOT_SUPPORTED;
+ #endif
+- } else {
+- handle->is_local = FALSE;
+- if (g_thread_create (unicast_resolve_thread, handle,
+- FALSE, NULL) == NULL) {
+- g_free (handle->domain);
+- g_free (handle->type);
+- g_free (handle);
+- return GNOME_VFS_ERROR_INTERNAL;
+- }
+- *handle_out = handle;
+- return GNOME_VFS_OK;
+- }
++ }
++ else
++ {
++ handle->is_local = FALSE;
++ if (g_thread_new ("bar", unicast_resolve_thread, handle) == NULL)
++ {
++ g_free (handle->domain);
++ g_free (handle->type);
++ g_free (handle);
++ return GNOME_VFS_ERROR_INTERNAL;
++ }
++ *handle_out = handle;
++ return GNOME_VFS_OK;
++ }
+ }
+
+ /**
+--- ./libgnomevfs/gnome-vfs-file-info.c 2009-04-20 03:46:46.000000000 -0700
++++ ./libgnomevfs/gnome-vfs-file-info.c 2013-08-26 13:50:29.000000000 -0700
+@@ -31,7 +31,7 @@
+ /* Mutex for making GnomeVFSFileInfo ref's/unref's atomic */
+ /* Note that an atomic increment function (such as is present in NSPR) is preferable */
+ /* FIXME: This mutex is probably not needed and might be causing performance issues */
+-static GStaticMutex file_info_ref_lock = G_STATIC_MUTEX_INIT;
++static GMutex file_info_ref_lock;
+
+ /* Register GnomeVFSFileInfo in the type system */
+ GType
+@@ -83,9 +83,9 @@
+ g_return_if_fail (info != NULL);
+ g_return_if_fail (info->refcount > 0);
+
+- g_static_mutex_lock (&file_info_ref_lock);
++ g_mutex_lock (&file_info_ref_lock);
+ info->refcount += 1;
+- g_static_mutex_unlock (&file_info_ref_lock);
++ g_mutex_unlock (&file_info_ref_lock);
+
+ }
+
+@@ -101,9 +101,9 @@
+ g_return_if_fail (info != NULL);
+ g_return_if_fail (info->refcount > 0);
+
+- g_static_mutex_lock (&file_info_ref_lock);
++ g_mutex_lock (&file_info_ref_lock);
+ info->refcount -= 1;
+- g_static_mutex_unlock (&file_info_ref_lock);
++ g_mutex_unlock (&file_info_ref_lock);
+
+ if (info->refcount == 0) {
+ gnome_vfs_file_info_clear (info);
+@@ -133,13 +133,13 @@
+ g_free (info->selinux_context);
+
+ /* Ensure the ref count is maintained correctly */
+- g_static_mutex_lock (&file_info_ref_lock);
++ g_mutex_lock (&file_info_ref_lock);
+
+ old_refcount = info->refcount;
+ memset (info, 0, sizeof (*info));
+ info->refcount = old_refcount;
+
+- g_static_mutex_unlock (&file_info_ref_lock);
++ g_mutex_unlock (&file_info_ref_lock);
+ }
+
+
+@@ -182,7 +182,7 @@
+ * want serialize access differently (or perhaps you shouldn't
+ * use copy)
+ */
+- g_static_mutex_lock (&file_info_ref_lock);
++ g_mutex_lock (&file_info_ref_lock);
+
+ old_refcount = dest->refcount;
+
+@@ -199,7 +199,7 @@
+
+ dest->refcount = old_refcount;
+
+- g_static_mutex_unlock (&file_info_ref_lock);
++ g_mutex_unlock (&file_info_ref_lock);
+
+ }
+
+--- ./libgnomevfs/gnome-vfs-init.c 2009-04-20 03:46:46.000000000 -0700
++++ ./libgnomevfs/gnome-vfs-init.c 2013-08-26 14:50:23.000000000 -0700
+@@ -114,9 +114,6 @@
+ return FALSE;
+ }
+
+- if (!g_thread_supported ())
+- g_thread_init (NULL);
+-
+ G_LOCK (vfs_already_initialized);
+
+ if (!vfs_already_initialized) {
+@@ -227,9 +224,5 @@
+ gboolean
+ gnome_vfs_is_primary_thread (void)
+ {
+- if (g_thread_supported()) {
+- return GPOINTER_TO_UINT(g_private_get (private_is_primary_thread)) == 1;
+- } else {
+- return TRUE;
+- }
++ return GPOINTER_TO_UINT(g_private_get (private_is_primary_thread)) == 1;
+ }
+--- ./libgnomevfs/gnome-vfs-job.c 2009-04-20 03:46:46.000000000 -0700
++++ ./libgnomevfs/gnome-vfs-job.c 2013-08-26 14:03:17.000000000 -0700
+@@ -43,7 +43,7 @@
+ #include <string.h>
+ #include <unistd.h>
+
+-static GStaticPrivate job_private = G_STATIC_PRIVATE_INIT;
++static GPrivate job_private;
+
+ #if GNOME_VFS_JOB_DEBUG
+
+@@ -64,7 +64,7 @@
+ * Since this id debug only, just use what the macro should be here.
+ * even though it is not portable.
+ */
+-GStaticMutex debug_mutex = G_STATIC_MUTEX_INIT;
++
+ #endif
+
+ static int job_count = 0;
+@@ -630,8 +630,8 @@
+
+ new_job = g_new0 (GnomeVFSJob, 1);
+
+- new_job->job_lock = g_mutex_new ();
+- new_job->notify_ack_condition = g_cond_new ();
++ g_mutex_init (new_job->job_lock);
++ g_cond_init (new_job->notify_ack_condition);
+ new_job->priority = priority;
+
+ /* Add the new job into the job hash table. This also assigns
+@@ -652,9 +652,6 @@
+
+ gnome_vfs_op_destroy (job->op);
+
+- g_mutex_free (job->job_lock);
+- g_cond_free (job->notify_ack_condition);
+-
+ memset (job, 0xaa, sizeof (GnomeVFSJob));
+
+ g_free (job);
+@@ -1734,9 +1731,9 @@
+ set_current_job (GnomeVFSJob *job)
+ {
+ /* There shouldn't have been anything here. */
+- g_assert (g_static_private_get (&job_private) == NULL);
++ g_assert (g_private_get (&job_private) == NULL);
+
+- g_static_private_set (&job_private, job, NULL);
++ g_private_set (&job_private, job);
+
+ _gnome_vfs_module_callback_use_stack_info (job->op->stack_info);
+ _gnome_vfs_module_callback_set_in_async_thread (TRUE);
+@@ -1745,7 +1742,7 @@
+ static void
+ clear_current_job (void)
+ {
+- g_static_private_set (&job_private, NULL, NULL);
++ g_private_set (&job_private, NULL);
+
+ _gnome_vfs_module_callback_clear_stacks ();
+ }
+@@ -1757,7 +1754,7 @@
+
+ g_return_if_fail (context != NULL);
+
+- job = g_static_private_get (&job_private);
++ job = g_private_get (&job_private);
+
+ if (job != NULL) {
+ *context = job->op->context;
+@@ -1777,7 +1774,7 @@
+ GnomeVFSJob *job;
+ GnomeVFSNotifyResult notify_result;
+
+- job = g_static_private_get (&job_private);
++ job = g_private_get (&job_private);
+
+ g_return_if_fail (job != NULL);
+
+--- ./libgnomevfs/gnome-vfs-method.c 2009-04-20 03:46:46.000000000 -0700
++++ ./libgnomevfs/gnome-vfs-method.c 2013-08-26 14:01:58.000000000 -0700
+@@ -63,7 +63,7 @@
+
+ static GHashTable *module_hash = NULL;
+ G_LOCK_DEFINE_STATIC (gnome_vfs_method_init);
+-static GStaticRecMutex module_hash_lock = G_STATIC_REC_MUTEX_INIT;
++static GRecMutex module_hash_lock;
+
+ static GList *module_path_list = NULL;
+
+@@ -343,7 +343,7 @@
+ const char *args;
+ gboolean run_in_daemon;
+
+- g_static_rec_mutex_lock (&module_hash_lock);
++ g_rec_mutex_lock (&module_hash_lock);
+
+ module_element = g_hash_table_lookup (module_hash, name);
+
+@@ -408,7 +408,7 @@
+ g_hash_table_insert (module_hash, module_element->name, module_element);
+
+ add_module_out:
+- g_static_rec_mutex_unlock (&module_hash_lock);
++ g_rec_mutex_unlock (&module_hash_lock);
+
+ return module_element;
+ }
+--- ./libgnomevfs/gnome-vfs-module-callback.c 2009-04-20 03:46:46.000000000 -0700
++++ ./libgnomevfs/gnome-vfs-module-callback.c 2013-08-26 14:27:56.000000000 -0700
+@@ -56,20 +56,23 @@
+ GHashTable *current_async_callbacks;
+ };
+
+-
++static void stack_table_destroy (gpointer specific);
+ /* -- Global variables -- */
+
+-static GStaticMutex callback_table_lock = G_STATIC_MUTEX_INIT;
++static GMutex callback_table_lock;
+ static GHashTable *default_callbacks = NULL;
+ static GHashTable *default_async_callbacks = NULL;
+ static GHashTable *stack_tables_to_free = NULL;
+
+-static GPrivate *callback_stacks_key;
+-static GPrivate *async_callback_stacks_key;
+-static GPrivate *in_async_thread_key;
++static GPrivate callback_stacks_key_item = G_PRIVATE_INIT (stack_table_destroy);
++static GPrivate async_callback_stacks_key_item = G_PRIVATE_INIT (stack_table_destroy);
++static GPrivate in_async_thread_key_item;
++static GPrivate *callback_stacks_key = &callback_stacks_key_item;
++static GPrivate *async_callback_stacks_key = &async_callback_stacks_key_item;
++static GPrivate *in_async_thread_key = &in_async_thread_key_item;
+
+ static GCond *async_callback_cond;
+-static GStaticMutex async_callback_lock = G_STATIC_MUTEX_INIT;
++static GMutex async_callback_lock;
+
+ /* -- Helper functions -- */
+
+@@ -120,12 +123,12 @@
+ {
+ CallbackResponseData *response_data;
+
+- g_static_mutex_lock (&async_callback_lock);
++ g_mutex_lock (&async_callback_lock);
+ response_data = data;
+ response_data->done = TRUE;
+ g_cond_broadcast (async_callback_cond);
+
+- g_static_mutex_unlock (&async_callback_lock);
++ g_mutex_unlock (&async_callback_lock);
+ }
+
+ static void
+@@ -146,7 +149,7 @@
+ * new mutexes and condition variables all the time.
+ */
+
+- g_static_mutex_lock (&async_callback_lock);
++ g_mutex_lock (&async_callback_lock);
+ response_data.done = FALSE;
+ _gnome_vfs_dispatch_module_callback (async_callback->callback,
+ in, in_size,
+@@ -155,11 +158,10 @@
+ async_callback_response,
+ &response_data);
+ while (!response_data.done) {
+- g_cond_wait (async_callback_cond,
+- g_static_mutex_get_mutex (&async_callback_lock));
++ g_cond_wait (async_callback_cond, &async_callback_lock);
+ }
+
+- g_static_mutex_unlock (&async_callback_lock);
++ g_mutex_unlock (&async_callback_lock);
+ }
+
+ static void
+@@ -410,13 +412,13 @@
+
+ stack_table = specific;
+
+- g_static_mutex_lock (&callback_table_lock);
++ g_mutex_lock (&callback_table_lock);
+ if (stack_tables_to_free != NULL) {
+ g_hash_table_remove (stack_tables_to_free, stack_table);
+ } else {
+ stack_table = NULL;
+ }
+- g_static_mutex_unlock (&callback_table_lock);
++ g_mutex_unlock (&callback_table_lock);
+
+ if (stack_table) {
+ clear_stack_table (stack_table);
+@@ -443,31 +445,26 @@
+ static void
+ free_stack_tables_to_free (void)
+ {
+- g_static_mutex_lock (&callback_table_lock);
++ g_mutex_lock (&callback_table_lock);
+ g_hash_table_foreach_remove (stack_tables_to_free, stack_table_free_hr_func , NULL);
+ g_hash_table_destroy (stack_tables_to_free);
+ stack_tables_to_free = NULL;
+- g_static_mutex_unlock (&callback_table_lock);
++ g_mutex_unlock (&callback_table_lock);
+ }
+
+ void
+ _gnome_vfs_module_callback_private_init (void)
+ {
+- callback_stacks_key = g_private_new (stack_table_destroy);
+- async_callback_stacks_key = g_private_new (stack_table_destroy);
+- in_async_thread_key = g_private_new (NULL);
+-
+ stack_tables_to_free = g_hash_table_new (g_direct_hash, g_direct_equal);
+
+- async_callback_cond = g_cond_new ();
++ g_cond_init (async_callback_cond);
+
+- g_atexit (free_stack_tables_to_free);
+ }
+
+ static void
+ free_default_callbacks (void)
+ {
+- g_static_mutex_lock (&callback_table_lock);
++ g_mutex_lock (&callback_table_lock);
+
+ clear_callback_table (default_callbacks);
+ g_hash_table_destroy (default_callbacks);
+@@ -475,7 +472,7 @@
+ clear_callback_table (default_async_callbacks);
+ g_hash_table_destroy (default_async_callbacks);
+
+- g_static_mutex_unlock (&callback_table_lock);
++ g_mutex_unlock (&callback_table_lock);
+ }
+
+ /* This function should only be called with the mutex held. */
+@@ -486,7 +483,6 @@
+ default_callbacks = g_hash_table_new (g_str_hash, g_str_equal);
+ default_async_callbacks = g_hash_table_new (g_str_hash, g_str_equal);
+
+- g_atexit (free_default_callbacks);
+ }
+ }
+
+@@ -496,23 +492,23 @@
+ {
+ /* Initialize per-thread data, if needed. */
+ if (g_private_get (callback_stacks_key) == NULL) {
+- g_static_mutex_lock (&callback_table_lock);
++ g_mutex_lock (&callback_table_lock);
+ g_private_set (callback_stacks_key,
+ g_hash_table_new (g_str_hash, g_str_equal));
+ g_hash_table_insert (stack_tables_to_free,
+ g_private_get (callback_stacks_key),
+ GINT_TO_POINTER (1));
+- g_static_mutex_unlock (&callback_table_lock);
++ g_mutex_unlock (&callback_table_lock);
+ }
+
+ if (g_private_get (async_callback_stacks_key) == NULL) {
+- g_static_mutex_lock (&callback_table_lock);
++ g_mutex_lock (&callback_table_lock);
+ g_private_set (async_callback_stacks_key,
+ g_hash_table_new (g_str_hash, g_str_equal));
+ g_hash_table_insert (stack_tables_to_free,
+ g_private_get (async_callback_stacks_key),
+ GINT_TO_POINTER (1));
+- g_static_mutex_unlock (&callback_table_lock);
++ g_mutex_unlock (&callback_table_lock);
+ }
+ }
+
+@@ -618,12 +614,12 @@
+
+ callback_info = callback_info_new (callback, callback_data, destroy_notify);
+
+- g_static_mutex_lock (&callback_table_lock);
++ g_mutex_lock (&callback_table_lock);
+
+ initialize_global_if_needed ();
+ insert_callback_into_table (default_callbacks, callback_name, callback_info);
+
+- g_static_mutex_unlock (&callback_table_lock);
++ g_mutex_unlock (&callback_table_lock);
+
+ callback_info_unref (callback_info);
+ }
+@@ -730,12 +726,12 @@
+
+ callback_info = async_callback_info_new (callback, callback_data, notify);
+
+- g_static_mutex_lock (&callback_table_lock);
++ g_mutex_lock (&callback_table_lock);
+
+ initialize_global_if_needed ();
+ insert_callback_into_table (default_async_callbacks, callback_name, callback_info);
+
+- g_static_mutex_unlock (&callback_table_lock);
++ g_mutex_unlock (&callback_table_lock);
+
+ callback_info_unref (callback_info);
+ }
+@@ -864,13 +860,13 @@
+ g_assert (callback != NULL);
+ callback_info_ref (callback);
+ } else {
+- g_static_mutex_lock (&callback_table_lock);
++ g_mutex_lock (&callback_table_lock);
+ initialize_global_if_needed ();
+ callback = g_hash_table_lookup (default_async_callbacks, callback_name);
+ if (callback != NULL) {
+ callback_info_ref (callback);
+ }
+- g_static_mutex_unlock (&callback_table_lock);
++ g_mutex_unlock (&callback_table_lock);
+ }
+ }
+
+@@ -883,13 +879,13 @@
+ g_assert (callback != NULL);
+ callback_info_ref (callback);
+ } else {
+- g_static_mutex_lock (&callback_table_lock);
++ g_mutex_lock (&callback_table_lock);
+ initialize_global_if_needed ();
+ callback = g_hash_table_lookup (default_callbacks, callback_name);
+ if (callback != NULL) {
+ callback_info_ref (callback);
+ }
+- g_static_mutex_unlock (&callback_table_lock);
++ g_mutex_unlock (&callback_table_lock);
+ }
+ }
+
+@@ -920,9 +916,9 @@
+ stack_info->current_callbacks = g_hash_table_new (g_str_hash, g_str_equal);
+ stack_info->current_async_callbacks = g_hash_table_new (g_str_hash, g_str_equal);
+
+- g_static_mutex_lock (&callback_table_lock);
++ g_mutex_lock (&callback_table_lock);
+ initialize_global_if_needed ();
+- g_static_mutex_unlock (&callback_table_lock);
++ g_mutex_unlock (&callback_table_lock);
+
+ initialize_per_thread_if_needed ();
+ copy_callback_stack_tops (g_private_get (callback_stacks_key),
+--- ./libgnomevfs/gnome-vfs-resolve.c 2009-04-20 03:46:46.000000000 -0700
++++ ./libgnomevfs/gnome-vfs-resolve.c 2013-08-26 14:18:16.000000000 -0700
+@@ -139,11 +139,11 @@
+ restart_resolve (void)
+ {
+ static GTimeVal last_reload = { 0, 0 };
+- static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
++ static GMutex mutex;
+ GTimeVal now;
+ gboolean ret;
+
+- g_static_mutex_lock (&mutex);
++ g_mutex_lock (&mutex);
+ g_get_current_time (&now);
+
+ if ((now.tv_sec - last_reload.tv_sec) > RELOAD_TIMEVAL) {
+@@ -155,7 +155,7 @@
+ ret = FALSE;
+ }
+
+- g_static_mutex_unlock (&mutex);
++ g_mutex_unlock (&mutex);
+ return ret;
+ }
+ #else
+--- ./libgnomevfs/gnome-vfs-volume-ops.c 2009-04-20 03:46:46.000000000 -0700
++++ ./libgnomevfs/gnome-vfs-volume-ops.c 2013-08-26 14:47:01.000000000 -0700
+@@ -164,8 +164,8 @@
+ gsize out_size;
+ gboolean invoked;
+
+- GCond *cond;
+- GMutex *mutex;
++ GCond cond;
++ GMutex mutex;
+ } MountThreadAuth;
+
+
+@@ -281,12 +281,12 @@
+ static gboolean
+ invoke_async_auth_cb (MountThreadAuth *auth)
+ {
+- g_mutex_lock (auth->mutex);
++ g_mutex_lock (&(auth->mutex));
+ auth->invoked = gnome_vfs_module_callback_invoke (auth->callback,
+ auth->in_args, auth->in_size,
+ auth->out_args, auth->out_size);
+- g_cond_signal (auth->cond);
+- g_mutex_unlock (auth->mutex);
++ g_cond_signal (&(auth->cond));
++ g_mutex_unlock (&(auth->mutex));
+ return FALSE;
+ }
+
+@@ -302,18 +302,16 @@
+ auth.out_args = out;
+ auth.out_size = out_size;
+ auth.invoked = FALSE;
+- auth.mutex = g_mutex_new ();
+- auth.cond = g_cond_new ();
++ g_mutex_init (&auth.mutex);
++ g_cond_init (&auth.cond);
+
+ DEBUG_MOUNT (("mount invoking auth callback: %s\n", callback_name));
+
+- g_mutex_lock (auth.mutex);
++ g_mutex_lock (&auth.mutex);
+ g_idle_add_full (G_PRIORITY_HIGH_IDLE, (GSourceFunc)invoke_async_auth_cb, &auth, NULL);
+- g_cond_wait (auth.cond, auth.mutex);
++ g_cond_wait (&auth.cond, &auth.mutex);
+
+- g_mutex_unlock (auth.mutex);
+- g_mutex_free (auth.mutex);
+- g_cond_free (auth.cond);
++ g_mutex_unlock (&auth.mutex);
+
+ DEBUG_MOUNT (("mount invoked auth callback: %s %d\n", callback_name, auth.invoked));
+
+--- ./modules/sftp-method.c 2009-04-20 03:46:46.000000000 -0700
++++ ./modules/sftp-method.c 2013-08-26 14:54:28.000000000 -0700
+@@ -1488,8 +1488,6 @@
+ invoke_save_auth (uri, keyring, user_name, object, authtype, password);
+ }
+
+- if (!g_thread_supported ()) g_thread_init (NULL);
+-
+ *connection = g_new0 (SftpConnection, 1);
+ (*connection)->ref_count = 1;
+ (*connection)->in_fd = in_fd;
diff --git a/patches/libbonobo-glib-2_36.patch b/patches/libbonobo-glib-2_36.patch
new file mode 100644
index 0000000..6b91696
--- /dev/null
+++ b/patches/libbonobo-glib-2_36.patch
@@ -0,0 +1,73 @@
+--- ./activation-server/activation-server-main.c 2009-04-23 15:37:55.000000000 -0700
++++ ./activation-server/activation-server-main.c 2013-08-26 13:41:08.000000000 -0700
+@@ -70,7 +70,7 @@
+
+ static gboolean server_threaded = FALSE;
+ static glong server_guard_depth = 0;
+-static GStaticRecMutex server_guard = G_STATIC_REC_MUTEX_INIT;
++static GRecMutex server_guard;
+
+ static PortableServer_POA
+ server_get_poa (void)
+@@ -104,7 +104,7 @@
+ #endif
+ server_guard_depth = 0;
+ for (i = 0; i < state; i++)
+- g_static_rec_mutex_unlock (&server_guard);
++ g_rec_mutex_unlock (&server_guard);
+ return state;
+ }
+
+@@ -117,7 +117,7 @@
+ return;
+
+ for (i = 0; i < state; i++)
+- g_static_rec_mutex_lock (&server_guard);
++ g_rec_mutex_lock (&server_guard);
+ server_guard_depth = state;
+ #ifdef BONOBO_ACTIVATION_DEBUG
+ fprintf (stderr, "thread %p re-taken server guard with depth %ld\n",
+@@ -131,7 +131,7 @@
+ if (!server_threaded)
+ return;
+
+- g_static_rec_mutex_lock (&server_guard);
++ g_rec_mutex_lock (&server_guard);
+ server_guard_depth++;
+ fprintf (stderr, "thread %p take guard [%ld]\n",
+ g_thread_self (), server_guard_depth);
+@@ -146,7 +146,7 @@
+ fprintf (stderr, "thread %p release guard [%ld]\n",
+ g_thread_self (), server_guard_depth);
+ server_guard_depth--;
+- g_static_rec_mutex_unlock (&server_guard);
++ g_rec_mutex_unlock (&server_guard);
+ }
+
+ #ifdef G_OS_WIN32
+--- ./bonobo-activation/bonobo-activation-init.c 2009-04-23 15:37:55.000000000 -0700
++++ ./bonobo-activation/bonobo-activation-init.c 2013-08-26 13:39:08.000000000 -0700
+@@ -46,7 +46,7 @@
+
+ #include <orbit/orbit.h>
+
+-GStaticRecMutex _bonobo_activation_guard = G_STATIC_REC_MUTEX_INIT;
++GRecMutex _bonobo_activation_guard;
+ static CORBA_ORB bonobo_activation_orb = CORBA_OBJECT_NIL;
+ static CORBA_Context bonobo_activation_context;
+ static gboolean is_initialized = FALSE;
+--- ./bonobo-activation/bonobo-activation-private.h 2009-04-23 15:37:55.000000000 -0700
++++ ./bonobo-activation/bonobo-activation-private.h 2013-08-26 13:37:19.000000000 -0700
+@@ -31,9 +31,9 @@
+
+ #define BONOBO_ACTIVATION_FACTORY_PRIVATE_TIMEOUT 1
+
+-extern GStaticRecMutex _bonobo_activation_guard;
+-#define BONOBO_ACTIVATION_LOCK() g_static_rec_mutex_lock (&_bonobo_activation_guard)
+-#define BONOBO_ACTIVATION_UNLOCK() g_static_rec_mutex_unlock (&_bonobo_activation_guard)
++extern GRecMutex _bonobo_activation_guard;
++#define BONOBO_ACTIVATION_LOCK() g_rec_mutex_lock (&_bonobo_activation_guard)
++#define BONOBO_ACTIVATION_UNLOCK() g_rec_mutex_unlock (&_bonobo_activation_guard)
+
+ void bonobo_activation_timeout_reg_check_set (gboolean on);
+ gboolean bonobo_activation_timeout_reg_check (gpointer data);
diff --git a/patches/libgnome-glib-2_36.patch b/patches/libgnome-glib-2_36.patch
new file mode 100644
index 0000000..bca0b24
--- /dev/null
+++ b/patches/libgnome-glib-2_36.patch
@@ -0,0 +1,87 @@
+--- ./libgnome/gnome-i18n.c 2009-03-17 07:42:06.000000000 -0700
++++ ./libgnome/gnome-i18n.c 2013-08-26 14:58:56.000000000 -0700
+@@ -55,12 +55,12 @@
+ const GList *
+ gnome_i18n_get_language_list (const gchar *ignored)
+ {
+- static GStaticRecMutex lang_list_lock = G_STATIC_REC_MUTEX_INIT;
++ static GRecMutex lang_list_lock;
+ static GList *list = NULL;
+ const char * const* langs;
+ int i;
+
+- g_static_rec_mutex_lock (&lang_list_lock);
++ g_rec_mutex_lock (&lang_list_lock);
+
+ if (list == NULL) {
+ langs = g_get_language_names ();
+@@ -71,7 +71,7 @@
+ list = g_list_reverse (list);
+ }
+
+- g_static_rec_mutex_unlock (&lang_list_lock);
++ g_rec_mutex_unlock (&lang_list_lock);
+
+ return list;
+ }
+--- ./libgnome/gnome-init.c 2009-03-17 07:42:06.000000000 -0700
++++ ./libgnome/gnome-init.c 2013-08-26 15:02:41.000000000 -0700
+@@ -115,9 +115,6 @@
+ static void
+ bonobo_activation_pre_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
+ {
+- if (!g_thread_supported ())
+- g_thread_init (NULL);
+-
+ if (!bonobo_activation_is_initialized ())
+ bonobo_activation_preinit (program, mod_info);
+ }
+--- ./libgnome/gnome-program.c 2009-03-17 07:42:06.000000000 -0700
++++ ./libgnome/gnome-program.c 2013-08-26 14:59:50.000000000 -0700
+@@ -149,16 +149,6 @@
+ GObject, G_TYPE_OBJECT)
+
+ static void
+-global_program_unref (void)
+-{
+- if (global_program) {
+- g_object_unref (global_program);
+- global_program = NULL;
+- program_initialized = FALSE;
+- }
+-}
+-
+-static void
+ gnome_program_set_property (GObject *object, guint param_id,
+ const GValue *value, GParamSpec *pspec)
+ {
+@@ -1878,12 +1868,6 @@
+ GnomeProgram *program;
+ va_list args;
+
+- /* g_thread_init() has to be the first GLib function called ever */
+- if (!g_threads_got_initialized)
+- g_thread_init (NULL);
+-
+- g_type_init ();
+-
+ va_start(args, first_property_name);
+ program = gnome_program_initv (GNOME_TYPE_PROGRAM,
+ app_id, app_version, module_info,
+@@ -1913,8 +1897,6 @@
+ g_print ("Starting gnome_program_init:\n\n");
+ #endif
+
+- g_type_init ();
+-
+ klass = g_type_class_ref (type);
+
+ if (!program_initialized) {
+@@ -2064,7 +2046,6 @@
+
+ program_initialized = TRUE;
+
+- g_atexit (global_program_unref);
+ }
+
+ gnome_program_preinit (program, app_id, app_version, argc, argv);
commit ca314b467a9bab9b61e830912073f989acb4414a
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 29 16:21:23 2013 -0700
Fix local include, accidentally changed in previous changeset
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 11e63ec..de25d4f 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -29,8 +29,8 @@
<repository type="git" name="github"
href="git://github.com/"/>
- <!--include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/-->
- <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
+ <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
+ <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
<include href="gtkhtml.modules"/>
<autotools id="libchipcard" autogen-sh="configure" >
commit 29fab4fb678e76cb34bbc9abc5af749a657b6989
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 29 16:20:12 2013 -0700
Patches to compile antique dependencies with glib-2.36
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index ab6e657..11e63ec 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -29,8 +29,8 @@
<repository type="git" name="github"
href="git://github.com/"/>
- <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
- <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
+ <!--include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/-->
+ <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
<include href="gtkhtml.modules"/>
<autotools id="libchipcard" autogen-sh="configure" >
@@ -265,6 +265,27 @@
</autotools>
+ <autotools id="gnucash-2.4"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
+ <branch repo="github" module="Gnucash/gnucash.git" revision="2.4"
+ checkoutdir="gnucash-2.4"/>
+ <dependencies>
+ <dep package="meta-gtk-osx-core"/>
+ <dep package="libofx"/>
+ <dep package="aqbanking"/>
+ <dep package="libgnomeui"/>
+ <dep package="meta-gtk-osx-webkit"/>
+ <dep package="Slib"/>
+ <dep package="goffice"/>
+ <dep package="libdbi-drivers"/>
+ <dep package="iso-codes"/>
+ <dep package="swig"/>
+ <dep package="gconf2"/>
+ </dependencies>
+
+ </autotools>
+
<autotools id="gnucash-docs-svn" autogenargs="--disable-scrollkeeper"
autogen-sh='autoreconf'
makeargs=" html" makeinstallargs="install-html" >
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index 5aefc16..6b9c313 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -117,7 +117,9 @@ Optionally you may want to install GConf 1.0.7 (or later).
<!-- Encountered a problem with linking libgnomevfs: For some reason it didn't include libresolv in the link list. Added it manually to Makefile and it worked, need a better solution. -->
<autotools id="gnome-vfs" autogen-sh="configure" autogenargs='LDFLAGS="$LDFLAGS -lresolv"'>
<branch module="gnome-vfs/2.24/gnome-vfs-2.24.2.tar.bz2" version="2.24.2"
- hash="sha256:50ecf5f37d377492e8943a3c359ffe64176d4e7f045e9980790eca999a1c6856"/>
+ hash="sha256:50ecf5f37d377492e8943a3c359ffe64176d4e7f045e9980790eca999a1c6856">
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/gnome-vfs-glib-2_36.patch" skip='1'/>
+ </branch>
<dependencies>
<dep package="gconf2"/>
<dep package="shared-mime-info"/>
@@ -144,7 +146,9 @@ Optionally you may want to install GConf 1.0.7 (or later).
<autotools id="libbonobo" autogen-sh="configure">
<!-- DEPENDS says "ORBit" -->
<branch module="libbonobo/2.24/libbonobo-2.24.2.tar.bz2" version="2.24.2"
- hash="sha256:95c0230a31a657e1873fc601318bbaa16722986699219317053f1cd1aa2a28bf"/>
+ hash="sha256:95c0230a31a657e1873fc601318bbaa16722986699219317053f1cd1aa2a28bf">
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/libbonobo-glib-2_36.patch" skip='1'/>
+ </branch>
<dependencies>
<dep package="popt"/>
<dep package="ORBit2"/>
@@ -167,7 +171,9 @@ Optionally you may want to install GConf 1.0.7 (or later).
<autotools id="libgnome" autogenargs="--disable-esd" autogen-sh="configure">
<branch module="libgnome/2.26/libgnome-2.26.0.tar.bz2" version="2.26.0"
- md5sum="a5634fe9ddc54bbb726cbaaa35abc0b9"/>
+ md5sum="a5634fe9ddc54bbb726cbaaa35abc0b9">
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/libgnome-glib-2_36.patch" skip='1'/>
+ </branch>
<dependencies>
<dep package="libbonobo"/>
<dep package="gnome-vfs"/>
commit e04e32e34d486325677f6665db516adc516efa8c
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 10 13:52:53 2013 -0700
Add new im-quartz.so to app bundles
im-quartz.so enables using Mac native input methods on Gtk apps.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 43e5b93..b634c99 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -55,11 +55,16 @@
<binary>
${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so
</binary>
-<!-- Copy in the theme engines. -->
+<!-- Copy in the theme engines, -->
<binary>
${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/engines/*.so
</binary>
+<!-- The quartz input-method module, -->
+ <binary>
+ ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/immodules/im-quartz.so
+ </binary>
+
<!-- And the print backends -->
<binary>
${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/printbackends/*.so
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index d1272ac..ef815b3 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -55,11 +55,16 @@
<binary>
${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so
</binary>
-<!-- Copy in the theme engines. -->
+<!-- Copy in the theme engines, -->
<binary>
${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/engines/*.so
</binary>
+<!-- The quartz input-method module, -->
+ <binary>
+ ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/immodules/im-quartz.so
+ </binary>
+
<!-- And the print backends -->
<binary>
${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/printbackends/*.so
commit e671c9559cf214a870d097fe2b382ece8d68f3d3
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 10 13:51:52 2013 -0700
Add shared-mime-info to unstable modules list. It doesn't build on its own and it's needed for reports to open WebKit for rendering.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 73b9412..ab6e657 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -211,6 +211,7 @@
<dep package="aqbanking"/>
<dep package="libgnomecanvas"/>
<dep package="meta-gtk-osx-webkit"/>
+ <dep package="shared-mime-info"/>
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
commit a3d1345682d7f37650136d703f43c04c01ce4020
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 10 13:50:32 2013 -0700
Remove SLib from the unstable bundle: It's not required any more.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 7d92596..43e5b93 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -181,11 +181,6 @@
${prefix}/share/themes
</data>
- <!--data dest="${bundle}/Contents/Resources/slib"-->
- <data>
- ${prefix}/lib/slib
- </data>
-
<data dest="${bundle}/Contents/Resources">
${project}/gnucash.icns
</data>
commit 15b6e41236e97c16f74c6d3c0432069dca35afeb
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 4 12:46:44 2013 -0700
Update Info-unstable version to 2.5.4
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 18a1234..f6ff596 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.5.3 © 2013 Gnucash Contributors</string>
+ <string>Gnucash version 2.5.4 © 2013 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.5.3 © 2013 Gnucash Contributors</string>
+ <string>2.5.4 © 2013 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.5.3</string>
+ <string>2.5.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.5.3</string>
+ <string>2.5.4</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
commit ae8785b8b218a14b913fce8c754e302f9e5012d1
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 3 14:16:54 2013 -0700
Fix missing </branch>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 4863426..73b9412 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -101,6 +101,7 @@
version='1.5.2'>
<patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/OpenSP-AC_CONFIG_HEADERS.patch" strip='0'>
</patch>
+ </branch>
</autotools>
<autotools id="libofx" autogen-sh='configure'>
commit 3fd8bca80da584ba89c4968f6b28f1f18ba6bf7e
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 3 13:25:55 2013 -0700
Patch some older tarballs for AC_CONFIG_HEADERS
Replacing now-obsolete AM_CONFIG_HEADER
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 1bdba4f..4863426 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -98,7 +98,9 @@
<autotools id="OpenSP" autogen-sh='autoreconf'
autogenargs="--disable-static --enable-shared --disable-doc-build --disable-nls">
<branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
- version='1.5.2'/>
+ version='1.5.2'>
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/OpenSP-AC_CONFIG_HEADERS.patch" strip='0'>
+ </patch>
</autotools>
<autotools id="libofx" autogen-sh='configure'>
diff --git a/patches/OpenSP-AC_CONFIG_HEADERS.patch b/patches/OpenSP-AC_CONFIG_HEADERS.patch
new file mode 100644
index 0000000..c1a5c6e
--- /dev/null
+++ b/patches/OpenSP-AC_CONFIG_HEADERS.patch
@@ -0,0 +1,11 @@
+--- configure.in~ 2005-12-23 06:15:21.000000000 -0800
++++ configure.in 2013-08-02 16:03:04.000000000 -0700
+@@ -16,7 +16,7 @@
+ AM_INIT_AUTOMAKE(OpenSP, 1.5.2, no-define)
+ AM_MAINTAINER_MODE
+ AC_PREREQ(2.53)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_SANITY_CHECK
+
+ dnl Autoheader definitions
diff --git a/patches/dbi-drv.patch b/patches/dbi-drv.patch
index 31ef4e5..42bf51f 100644
--- a/patches/dbi-drv.patch
+++ b/patches/dbi-drv.patch
@@ -2,6 +2,17 @@ diff -c /usr/local/src/gnucash/libdbi-drivers-0.8.3-1/configure.in\~ /usr/local/
*** a/configure.in Mon Mar 3 09:41:41 2008
--- b/configure.in Tue Dec 8 17:05:50 2009
***************
+*** 3,7 ****
+--- 3,7 ----
+ AM_MAINTAINER_MODE
+
+ AM_INIT_AUTOMAKE(libdbi, 0.8.3)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ dnl Library versioning
+ LIB_CURRENT=0
+***************
*** 63,68 ****
--- 63,70 ----
DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8"
diff --git a/patches/dbi.patch b/patches/dbi.patch
index f5e2f40..8d9b220 100644
--- a/patches/dbi.patch
+++ b/patches/dbi.patch
@@ -2,6 +2,17 @@ diff -c /usr/local/src/gnucash/libdbi-0.8.3/configure.in\~ /usr/local/src/gnucas
*** a/configure.in Wed Feb 6 08:03:27 2008
--- b/configure.in Tue Dec 8 17:09:30 2009
***************
+*** 3,7 ****
+--- 3,7 ----
+ AM_MAINTAINER_MODE
+
+ AM_INIT_AUTOMAKE(libdbi, 0.8.3)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ dnl Library versioning
+ LIB_CURRENT=0
+***************
*** 61,66 ****
--- 61,68 ----
DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
commit eb1282adc3e2f59fe59511b38acc1cea64765575
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 3 09:25:00 2013 -0700
Updates for Gnucash-2.5.4
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a18f811..1bdba4f 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -102,8 +102,8 @@
</autotools>
<autotools id="libofx" autogen-sh='configure'>
- <branch repo="sourceforge" module="libofx/libofx-0.9.5.tar.gz"
- version="0.9.5"/>
+ <branch repo="sourceforge" module="libofx/libofx-0.9.8.tar.gz"
+ version="0.9.8"/>
<dependencies>
<dep package="OpenSP"/>
</dependencies>
@@ -124,9 +124,8 @@
</autotools>
<autotools id="Slib" autogen-sh="install.sh" makeargs="-f Makefile.gnucash"
- makeinstallargs="-f Makefile.gnucash"
- skip-install="yes" skip-autogen="never"
- supports-non-srcdir-builds="no">
+ makeinstallargs="-f Makefile.gnucash" skip-install="yes"
+ skip-autogen="never" supports-non-srcdir-builds="no">
<!-- <branch repo="slib.savannah.gnu.org"
module="slib"/> -->
<branch repo="csail" module="scm/slib-3b4.zip" version="3b3"
@@ -201,7 +200,7 @@
<autotools id="gnucash-unstable" autogen-sh='configure'
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash/unstable/gnucash-2.5.3.tar.bz2" version="2.5.3"
+ <branch module="gnucash/unstable/gnucash-2.5.4.tar.bz2" version="2.5.4"
repo="sourceforge"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit b330d8ec744de6d9f520af0b2d2d6acf440793ff
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Jul 17 17:17:39 2013 -0700
Slib: update version, set supports-non-srcdir-builds
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index ee43972..a18f811 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -125,10 +125,11 @@
<autotools id="Slib" autogen-sh="install.sh" makeargs="-f Makefile.gnucash"
makeinstallargs="-f Makefile.gnucash"
- skip-install="yes" skip-autogen="never">
+ skip-install="yes" skip-autogen="never"
+ supports-non-srcdir-builds="no">
<!-- <branch repo="slib.savannah.gnu.org"
module="slib"/> -->
- <branch repo="csail" module="scm/slib-3b3.zip" version="3b3"
+ <branch repo="csail" module="scm/slib-3b4.zip" version="3b3"
checkoutdir="slib">
<patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/slib-install.patch"/>
</branch>
commit 8d935f61540f9898255aff1dc7e82fc21f7c96c8
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jul 7 09:11:53 2013 -0700
Release 2.5.3
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 80e6933..18a1234 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.5.2 © 2013 Gnucash Contributors</string>
+ <string>Gnucash version 2.5.3 © 2013 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.5.2 © 2013 Gnucash Contributors</string>
+ <string>2.5.3 © 2013 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.5.2</string>
+ <string>2.5.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.5.2</string>
+ <string>2.5.3</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 30b4ee6..ee43972 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -200,7 +200,7 @@
<autotools id="gnucash-unstable" autogen-sh='configure'
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash/unstable/gnucash-2.5.2.tar.bz2" version="2.5.2"
+ <branch module="gnucash/unstable/gnucash-2.5.3.tar.bz2" version="2.5.3"
repo="sourceforge"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit 8d991ad34dc1f0b4144815e8a3072262799ba3c3
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jul 7 09:11:33 2013 -0700
Update SWIG to 2.0.10
Patch no longer required
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index e9e430b..30b4ee6 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -116,10 +116,8 @@
</autotools>
<autotools id="swig" autogen-sh="configure">
- <branch repo="sourceforge" module="swig/swig-2.0.8.tar.gz" version="2.0.8">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/0001-Updated-swig-guile-deprecated-patch.patch"
- strip="1"/>
- </branch>
+ <branch repo="sourceforge" module="swig/swig-2.0.10.tar.gz"
+ version="2.0.10"/>
<dependencies>
<dep package="pcre"/>
</dependencies>
commit 5ae488137c93971007ca088d3e2c213e1cf54eb2
Author: John Ralls <jralls at ceridwen.us>
Date: Mon May 27 14:55:33 2013 -0700
Updates for Gnucash-2.5.2
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index aaf9824..80e6933 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.5.1 © 2013 Gnucash Contributors</string>
+ <string>Gnucash version 2.5.2 © 2013 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.5.1 © 2013 Gnucash Contributors</string>
+ <string>2.5.2 © 2013 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.5.1</string>
+ <string>2.5.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.5.1</string>
+ <string>2.5.2</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
old mode 100644
new mode 100755
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 5a423e0..e9e430b 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -202,7 +202,7 @@
<autotools id="gnucash-unstable" autogen-sh='configure'
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash/unstable/gnucash-2.5.1.tar.bz2" version="2.5.1"
+ <branch module="gnucash/unstable/gnucash-2.5.2.tar.bz2" version="2.5.2"
repo="sourceforge"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
@@ -213,6 +213,7 @@
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
+ <dep package="guile"/>
<dep package="swig"/>
<dep package="gconf2"/>
</dependencies>
@@ -230,6 +231,7 @@
<dep package="libgnomecanvas"/>
<dep package="meta-gtk-osx-webkit"/>
<dep package="Slib"/> <!-- Needed only for the 2.4 branch -->
+ <dep package="guile"/>
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
@@ -262,7 +264,7 @@
</autotools>
<autotools id="gnucash-docs-svn" autogenargs="--disable-scrollkeeper"
- autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ autogen-sh='autoreconf'
makeargs=" html" makeinstallargs="install-html" >
<branch repo="svn.gnucash.org" module="gnucash-docs"/>
<dependencies>
@@ -271,7 +273,7 @@
</autotools>
<autotools id="gnucash-docs-git" autogenargs="--disable-scrollkeeper"
- autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ autogen-sh='autoreconf'
makeargs=" html" makeinstallargs="install-html" >
<branch repo="github" module="Gnucash/gnucash-docs.git" revision="trunk"
checkoutdir="gnucash-docs-git"/>
@@ -281,7 +283,7 @@
</autotools>
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
- autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ autogen='autreconf'
makeargs=" html" makeinstallargs="install-html" >
<branch repo="svn.gnucash.org" module="gnucash-docs"
/>
commit dcda229cf17eed99e2c416bb2077e64ce9383404
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 4 16:54:41 2013 -0700
Revert include link to public repo
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 311ab5d..5a423e0 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -29,8 +29,8 @@
<repository type="git" name="github"
href="git://github.com/"/>
- <!--include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/ -->
- <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
+ <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
+ <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
<include href="gtkhtml.modules"/>
<autotools id="libchipcard" autogen-sh="configure" >
commit 00498d04a2a9d9a61f21cb9c742884eb2be80ec6
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 4 16:35:26 2013 -0700
Release 2.5.1
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 3ce26a3..aaf9824 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.5.0 © 2013 Gnucash Contributors</string>
+ <string>Gnucash version 2.5.1 © 2013 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.5.0 © 2013 Gnucash Contributors</string>
+ <string>2.5.1 © 2013 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.5.0</string>
+ <string>2.5.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.5.0</string>
+ <string>2.5.1</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index c8fc0bb..311ab5d 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -29,8 +29,8 @@
<repository type="git" name="github"
href="git://github.com/"/>
- <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
- <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
+ <!--include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/ -->
+ <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
<include href="gtkhtml.modules"/>
<autotools id="libchipcard" autogen-sh="configure" >
@@ -95,7 +95,7 @@
back and find the link step, copy and paste it, adding the
architecture flags, and fire away. Then you can exit the shell
and rerun build and it will work OK. -->
- <autotools id="OpenSP" autogen-template="%(srcdir)s/autoinit.sh && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ <autotools id="OpenSP" autogen-sh='autoreconf'
autogenargs="--disable-static --enable-shared --disable-doc-build --disable-nls">
<branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
version='1.5.2'/>
@@ -149,15 +149,14 @@
</dependencies>
</cmake>
- <autotools id="libdbi" autogen-template="%(srcdir)s/autogen.sh && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
- autogenargs="--disable-docs">
+ <autotools id="libdbi" autogen-sh='autoreconf' autogenargs="--disable-docs">
<branch repo="sourceforge" module="libdbi/libdbi-0.8.3.tar.gz"
version="0.8.4">
<patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/dbi.patch" strip="1"/>
</branch>
</autotools>
- <autotools id="libdbi-drivers" autogen-template="%(srcdir)s/autogen.sh && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ <autotools id="libdbi-drivers" autogen-sh='autoreconf'
autogenargs='--with-sqlite3 --disable-docs --with-sqlite3-incdir="/usr/include" --with-sqlite3-libdir="/usr/lib" '>
<branch repo="sourceforge" version="0.8.3-1"
module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz">
@@ -203,7 +202,7 @@
<autotools id="gnucash-unstable" autogen-sh='configure'
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash/unstable/gnucash-2.5.0.tar.bz2" version="2.5.0"
+ <branch module="gnucash/unstable/gnucash-2.5.1.tar.bz2" version="2.5.1"
repo="sourceforge"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
@@ -247,6 +246,7 @@
checkoutdir="gnucash-git"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
+ <dep package="meta-gtk-osx-python"/>
<dep package="libofx"/>
<dep package="aqbanking"/>
<dep package="libgnomecanvas"/>
@@ -270,6 +270,16 @@
</dependencies>
</autotools>
+ <autotools id="gnucash-docs-git" autogenargs="--disable-scrollkeeper"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ makeargs=" html" makeinstallargs="install-html" >
+ <branch repo="github" module="Gnucash/gnucash-docs.git" revision="trunk"
+ checkoutdir="gnucash-docs-git"/>
+ <dependencies>
+ <!-- dep package="scrollkeeper"/ -->
+ </dependencies>
+ </autotools>
+
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
makeargs=" html" makeinstallargs="install-html" >
commit e8e71bc71e1376d4047094d4dffb8f62c5147dcc
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 21 11:00:13 2013 -0700
Update for 2.4.13
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 3a3b0e1..8b07c5f 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.4.12 © 2013 Gnucash Contributors</string>
+ <string>Gnucash version 2.4.13 © 2013 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4.12 © 2013 Gnucash Contributers</string>
+ <string>2.4.13 © 2013 Gnucash Contributers</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4.12</string>
+ <string>2.4.13</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.4.12</string>
+ <string>2.4.13</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 1b9cb91..c8fc0bb 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -183,7 +183,7 @@
<autotools id="gnucash"
autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
- <branch module="gnucash/stable/gnucash-2.4.12.tar.bz2" version="2.4.12"
+ <branch module="gnucash/stable/gnucash-2.4.13.tar.bz2" version="2.4.13"
repo="sourceforge">
</branch>
<dependencies>
commit 4b657f6040f03c5974105d28708b9f8fb001bdde
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 21 10:59:57 2013 -0700
Fix linkage error on gnome-vfs
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index a4757ba..5aefc16 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -115,7 +115,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
</autotools>
<!-- Encountered a problem with linking libgnomevfs: For some reason it didn't include libresolv in the link list. Added it manually to Makefile and it worked, need a better solution. -->
- <autotools id="gnome-vfs" autogen-sh="configure">
+ <autotools id="gnome-vfs" autogen-sh="configure" autogenargs='LDFLAGS="$LDFLAGS -lresolv"'>
<branch module="gnome-vfs/2.24/gnome-vfs-2.24.2.tar.bz2" version="2.24.2"
hash="sha256:50ecf5f37d377492e8943a3c359ffe64176d4e7f045e9980790eca999a1c6856"/>
<dependencies>
commit 04cc5bcbde84b908a00e3a31e6da315dbc82e26c
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 13 15:09:27 2013 -0700
Slib: Add makeinstallargs for compat with older jhbuild
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 3421df3..1b9cb91 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -126,6 +126,7 @@
</autotools>
<autotools id="Slib" autogen-sh="install.sh" makeargs="-f Makefile.gnucash"
+ makeinstallargs="-f Makefile.gnucash"
skip-install="yes" skip-autogen="never">
<!-- <branch repo="slib.savannah.gnu.org"
module="slib"/> -->
commit 49a06a9422619d1e0ab6cfed85ed1550962b2c79
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 13 15:07:42 2013 -0700
Add separate launcher for unstable
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index da00b28..7d92596 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -31,7 +31,7 @@
not needed. If the source path is left out, the default
script will be used.
-->
- <launcher-script>${project}/gnucash.launcher</launcher-script>
+ <launcher-script>${project}/gnucash-unstable.launcher</launcher-script>
<!-- Not implemented: Optional runtime, could be python or mono
for example.
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
new file mode 100644
index 0000000..4fa28de
--- /dev/null
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -0,0 +1,148 @@
+#!/bin/sh
+
+if test "x$GTK_DEBUG_LAUNCHER" != x; then
+ set -x
+fi
+
+if test "x$GTK_DEBUG_GDB" != x; then
+ EXEC="gdb --args"
+else
+ EXEC=exec
+fi
+
+export PREFIX=/Library/Gnucash-2.5
+export PREFIXDIR="`dirname $PREFIX`"
+
+name=`basename "$0"`
+tmp="$0"
+tmp=`dirname "$tmp"`
+tmp=`dirname "$tmp"`
+bundle=`dirname "$tmp"`
+bundle_contents="$bundle"/Contents
+bundle_res="$bundle_contents"/Resources
+bundle_fw="$bundle_contents"/Frameworks
+bundle_lib="$bundle_res"/lib
+bundle_bin="$bundle_res"/bin
+bundle_data="$bundle_res"/share
+bundle_etc="$bundle_res"/etc
+
+export DYLD_LIBRARY_PATH="$bundle_lib"
+export XDG_CONFIG_DIRS="$bundle_etc"/xdg
+export XDG_DATA_DIRS="$PREFIX/share"
+export GTK_DATA_PREFIX="$bundle_res"
+export GTK_EXE_PREFIX="$bundle_res"
+export GTK_PATH="$bundle_res"
+
+export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
+export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
+export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
+export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
+export PANGO_SYSCONFDIR="$bundle_etc"
+export PANGO_LIBDIR="$bundle_lib"
+
+if test -f "$bundle_lib/charset.alias"; then
+ export CHARSETALIASDIR="$bundle_lib"
+fi
+
+# Extra arguments can be added in environment.sh.
+EXTRA_ARGS=" --debug"
+
+if test -f "$bundle_res/environment.sh"; then
+ source "$bundle_res/environment.sh"
+fi
+
+# Strip out the argument added by the OS.
+if /bin/expr "x$1" : "x-psn_.*" > /dev/null; then
+ shift 1
+fi
+
+export RESPFX="${bundle_res}"
+PATH="${RESPFX}"/bin:"${PATH}"
+export PATH
+
+GUILE_WARN_DEPRECATED="no"
+export GUILE_WARN_DEPRECATED
+
+if [ -w "$PREFIXDIR" ]; then
+ if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
+ if [ ! -d "$PREFIX" ]; then
+ rm "$PREFIX"; else
+ mv "$PREFIX" "$PREFIX.Save";
+ fi
+ ln -s "$RESPFX" "$PREFIX"
+ elif [ ! -e "$PREFIX" ] ; then
+ echo "Linking $RESPFX to $PREFIX"
+ if [ ! -d "$PREFIXDIR" ]; then
+ mkdir -p "$PREFIXDIR";
+ fi
+ ln -s "$RESPFX" "$PREFIX"
+ fi
+else
+ echo "Don't have write access to $PREFIXDIR"
+ if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
+ echo "moving the $PREFIX directory to $PREFIX.save"
+ osascript <<EOF
+display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
+do shell script "echo foo; if [ ! -d \"$PREFIX\" ]; then rm \"$PREFIX\"; else mv \"$PREFIX\" \"$PREFIX.Save\"; fi; ln -s \"$RESPFX\" \"$PREFIX\" " with administrator privileges
+
+EOF
+
+ elif [ ! -e "$PREFIX" ] ;
+ then
+ echo "Linking $RESPFX to $PREFIX"
+ osascript <<EOF
+display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
+do shell script "if [ ! -d \"$PREFIXDIR\" ]; then mkdir -p \"$PREFIXDIR\"; fi; ln -s \"$RESPFX\" \"$PREFIX\"" with administrator privileges
+
+EOF
+
+
+ fi
+fi
+
+if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+ # If we get here without a way to connect to an instance of dbus-daemon,
+ # then we can kill any existing instances of dbus-daemon that originate
+ # in this copy of Gnucash.
+
+ DBUS_PIDS=`ps ux | grep dbus-daemon | grep "${PREFIX}" | awk '{print $2}'`
+
+ if /bin/test "$DBUS_PIDS"; then
+ for DBUS_PID in ${DBUS_PIDS}
+ do
+ /bin/kill "${DBUS_PID}"
+ done
+ fi
+
+ eval `"$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
+fi
+
+GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
+
+EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/guile-modules"
+EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/scm"
+GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
+
+EXTRA_LIBS="${GNC_MODULE_PATH}"
+EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
+EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib"
+EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib/gnucash"
+
+LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
+DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
+export DYLD_FRAMEWORK_PATH="${bundle_fw}"
+export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/guile-modules/gnucash/report/standard-reports"
+export GNC_DBD_DIR="${bundle_lib}/dbd"
+
+export GNC_MODULE_PATH
+export GUILE_LOAD_PATH
+export LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
+export GNC_DOT_DIR="$HOME/Library/Application Support/Gnucash"
+
+if test -f "$GNC_DOT_DIR/gnucashrc"; then
+ source "$GNC_DOT_DIR/gnucashrc"
+fi
+
+#Don't quote $EXTRA_ARGS or it will turn into a single arg and fail.
+$EXEC "$bundle_contents/MacOS/$name-bin" $EXTRA_ARGS "$@"
commit 0d6d70e47897cbdc7fcfbb717d4323adceb37839
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Apr 9 09:57:07 2013 -0700
Fix up Slib module to work correctly, remove from guncash-unstable
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a9194e3..3421df3 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -30,7 +30,7 @@
href="git://github.com/"/>
<include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
- <!--include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
+ <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
<include href="gtkhtml.modules"/>
<autotools id="libchipcard" autogen-sh="configure" >
@@ -125,8 +125,8 @@
</dependencies>
</autotools>
- <autotools id="Slib" autogen-sh="configure" makeargs="-f Makefile.gnucash"
- skip-autogen="never">
+ <autotools id="Slib" autogen-sh="install.sh" makeargs="-f Makefile.gnucash"
+ skip-install="yes" skip-autogen="never">
<!-- <branch repo="slib.savannah.gnu.org"
module="slib"/> -->
<branch repo="csail" module="scm/slib-3b3.zip" version="3b3"
@@ -210,7 +210,6 @@
<dep package="aqbanking"/>
<dep package="libgnomecanvas"/>
<dep package="meta-gtk-osx-webkit"/>
- <dep package="Slib"/>
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
@@ -230,7 +229,7 @@
<dep package="aqbanking"/>
<dep package="libgnomecanvas"/>
<dep package="meta-gtk-osx-webkit"/>
- <dep package="Slib"/>
+ <dep package="Slib"/> <!-- Needed only for the 2.4 branch -->
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
@@ -251,7 +250,7 @@
<dep package="aqbanking"/>
<dep package="libgnomecanvas"/>
<dep package="meta-gtk-osx-webkit"/>
- <dep package="Slib"/>
+ <dep package="Slib"/> <!-- Needed only for the 2.4 branch -->
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
commit 4e012a46d73928f4729f4033b9df9bad2623c044
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Apr 9 09:56:28 2013 -0700
Bundles: Reconcile bundles with latest modulesets
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 4735901..da00b28 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -91,10 +91,6 @@
</binary>
<binary>
- ${prefix}/lib/libglade
- </binary>
-
- <binary>
${prefix}/libexec
</binary>
@@ -141,10 +137,6 @@
${prefix}/lib/libgnc-*.la
</data>
- <data dest="${bundle}/Contents/Resources/lib/">
- ${prefix}/lib/libofx.la
- </data>
-
<data>
${prefix}/etc/fonts
</data>
@@ -182,6 +174,10 @@
</data>
<data>
+ ${prefix}/share/mime
+ </data>
+
+ <data>
${prefix}/share/themes
</data>
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 454efa8..d1272ac 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -141,14 +141,6 @@
${prefix}/lib/libgnc-*.la
</data>
- <data dest="${bundle}/Contents/Resources/lib/">
- ${prefix}/lib/libofx.la
- </data>
-
- <data>
- ${prefix}/etc/xdg
- </data>
-
<data>
${prefix}/etc/fonts
</data>
commit 084b7e904c6428896e41be7e1572197f1747a0a9
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 31 14:31:41 2013 -0700
Bring unstable module & bundle files up to date
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 348668d..3ce26a3 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.3.17 © 2010 Contributors</string>
+ <string>Gnucash version 2.5.0 © 2013 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,23 +15,23 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.3.17 © 2010 Contributors</string>
+ <string>2.5.0 © 2013 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.3.17</string>
+ <string>2.5.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.3.17</string>
+ <string>2.5.0</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
<true/>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2010 Contributors</string>
+ <string>Copyright 2013 Gnucash Contributors</string>
<key>NSHighResolutionCapable</key>
<true/>
</dict>
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index ac38d01..4735901 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -31,7 +31,7 @@
not needed. If the source path is left out, the default
script will be used.
-->
- <launcher-script>${project}/gnucash-unstable.launcher</launcher-script>
+ <launcher-script>${project}/gnucash.launcher</launcher-script>
<!-- Not implemented: Optional runtime, could be python or mono
for example.
@@ -50,7 +50,7 @@
<!-- Copy in GTK+ and Pango modules. Note the use of the
"${pkg:module:variable}" macro, which evaluates to a pkg-config
variable in the specified module. Note that any libraries that
- binaries link to are also copied in automatically.
+ binaries link to are also copied in automatically.
-->
<binary>
${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so
@@ -66,7 +66,7 @@
</binary>
<binary>
- ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-fc.so
+ ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
</binary>
<binary>
@@ -122,6 +122,7 @@
${prefix}/lib/dbd
</binary>
+
<!-- Data to copy in, usually Glade/UI files, images, sounds files
etc. The destination inside the bundle can be specified if the
files should end up at a different location, by using the
@@ -145,10 +146,6 @@
</data>
<data>
- ${prefix}/etc/xdg
- </data>
-
- <data>
${prefix}/etc/fonts
</data>
@@ -185,10 +182,6 @@
</data>
<data>
- ${prefix}/share/mime
- </data>
-
- <data>
${prefix}/share/themes
</data>
@@ -214,7 +207,7 @@
</data>
<data dest="${bundle}/Contents/Resources/License">
- ${prefix}/share/gnucash/doc/LICENSE
+ ${prefix}/share/doc/gnucash/LICENSE
</data>
<data dest="${bundle}/Contents/Resources/Sources">
@@ -222,37 +215,41 @@
</data>
<data dest="${bundle}/Contents/Resources/en.lproj/GnuCash Help/">
- ${prefix}/share/gnome/help/gnucash/C/gnucash-help
+ ${prefix}/share/doc/gnucash-docs/C/gnucash-help/
</data>
<data dest="${bundle}/Contents/Resources/en.lproj/GnuCash Guide/">
- ${prefix}/share/gnome/help/gnucash/C/gnucash-guide/
+ ${prefix}/share/doc/gnucash-docs/C/gnucash-guide/
</data>
<data dest="${bundle}/Contents/Resources/de.lproj/GnuCash Help/">
- ${prefix}/share/gnome/help/gnucash/de_DE/gnucash-help
+ ${prefix}/share/doc/gnucash-docs/de_DE/gnucash-help/
</data>
<data dest="${bundle}/Contents/Resources/de.lproj/GnuCash Guide/">
- ${prefix}/share/gnome/help/gnucash/de_DE/gnucash-guide/
+ ${prefix}/share/doc/gnucash-docs/de_DE/gnucash-guide/
</data>
<data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Help/">
- ${prefix}/share/gnome/help/gnucash/it_IT/gnucash-help
+ ${prefix}/share/doc/gnucash-docs/it_IT/gnucash-help/
</data>
<data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Guide/">
- ${prefix}/share/gnome/help/gnucash/it_IT/gnucash-guide/
+ ${prefix}/share/doc/gnucash-docs/it_IT/gnucash-guide/
</data>
<data dest="${bundle}/Contents/Resources/ja.lproj/GnuCash Guide/">
- ${prefix}/share/gnome/help/gnucash/ja_JP/gnucash-guide/
+ ${prefix}/share/doc/gnucash-docs/ja_JP/gnucash-guide/
</data>
<translations name="gnucash">
${prefix}/share/locale
</translations>
+ <translations name="gtk20">
+ ${prefix}/share/locale
+ </translations>
+
<translations name="iso_4217">
${prefix}/share/locale
</translations>
@@ -261,7 +258,7 @@
${prefix}/share/locale
</translations>
-<!-- This takes the Quartz theme instructions from the package and puts them in the bundle gtkrc file. You may want to cusomize the source path if you want a different theme, or if you want other stuff in your gtkrc.
+<!-- This takes the Quartz theme instructions from the package and puts them in the bundle gtkrc file. You may want to cusomize the source path if you want a different theme, or if you want other stuff in your gtkrc.
<data dest='${bundle}/Contents/Resources/etc/gtk-2.0/gtkrc'>
${prefix}/share/themes/Quartz/gtk-2.0/gtkrc
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 44440e9..a9194e3 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -125,8 +125,8 @@
</dependencies>
</autotools>
- <autotools id="Slib" autogen-sh="install.sh" makeargs="-f Makefile.gnucash"
- skip-install="yes" skip-configure="never">
+ <autotools id="Slib" autogen-sh="configure" makeargs="-f Makefile.gnucash"
+ skip-autogen="never">
<!-- <branch repo="slib.savannah.gnu.org"
module="slib"/> -->
<branch repo="csail" module="scm/slib-3b3.zip" version="3b3"
@@ -182,7 +182,6 @@
<autotools id="gnucash"
autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
- <!--branch module="gnucash" revision="20812" repo="svn.gnucash.org"-->
<branch module="gnucash/stable/gnucash-2.4.12.tar.bz2" version="2.4.12"
repo="sourceforge">
</branch>
@@ -201,10 +200,10 @@
</autotools>
- <autotools id="gnucash-svn"
- autogen-template="GNOME2_PATH=%(prefix)s %(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ <autotools id="gnucash-unstable" autogen-sh='configure'
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch repo="svn.gnucash.org" module="gnucash"/>
+ <branch module="gnucash/unstable/gnucash-2.5.0.tar.bz2" version="2.5.0"
+ repo="sourceforge"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
<dep package="libofx"/>
@@ -221,11 +220,10 @@
</autotools>
- <autotools id="gnucash-git"
- autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ <autotools id="gnucash-svn"
+ autogen-template="GNOME2_PATH=%(prefix)s %(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch repo="github" module="Gnucash/gnucash.git" revision="trunk"
- checkoutdir="gnucash-git"/>
+ <branch repo="svn.gnucash.org" module="gnucash"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
<dep package="libofx"/>
@@ -237,25 +235,28 @@
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
<dep package="swig"/>
+ <dep package="gconf2"/>
</dependencies>
</autotools>
- <autotools id="gnucash-unstable"
+ <autotools id="gnucash-git"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash/branches/2.4" repo="svn.gnucash.org"/>
-
- <dependencies>
+ <branch repo="github" module="Gnucash/gnucash.git" revision="trunk"
+ checkoutdir="gnucash-git"/>
+ <dependencies>
<dep package="meta-gtk-osx-core"/>
<dep package="libofx"/>
<dep package="aqbanking"/>
- <dep package="meta-gtk-osx-webkit"/>
- <dep package="libgnomeui"/>
+ <dep package="libgnomecanvas"/>
+ <dep package="meta-gtk-osx-webkit"/>
<dep package="Slib"/>
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
+ <dep package="swig"/>
+ <dep package="gconf2"/>
</dependencies>
</autotools>
commit 73c92297a428a6a9b52adc0b62fa6d118c63ab86
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 31 14:29:54 2013 -0700
Restore NSHighResolutionCapable key
It wasn't unrecognized, it was in the wrong place.
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 1be224a..3a3b0e1 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -61,9 +61,9 @@
<true/>
<key>LSMinimumSystemVersion</key>
<string>10.5.0</string>
+ <key>NSHighResolutionCapable</key>
+ <true/>
<key>NSHumanReadableCopyright</key>
- <!--key>NSHighResolutionCapable</key>
- <true/-->
<string>Copyright 2013 Gnucash Contributors</string>
</dict>
</plist>
diff --git a/gnucash-bundler/gnucash-svn.bundle b/gnucash-bundler/gnucash-svn.bundle
deleted file mode 100644
index 16884cf..0000000
--- a/gnucash-bundler/gnucash-svn.bundle
+++ /dev/null
@@ -1,284 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<app-bundle>
-
- <meta>
- <!-- Where to pick up the GTK+ installation, icon themes,
- etc. Note that "${env:PREFIX}" is evaluated to the value of
- the environment variable PREFIX, and likewise with HOME. You
- can define additional prefixes and refer to them in paths
- throughout this file on the form "${prefix:name}". This is
- useful for installing certain libraries or even the
- application itself separately.
- -->
- <prefix name="default">${env:PREFIX}</prefix>
-
- <!-- The project directory is the default location of the created
- app. If you leave out the path, the current directory is
- used.
- -->
- <destination overwrite="yes">${env:HOME}</destination>
-
- <image>
- <!-- Not implemented yet (DMG image). -->
- </image>
- <!-- Comment this out to keep the install names in binaries -->
- <run-install-name-tool/>
-
-
- <!-- Optionally specify a launcher script to use. If the
- application sets up everything needed itself, like
- environment variable, linker paths, etc, a launcher script is
- not needed. If the source path is left out, the default
- script will be used.
- -->
- <launcher-script>${project}/gnucash-svn.launcher</launcher-script>
-
- <!-- Not implemented: Optional runtime, could be python or mono
- for example.
- -->
- <!--runtime copy="yes">/usr/bin/python</runtime-->
- </meta>
-
- <!-- The special macro "${project}" refers to the directory where
- this bundle file is located. The application name and bundle
- identifier are taken from the plist file.
- -->
- <plist>${project}/Info-unstable.plist</plist>
-
- <main-binary>${prefix}/bin/gnucash</main-binary>
-
- <!-- Copy in GTK+ and Pango modules. Note the use of the
- "${pkg:module:variable}" macro, which evaluates to a pkg-config
- variable in the specified module. Note that any libraries that
- binaries link to are also copied in automatically.
- -->
- <binary>
- ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so
- </binary>
-<!-- Copy in the theme engines. -->
- <binary>
- ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/engines/*.so
- </binary>
-
-<!-- And the print backends -->
- <binary>
- ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/printbackends/*.so
- </binary>
-
- <binary>
- ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-fc.so
- </binary>
-
- <binary>
- ${prefix}/lib/GConf/2/*.so
- </binary>
-
- <!-- Seems to get missed by the dependency resolver -->
- <binary>
- ${prefix}/lib/libguile-srfi*
- </binary>
-
- <binary>
- ${prefix}/lib/gnucash
- </binary>
-
- <binary>
- ${prefix}/lib/aqbanking
- </binary>
-
- <binary>
- ${prefix}/lib/gwenhywfar
- </binary>
-
- <binary>
- ${prefix}/lib/libglade
- </binary>
-
- <binary>
- ${prefix}/libexec
- </binary>
-
- <binary>
- ${prefix}/bin/dbus-launch
- </binary>
-
- <binary>
- ${prefix}/bin/dbus-daemon
- </binary>
-
- <binary>
- ${prefix}/bin/gnc-*
- </binary>
-
- <binary dest="${bundle}/Contents/MacOS">
- ${prefix}/bin/aqbanking-cli
- </binary>
-
- <binary>
- ${prefix}/lib/goffice
- </binary>
-
- <binary>
- ${prefix}/lib/dbd
- </binary>
-
-<!-- Data to copy in, usually Glade/UI files, images, sounds files
- etc. The destination inside the bundle can be specified if the
- files should end up at a different location, by using the
- "dest" property. The destination must then start with the macro
- "${bundle}", which refers to the bundle root directory.
- -->
- <data>
- ${prefix}/etc/gnucash
- </data>
-
- <data dest="${bundle}/Contents/Resources/lib/">
- ${prefix}/lib/libguile-srfi-srfi-*.la
- </data>
-
- <data dest="${bundle}/Contents/Resources/lib/">
- ${prefix}/lib/libgnc-*.la
- </data>
-
- <data dest="${bundle}/Contents/Resources/lib/">
- ${prefix}/lib/libofx.la
- </data>
-
- <data>
- ${prefix}/etc/xdg
- </data>
-
- <data>
- ${prefix}/etc/fonts
- </data>
-
- <data>
- ${prefix}/etc/gconf
- </data>
-
- <data>
- ${prefix}/share/gnucash
- </data>
-
- <data>
- ${prefix}/share/guile
- </data>
-
- <data>
- ${prefix}/share/GConf
- </data>
-
- <data>
- ${prefix}/share/dbus-1/
- </data>
-
- <data>
- ${prefix}/share/aqbanking
- </data>
-
- <data>
- ${prefix}/share/gwenhywfar
- </data>
-
- <data>
- ${prefix}/share/libofx
- </data>
-
- <data>
- ${prefix}/share/mime
- </data>
-
- <data>
- ${prefix}/share/themes
- </data>
-
- <!--data dest="${bundle}/Contents/Resources/slib"-->
- <data>
- ${prefix}/lib/slib
- </data>
-
- <data dest="${bundle}/Contents/Resources">
- ${project}/gnucash.icns
- </data>
-
- <data dest="${bundle}/Contents/Resources">
- ${prefix}/share/strings
- </data>
-
- <data dest='${bundle}/Contents/Resources/var/lib/dbus/machine-id'>
- ${prefix}/var/lib/dbus/machine-id
- </data>
-
- <data dest='${bundle}/Contents/Resources/etc/dbus-1/'>
- ${prefix}/etc/dbus-1/
- </data>
-
- <data dest="${bundle}/Contents/Resources/License">
- ${prefix}/share/doc/gnucash/LICENSE
- </data>
-
- <data dest="${bundle}/Contents/Resources/Sources">
- ${project}/Sources
- </data>
-
- <data dest="${bundle}/Contents/Resources/en.lproj/GnuCash Help/">
- ${prefix}/share/gnome/help/gnucash/C/gnucash-help
- </data>
-
- <data dest="${bundle}/Contents/Resources/en.lproj/GnuCash Guide/">
- ${prefix}/share/gnome/help/gnucash/C/gnucash-guide/
- </data>
-
- <data dest="${bundle}/Contents/Resources/de.lproj/GnuCash Help/">
- ${prefix}/share/gnome/help/gnucash/de_DE/gnucash-help
- </data>
-
- <data dest="${bundle}/Contents/Resources/de.lproj/GnuCash Guide/">
- ${prefix}/share/gnome/help/gnucash/de_DE/gnucash-guide/
- </data>
-
- <data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Help/">
- ${prefix}/share/gnome/help/gnucash/it_IT/gnucash-help
- </data>
-
- <data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Guide/">
- ${prefix}/share/gnome/help/gnucash/it_IT/gnucash-guide/
- </data>
-
- <data dest="${bundle}/Contents/Resources/ja.lproj/GnuCash Guide/">
- ${prefix}/share/gnome/help/gnucash/ja_JP/gnucash-guide/
- </data>
-
- <translations name="gnucash">
- ${prefix}/share/locale
- </translations>
-
- <translations name="iso_4217">
- ${prefix}/share/locale
- </translations>
-
- <translations name="aqbanking">
- ${prefix}/share/locale
- </translations>
-
-<!-- This takes the Quartz theme instructions from the package and puts them in the bundle gtkrc file. You may want to cusomize the source path if you want a different theme, or if you want other stuff in your gtkrc.
-
- <data dest='${bundle}/Contents/Resources/etc/gtk-2.0/gtkrc'>
- ${prefix}/share/themes/Quartz/gtk-2.0/gtkrc
- </data>
--->
-
- <!-- Icon themes to copy. The "icons" property can be either of
- "auto", "all", or "none". All or none should be
- self-explanatory, while auto means that the script will try to
- figure out which icons are needed. This is done by getting all
- the strings from all copied binaries, and matching them against
- icon names. To be safe, you should use "all". "none" is useful
- if you want just the index.theme file but no icons, mostly
- needed for the "hicolor" base theme.
- -->
- <!-- icon-theme icons="auto"/>
- Tango
- </icon-theme -->
-
-</app-bundle>
diff --git a/gnucash-bundler/gnucash-svn.launcher b/gnucash-bundler/gnucash-svn.launcher
deleted file mode 100755
index 9e17981..0000000
--- a/gnucash-bundler/gnucash-svn.launcher
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/sh
-
-if test "x$IGE_DEBUG_LAUNCHER" != x; then
- set -x
-fi
-
-if test "x$IGE_DEBUG_GDB" != x; then
- EXEC="gdb --args"
-else
- EXEC=exec
-fi
-
-export PREFIX=/Library/Gnucash-svn
-export PREFIXDIR="`dirname $PREFIX`"
-
-name=`basename "$0"`
-tmp="$0"
-tmp=`dirname "$tmp"`
-tmp=`dirname "$tmp"`
-bundle=`dirname "$tmp"`
-bundle_contents="$bundle"/Contents
-bundle_res="$bundle_contents"/Resources
-bundle_fw="$bundle_contents"/Frameworks
-bundle_lib="$bundle_res"/lib
-bundle_bin="$bundle_res"/bin
-bundle_data="$bundle_res"/share
-bundle_etc="$bundle_res"/etc
-
-export DYLD_LIBRARY_PATH="$bundle_lib"
-export XDG_CONFIG_DIRS="$bundle_etc"/xdg
-export XDG_DATA_DIRS="$PREFIX/share"
-export GTK_DATA_PREFIX="$bundle_res"
-export GTK_EXE_PREFIX="$bundle_res"
-export GTK_PATH="$bundle_res"
-
-export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
-export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
-export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
-export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
-
-if test -f "$bundle_lib/charset.alias"; then
- export CHARSETALIASDIR="$bundle_lib"
-fi
-
-# Extra arguments can be added in environment.sh.
-EXTRA_ARGS=" --debug"
-
-if test -f "$bundle_res/environment.sh"; then
- source "$bundle_res/environment.sh"
-fi
-
-# Strip out the argument added by the OS.
-if [ x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ]; then
- shift 1
-fi
-
-export RESPFX="${bundle_res}"
-PATH="${RESPFX}"/bin:"${PATH}"
-export PATH
-
-GUILE_WARN_DEPRECATED="no"
-export GUILE_WARN_DEPRECATED
-
-if [ -w "$PREFIXDIR" ]; then
- if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
- if [ ! -d "$PREFIX" ]; then
- rm "$PREFIX"; else
- mv "$PREFIX" "$PREFIX.Save";
- fi
- ln -s "$RESPFX" "$PREFIX"
- elif [ ! -e "$PREFIX" ] ; then
- echo "Linking $RESPFX to $PREFIX"
- if [ ! -d "$PREFIXDIR" ]; then
- mkdir -p "$PREFIXDIR";
- fi
- ln -s "$RESPFX" "$PREFIX"
- fi
-else
- echo "Don't have write access to $PREFIXDIR"
- if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
- echo "moving the $PREFIX directory to $PREFIX.save"
- osascript <<EOF
-display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
-do shell script "echo foo; if [ ! -d \"$PREFIX\" ]; then rm \"$PREFIX\"; else mv \"$PREFIX\" \"$PREFIX.Save\"; fi; ln -s \"$RESPFX\" \"$PREFIX\" " with administrator privileges
-
-EOF
-
- elif [ ! -e "$PREFIX" ] ;
- then
- echo "Linking $RESPFX to $PREFIX"
- osascript <<EOF
-display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
-do shell script "if [ ! -d \"$PREFIXDIR\" ]; then mkdir -p \"$PREFIXDIR\"; fi; ln -s \"$RESPFX\" \"$PREFIX\"" with administrator privileges
-
-EOF
-
-
- fi
-fi
-
-if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
- # If we get here without a way to connect to an instance of dbus-daemon,
- # then we can kill any existing instances of dbus-daemon that originate
- # in this copy of Gnucash.
-
- DBUS_PIDS=`ps ux | grep dbus-daemon | grep "${PREFIX}" | awk '{print $2}'`
-
- if /bin/test "$DBUS_PIDS"; then
- for DBUS_PID in ${DBUS_PIDS}
- do
- /bin/kill "${DBUS_PID}"
- done
- fi
-
- eval `"$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
-fi
-
-GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
-
-EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/guile-modules"
-EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/scm"
-GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
-
-EXTRA_LIBS="${GNC_MODULE_PATH}"
-EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
-EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib"
-EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib/gnucash"
-
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
-DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
-export DYLD_FRAMEWORK_PATH="${bundle_fw}"
-export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/guile-modules/gnucash/report/standard-reports"
-export GNC_DBD_DIR="${bundle_lib}/dbd"
-
-export GNC_MODULE_PATH
-export GUILE_LOAD_PATH
-export LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH
-export GNC_DOT_DIR="$HOME/Library/Application Support/Gnucash"
-
-if test -f "$GNC_DOT_DIR/gnucashrc"; then
- source "$GNC_DOT_DIR/gnucashrc"
-fi
-
-#Don't quote $EXTRA_ARGS or it will turn into a single arg and fail.
-$EXEC "$bundle_contents/MacOS/$name-bin" $EXTRA_ARGS $*
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
deleted file mode 100755
index 0c1d8bf..0000000
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/sh
-
-if test "x$IGE_DEBUG_LAUNCHER" != x; then
- set -x
-fi
-
-if test "x$IGE_DEBUG_GDB" != x; then
- EXEC="gdb --args"
-else
- EXEC=exec
-fi
-
-export PREFIX=/Library/Gnucash-2.5
-export PREFIXDIR="`dirname $PREFIX`"
-
-name=`basename "$0"`
-tmp="$0"
-tmp=`dirname "$tmp"`
-tmp=`dirname "$tmp"`
-bundle=`dirname "$tmp"`
-bundle_contents="$bundle"/Contents
-bundle_res="$bundle_contents"/Resources
-bundle_fw="$bundle_contents"/Frameworks
-bundle_lib="$bundle_res"/lib
-bundle_bin="$bundle_res"/bin
-bundle_data="$bundle_res"/share
-bundle_etc="$bundle_res"/etc
-
-export DYLD_LIBRARY_PATH="$bundle_lib"
-export XDG_CONFIG_DIRS="$bundle_etc"/xdg
-export XDG_DATA_DIRS="$PREFIX/share"
-export GTK_DATA_PREFIX="$bundle_res"
-export GTK_EXE_PREFIX="$bundle_res"
-export GTK_PATH="$bundle_res"
-
-export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
-export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
-export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
-export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
-
-if test -f "$bundle_lib/charset.alias"; then
- export CHARSETALIASDIR="$bundle_lib"
-fi
-
-# Extra arguments can be added in environment.sh.
-EXTRA_ARGS=" --debug"
-
-if test -f "$bundle_res/environment.sh"; then
- source "$bundle_res/environment.sh"
-fi
-
-# Strip out the argument added by the OS.
-if /bin/expr "x$1" : '^x-psn_' > /dev/null; then
- shift 1
-fi
-
-export RESPFX="${bundle_res}"
-PATH="${RESPFX}"/bin:"${PATH}"
-export PATH
-
-GUILE_WARN_DEPRECATED="no"
-export GUILE_WARN_DEPRECATED
-
-if [ -w "$PREFIXDIR" ]; then
- if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
- if [ ! -d "$PREFIX" ]; then
- rm "$PREFIX"; else
- mv "$PREFIX" "$PREFIX.Save";
- fi
- ln -s "$RESPFX" "$PREFIX"
- elif [ ! -e "$PREFIX" ] ; then
- echo "Linking $RESPFX to $PREFIX"
- if [ ! -d "$PREFIXDIR" ]; then
- mkdir -p "$PREFIXDIR";
- fi
- ln -s "$RESPFX" "$PREFIX"
- fi
-else
- echo "Don't have write access to $PREFIXDIR"
- if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
- echo "moving the $PREFIX directory to $PREFIX.save"
- osascript <<EOF
-display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
-do shell script "echo foo; if [ ! -d \"$PREFIX\" ]; then rm \"$PREFIX\"; else mv \"$PREFIX\" \"$PREFIX.Save\"; fi; ln -s \"$RESPFX\" \"$PREFIX\" " with administrator privileges
-
-EOF
-
- elif [ ! -e "$PREFIX" ] ;
- then
- echo "Linking $RESPFX to $PREFIX"
- osascript <<EOF
-display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
-do shell script "if [ ! -d \"$PREFIXDIR\" ]; then mkdir -p \"$PREFIXDIR\"; fi; ln -s \"$RESPFX\" \"$PREFIX\"" with administrator privileges
-
-EOF
-
-
- fi
-fi
-
-if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
- # If we get here without a way to connect to an instance of dbus-daemon,
- # then we can kill any existing instances of dbus-daemon that originate
- # in this copy of Gnucash.
-
- DBUS_PIDS=`ps ux | grep dbus-daemon | grep "${PREFIX}" | awk '{print $2}'`
-
- if /bin/test "$DBUS_PIDS"; then
- for DBUS_PID in ${DBUS_PIDS}
- do
- /bin/kill "${DBUS_PID}"
- done
- fi
-
- eval `"$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
-fi
-
-GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
-
-EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/guile-modules"
-EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/scm"
-GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
-
-EXTRA_LIBS="${GNC_MODULE_PATH}"
-EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
-EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib"
-EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib/gnucash"
-
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
-DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
-export DYLD_FRAMEWORK_PATH="${bundle_fw}"
-export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/guile-modules/gnucash/report/standard-reports"
-export GNC_DBD_DIR="${bundle_lib}/dbd"
-
-export GNC_MODULE_PATH
-export GUILE_LOAD_PATH
-export LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH
-export GNC_DOT_DIR="$HOME/Library/Application Support/Gnucash"
-
-if test -f "$GNC_DOT_DIR/gnucashrc"; then
- source "$GNC_DOT_DIR/gnucashrc"
-fi
-
-#Don't quote $EXTRA_ARGS or it will turn into a single arg and fail.
-$EXEC "$bundle_contents/MacOS/$name-bin" $EXTRA_ARGS "$@"
commit bcd4399ac0dbfe0de4e60ce3508b63edc662bdf6
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 31 10:32:56 2013 -0700
Change download location for aquamaniac tarballs
Github withdrew the download service, so they're now retrieved from
the Gnucash area on SF. (The aquamaniac site uses javascript for down-
loads which doesn't work for jhbuild.)
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 2f9f456..44440e9 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -24,8 +24,6 @@
href="http://www.gnucash.org/pub/gnucash/sources/"/>
<repository type="svn" name="svn.gnucash.org"
href="http://svn.gnucash.org/repo/"/>
- <repository type="tarball" name="github_gnucash"
- href="https://github.com/downloads/jralls/gnucash-on-osx/"/>
<repository type="svn" name="aquamaniac"
href="http://devel.aqbanking.de/svn/"/>
<repository type="git" name="github"
@@ -36,8 +34,8 @@
<include href="gtkhtml.modules"/>
<autotools id="libchipcard" autogen-sh="configure" >
- <branch module="libchipcard-5.0.2.tar.gz" version="5.0.2"
- repo="github_gnucash" />
+ <branch module="gnucash/Dependencies/libchipcard-5.0.2.tar.gz" version="5.0.2"
+ repo="sourceforge" />
<dependencies>
<dep package="libgcrypt"/>
<dep package="gnutls"/>
@@ -46,8 +44,8 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--disable-qt4 --with-guis=gtk2">
- <branch module="gwenhywfar-4.3.3.tar.gz" version="4.3.3"
- repo="github_gnucash" />
+ <branch module="gnucash/Dependencies/gwenhywfar-4.3.3.tar.gz" version="4.3.3"
+ repo="sourceforge" />
<dependencies>
<dep package="libgcrypt"/>
<dep package="gnutls"/>
@@ -69,8 +67,8 @@
</autotools>
<autotools id="aqbanking" autogen-sh="configure">
- <branch module="aqbanking-5.0.25.tar.gz" version="5.0.25"
- repo="github_gnucash"/>
+ <branch module="gnucash/Dependencies/aqbanking-5.0.25.tar.gz" version="5.0.25"
+ repo="sourceforge"/>
<dependencies>
<dep package="gwenhywfar"/>
<dep package="gmp"/>
commit 4cfda8534ec4911f29345bb2472e16a9e7cf2516
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 31 10:31:09 2013 -0700
Comment out NSHighResolutionCapable key
It chokes Python's libplist on older versions of OSX which don't support
the key.
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index e11d96e..1be224a 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -62,8 +62,8 @@
<key>LSMinimumSystemVersion</key>
<string>10.5.0</string>
<key>NSHumanReadableCopyright</key>
- <key>NSHighResolutionCapable</key>
- <true/>
+ <!--key>NSHighResolutionCapable</key>
+ <true/-->
<string>Copyright 2013 Gnucash Contributors</string>
</dict>
</plist>
commit 5e5a1afe49f54d9395f417a4cdb756ab7f9157e3
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 30 11:00:38 2013 -0700
Fix merge errors from last two commits
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 16bb1c4..2f9f456 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -35,7 +35,7 @@
<!--include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
<include href="gtkhtml.modules"/>
- <autotools id="libchipcard" autogen-sh="configure" >
+ <autotools id="libchipcard" autogen-sh="configure" >
<branch module="libchipcard-5.0.2.tar.gz" version="5.0.2"
repo="github_gnucash" />
<dependencies>
@@ -64,11 +64,7 @@
</autotools>
<autotools id="ktoblzcheck" autogen-sh="configure">
-<<<<<<< HEAD
- <branch module="ktoblzcheck/ktoblzcheck-1.40.tar.gz" version="1.40"
-=======
<branch module="ktoblzcheck/ktoblzcheck-1.41.tar.gz" version="1.41"
->>>>>>> Update for Gnucash-2.4.12
repo="sourceforge"/>
</autotools>
@@ -115,16 +111,10 @@
</dependencies>
</autotools>
-<<<<<<< HEAD
<autotools id="pcre" autogenargs="--enable-unicode-properties"
autogen-sh="configure">
- <branch repo="sourceforge" module="pcre/pcre-8.31.tar.bz2"
- version="8.31"/>
-=======
- <autotools id="pcre">
<branch repo="sourceforge" module="pcre/pcre-8.32.tar.bz2"
version="8.32"/>
->>>>>>> Update for Gnucash-2.4.12
</autotools>
<autotools id="swig" autogen-sh="configure">
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index 1f3ad42..a4757ba 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -48,7 +48,7 @@
repo="xmlsoft"/>
</distutils>
- <autotools id="gtkhtml" autogenargs='--disable-deprecated-warning-flags">
+ <autotools id="gtkhtml" autogenargs="--disable-deprecated-warning-flags">
<!--
In order to compile GtkHTML, you need libgnome[ui] 1.112.1 (or later),
Bonobo 1.112.1 (or later), gnome-print 2.2.0 (or later) and GAL 2.1.0 (or
commit c0fb8c7045042a757989bdc9851bd9f6b8f1cfc5
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 30 10:47:28 2013 -0700
Update for Gnucash-2.4.12
Also bump AQBanking-related libraries to latest stable releases.
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 9c6b9a5..e11d96e 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.4.11 © 2012 Gnucash Contributors</string>
+ <string>Gnucash version 2.4.12 © 2013 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4.11 © 2012 Gnucash Contributers</string>
+ <string>2.4.12 © 2013 Gnucash Contributers</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4.11</string>
+ <string>2.4.12</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.4.11</string>
+ <string>2.4.12</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
@@ -62,8 +62,8 @@
<key>LSMinimumSystemVersion</key>
<string>10.5.0</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2012 Gnucash Contributors</string>
<key>NSHighResolutionCapable</key>
<true/>
+ <string>Copyright 2013 Gnucash Contributors</string>
</dict>
</plist>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 490cc1c..16bb1c4 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -31,8 +31,8 @@
<repository type="git" name="github"
href="git://github.com/"/>
- <!--include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/-->
- <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
+ <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
+ <!--include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
<include href="gtkhtml.modules"/>
<autotools id="libchipcard" autogen-sh="configure" >
@@ -64,7 +64,11 @@
</autotools>
<autotools id="ktoblzcheck" autogen-sh="configure">
+<<<<<<< HEAD
<branch module="ktoblzcheck/ktoblzcheck-1.40.tar.gz" version="1.40"
+=======
+ <branch module="ktoblzcheck/ktoblzcheck-1.41.tar.gz" version="1.41"
+>>>>>>> Update for Gnucash-2.4.12
repo="sourceforge"/>
</autotools>
@@ -111,10 +115,16 @@
</dependencies>
</autotools>
+<<<<<<< HEAD
<autotools id="pcre" autogenargs="--enable-unicode-properties"
autogen-sh="configure">
<branch repo="sourceforge" module="pcre/pcre-8.31.tar.bz2"
version="8.31"/>
+=======
+ <autotools id="pcre">
+ <branch repo="sourceforge" module="pcre/pcre-8.32.tar.bz2"
+ version="8.32"/>
+>>>>>>> Update for Gnucash-2.4.12
</autotools>
<autotools id="swig" autogen-sh="configure">
@@ -185,7 +195,7 @@
autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
<!--branch module="gnucash" revision="20812" repo="svn.gnucash.org"-->
- <branch module="gnucash/stable/gnucash-2.4.11.tar.bz2" version="2.4.11"
+ <branch module="gnucash/stable/gnucash-2.4.12.tar.bz2" version="2.4.12"
repo="sourceforge">
</branch>
<dependencies>
@@ -246,7 +256,7 @@
<autotools id="gnucash-unstable"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash" repo="svn.gnucash.org"/>
+ <branch module="gnucash/branches/2.4" repo="svn.gnucash.org"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit 01d9c4e96e41a47488b4894f82f0a4d1665f9fd7
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 30 10:44:42 2013 -0700
Update GtkHtml to the last version that works with Gtk2
Needed to build with the latest versions of Gtk+-2.24 and GLib.
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index 36563f9..1f3ad42 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -48,7 +48,7 @@
repo="xmlsoft"/>
</distutils>
- <autotools id="gtkhtml" >
+ <autotools id="gtkhtml" autogenargs='--disable-deprecated-warning-flags">
<!--
In order to compile GtkHTML, you need libgnome[ui] 1.112.1 (or later),
Bonobo 1.112.1 (or later), gnome-print 2.2.0 (or later) and GAL 2.1.0 (or
@@ -56,8 +56,9 @@ later).
Optionally you may want to install GConf 1.0.7 (or later).
-->
- <branch module="gtkhtml/3.28/gtkhtml-3.28.0.tar.bz2" version="3.28.0"
- hash="sha2556:6290424e51770fc09701ebaf89b7089214bbb9c81223430800160beee6f42288"/>
+<!-- The last version which works with Gtk2 -->
+ <branch module="gtkhtml/3.32/gtkhtml-3.32.2.tar.bz2" version="3.32.2"
+ hash="sha2556:8746053cf709e1de37c7ac775ab1364ddda4b75167660ed7f98a237b3797e39f"/>
<dependencies>
<dep package="gtk+"/>
<dep package="iso-codes"/>
commit cb15dbdba88a9f3a684a6e8920ece365ddd1ed31
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Mar 19 13:28:50 2013 -0700
Always configure SLib
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 1fec9b2..490cc1c 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -128,7 +128,7 @@
</autotools>
<autotools id="Slib" autogen-sh="install.sh" makeargs="-f Makefile.gnucash"
- skip-install="yes">
+ skip-install="yes" skip-configure="never">
<!-- <branch repo="slib.savannah.gnu.org"
module="slib"/> -->
<branch repo="csail" module="scm/slib-3b3.zip" version="3b3"
commit d1207b7bdf489a43482a684f5f4cde2c6bde7164
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 2 18:28:13 2013 -0800
Replace gconf with gconf2
A recent change to gtk-osx updated gconf to GConf-3.2 and introduced gconf2 for backward compatibility. Gnucash needs that backward compatibility.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index d6d8edc..1fec9b2 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -176,7 +176,6 @@
<dependencies>
<dep package="gtk+"/>
<dep package="libgsf"/>
- <dep package="gconf"/>
<dep package="pcre"/>
</dependencies>
</autotools>
@@ -198,7 +197,8 @@
<dep package="Slib"/>
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
- <dep package="iso-codes"/>
+ <dep package="iso-codes"/>
+ <dep package="gconf2"/>
</dependencies>
</autotools>
@@ -218,6 +218,7 @@
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
<dep package="swig"/>
+ <dep package="gconf2"/>
</dependencies>
</autotools>
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index 4292097..36563f9 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -62,7 +62,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
<dep package="gtk+"/>
<dep package="iso-codes"/>
<dep package="enchant"/>
- <dep package="gconf"/>
+ <dep package="gconf2"/>
<dep package="libsoup"/>
<!-- dep package="gnome-icon-theme" -->
</dependencies>
@@ -113,11 +113,12 @@ Optionally you may want to install GConf 1.0.7 (or later).
<branch module="popt/popt-1.14.tar.gz" version="1.14" repo="rpm5.org"/>
</autotools>
+<!-- Encountered a problem with linking libgnomevfs: For some reason it didn't include libresolv in the link list. Added it manually to Makefile and it worked, need a better solution. -->
<autotools id="gnome-vfs" autogen-sh="configure">
<branch module="gnome-vfs/2.24/gnome-vfs-2.24.2.tar.bz2" version="2.24.2"
hash="sha256:50ecf5f37d377492e8943a3c359ffe64176d4e7f045e9980790eca999a1c6856"/>
<dependencies>
- <dep package="gconf"/>
+ <dep package="gconf2"/>
<dep package="shared-mime-info"/>
<dep package="gnome-mime-data"/>
<dep package="dbus-glib"/>
@@ -169,7 +170,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
<dependencies>
<dep package="libbonobo"/>
<dep package="gnome-vfs"/>
- <dep package="gconf"/>
+ <dep package="gconf2"/>
<!-- <dep package="esound"/> -->
</dependencies>
</autotools>
commit afa029aab5933552bc7cb597898b0f89a3bbd8c2
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 2 18:25:49 2013 -0800
Update the documentation paths to reflect the new locations.
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 632f3f8..454efa8 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -223,31 +223,31 @@
</data>
<data dest="${bundle}/Contents/Resources/en.lproj/GnuCash Help/">
- ${prefix}/share/gnome/help/gnucash/C/gnucash-help
+ ${prefix}/share/doc/gnucash-docs/C/gnucash-help/
</data>
<data dest="${bundle}/Contents/Resources/en.lproj/GnuCash Guide/">
- ${prefix}/share/gnome/help/gnucash/C/gnucash-guide/
+ ${prefix}/share/doc/gnucash-docs/C/gnucash-guide/
</data>
<data dest="${bundle}/Contents/Resources/de.lproj/GnuCash Help/">
- ${prefix}/share/gnome/help/gnucash/de_DE/gnucash-help
+ ${prefix}/share/doc/gnucash-docs/de_DE/gnucash-help/
</data>
<data dest="${bundle}/Contents/Resources/de.lproj/GnuCash Guide/">
- ${prefix}/share/gnome/help/gnucash/de_DE/gnucash-guide/
+ ${prefix}/share/doc/gnucash-docs/de_DE/gnucash-guide/
</data>
<data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Help/">
- ${prefix}/share/gnome/help/gnucash/it_IT/gnucash-help
+ ${prefix}/share/doc/gnucash-docs/it_IT/gnucash-help/
</data>
<data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Guide/">
- ${prefix}/share/gnome/help/gnucash/it_IT/gnucash-guide/
+ ${prefix}/share/doc/gnucash-docs/it_IT/gnucash-guide/
</data>
<data dest="${bundle}/Contents/Resources/ja.lproj/GnuCash Guide/">
- ${prefix}/share/gnome/help/gnucash/ja_JP/gnucash-guide/
+ ${prefix}/share/doc/gnucash-docs/ja_JP/gnucash-guide/
</data>
<translations name="gnucash">
commit 5e823951c014e4cffb4d6a423e0aa98fd4fddcd3
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Feb 16 10:46:09 2013 -0800
Update bundle for new Pango requirements
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index e2f1b16..632f3f8 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -66,7 +66,7 @@
</binary>
<binary>
- ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-fc.so
+ ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
</binary>
<binary>
diff --git a/gnucash-bundler/gnucash.launcher b/gnucash-bundler/gnucash.launcher
index 70d9d0a..d7bb732 100755
--- a/gnucash-bundler/gnucash.launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -37,6 +37,8 @@ export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
+export PANGO_SYSCONFDIR="$bundle_etc"
+export PANGO_LIBDIR="$bundle_lib"
if test -f "$bundle_lib/charset.alias"; then
export CHARSETALIASDIR="$bundle_lib"
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index e619292..d6d8edc 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -204,7 +204,7 @@
</autotools>
<autotools id="gnucash-svn"
- autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ autogen-template="GNOME2_PATH=%(prefix)s %(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
<branch repo="svn.gnucash.org" module="gnucash"/>
<dependencies>
commit 8b3d83d844d1aab77da0793f7457f996ad02e9fe
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jan 29 14:45:40 2013 -0800
[Bug 692831] Bad rendering on Retina displays
Simple fix, probably not perfect.
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 3830dd3..348668d 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -32,5 +32,7 @@
<true/>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2010 Contributors</string>
+ <key>NSHighResolutionCapable</key>
+ <true/>
</dict>
</plist>
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index cd1a5a7..9c6b9a5 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -63,5 +63,7 @@
<string>10.5.0</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2012 Gnucash Contributors</string>
+ <key>NSHighResolutionCapable</key>
+ <true/>
</dict>
</plist>
commit 8774adc998f9a36f9d12f6760a36964f0492b315
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 4 13:40:01 2012 -0800
Update modules to current stable.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 0ec6180..e619292 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -26,15 +26,13 @@
href="http://svn.gnucash.org/repo/"/>
<repository type="tarball" name="github_gnucash"
href="https://github.com/downloads/jralls/gnucash-on-osx/"/>
- <repository type="tarball" name="cmake"
- href="http://www.cmake.org/files/"/>
<repository type="svn" name="aquamaniac"
href="http://devel.aqbanking.de/svn/"/>
<repository type="git" name="github"
href="git://github.com/"/>
- <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
-<!-- <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/> -->
+ <!--include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/-->
+ <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
<include href="gtkhtml.modules"/>
<autotools id="libchipcard" autogen-sh="configure" >
@@ -48,7 +46,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--disable-qt4 --with-guis=gtk2">
- <branch module="gwenhywfar-4.1.0.tar.gz" version="4.1.0"
+ <branch module="gwenhywfar-4.3.3.tar.gz" version="4.3.3"
repo="github_gnucash" />
<dependencies>
<dep package="libgcrypt"/>
@@ -66,12 +64,12 @@
</autotools>
<autotools id="ktoblzcheck" autogen-sh="configure">
- <branch module="ktoblzcheck/ktoblzcheck-1.24.tar.gz" version="1.24"
+ <branch module="ktoblzcheck/ktoblzcheck-1.40.tar.gz" version="1.40"
repo="sourceforge"/>
</autotools>
<autotools id="aqbanking" autogen-sh="configure">
- <branch module="aqbanking-5.0.10.tar.gz" version="5.0.10"
+ <branch module="aqbanking-5.0.25.tar.gz" version="5.0.25"
repo="github_gnucash"/>
<dependencies>
<dep package="gwenhywfar"/>
@@ -106,20 +104,21 @@
</autotools>
<autotools id="libofx" autogen-sh='configure'>
- <branch repo="sourceforge" module="libofx/libofx-0.9.4.tar.gz"
- version='0.9.4'/>
+ <branch repo="sourceforge" module="libofx/libofx-0.9.5.tar.gz"
+ version="0.9.5"/>
<dependencies>
<dep package="OpenSP"/>
</dependencies>
</autotools>
- <autotools id="pcre">
- <branch repo="sourceforge" module="pcre/pcre-8.12.tar.bz2"
- version="8.12"/>
+ <autotools id="pcre" autogenargs="--enable-unicode-properties"
+ autogen-sh="configure">
+ <branch repo="sourceforge" module="pcre/pcre-8.31.tar.bz2"
+ version="8.31"/>
</autotools>
- <autotools id="swig">
- <branch repo="sourceforge" module="swig/swig-2.0.4.tar.gz" version="2.0.4">
+ <autotools id="swig" autogen-sh="configure">
+ <branch repo="sourceforge" module="swig/swig-2.0.8.tar.gz" version="2.0.8">
<patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/0001-Updated-swig-guile-deprecated-patch.patch"
strip="1"/>
</branch>
@@ -129,10 +128,10 @@
</autotools>
<autotools id="Slib" autogen-sh="install.sh" makeargs="-f Makefile.gnucash"
- makeinstallargs="-f Makefile.gnucash">
+ skip-install="yes">
<!-- <branch repo="slib.savannah.gnu.org"
module="slib"/> -->
- <branch repo="csail" module="scm/slib-3b3.zip" version="3b1"
+ <branch repo="csail" module="scm/slib-3b3.zip" version="3b3"
checkoutdir="slib">
<patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/slib-install.patch"/>
</branch>
@@ -141,12 +140,6 @@
</dependencies>
</autotools>
- <autotools id="cmake"
- autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --libdir=%(libdir)s %(autogenargs)s">
- <branch module="v2.8/cmake-2.8.1.tar.gz"
- repo="cmake" version="2.8.1"/>
- </autotools>
-
<cmake id="mysql">
<branch repo="csclub" module="Connector-C/mysql-connector-c-6.0.2.tar.gz"
version="6.0.2" >
@@ -176,18 +169,21 @@
</dependencies>
</autotools>
- <autotools id="goffice" autogenargs="--without-gconf">
- <branch module="goffice/0.8/goffice-0.8.12.tar.bz2" version="0.8.12"
- hash="sha256:c165f8b7aaab709295c8225b30f49fe75655149b982fd045d8c23bb7772eb22a"/>
+<!-- Goffice-0.9 is for Gtk3 -->
+ <autotools id="goffice" autogenargs="--without-gconf" autogen-sh="configure">
+ <branch module="goffice/0.8/goffice-0.8.17.tar.xz" version="0.8.17"
+ hash="sha256:165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15"/>
<dependencies>
<dep package="gtk+"/>
<dep package="libgsf"/>
<dep package="gconf"/>
+ <dep package="pcre"/>
</dependencies>
</autotools>
<autotools id="gnucash"
+ autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
<!--branch module="gnucash" revision="20812" repo="svn.gnucash.org"-->
<branch module="gnucash/stable/gnucash-2.4.11.tar.bz2" version="2.4.11"
@@ -281,7 +277,7 @@
/>
</autotools>
- <autotools id="scrollkeeper">
+ <autotools id="scrollkeeper" autogen-sh="configure">
<branch repo="sourceforge" module="scrollkeeper/scrollkeeper-0.3.14.tar.gz"
version="0.3.14"/>
<dependencies>
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index 0ee4c31..4292097 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -38,7 +38,7 @@
<!-- <dep package="audiofile"/> -->
<dep package="dbus"/>
<dep package="dbus-glib"/>
- <dep package="gnome-keyring"/>
+ <dep package="libgnome-keyring"/>
<dep package="libtasn1"/>
</dependencies>
</metamodule>
@@ -109,34 +109,11 @@ Optionally you may want to install GConf 1.0.7 (or later).
</autotools>
- <!-- Audiofile hasn't been actively developed since 2004 and doesn't
- really seem necessary. -->
-<!--
- <autotools id='audiofile' autogen-sh="configure">
- <branch module='audiofile/audiofile-0.2.6.tar.gz'
- repo='michael.68k.org' version='0.2.6'
- size="374688" md5sum="9c1049876cd51c0f1b12c2886cce4d42"/>
- </autotools>
-
- <autotools id="esound">
- <branch/>
- <dependencies>
- <dep package="audiofile"/>
- </dependencies>
- </autotools>
--->
<autotools id="popt" autogen-sh='configure'>
<branch module="popt/popt-1.14.tar.gz" version="1.14" repo="rpm5.org"/>
</autotools>
- <!--gnome-vfs in gnome-suites-2.24.modules includes the following
- <dep package="desktop-file-utils"/>
- <dep package="avahi"/>
- <dep package="hal"/>
- <dep package="gamin"/>
- but building them on OS-X proved problematic and gnome-vfs builds well
- without them -->
- <autotools id="gnome-vfs">
+ <autotools id="gnome-vfs" autogen-sh="configure">
<branch module="gnome-vfs/2.24/gnome-vfs-2.24.2.tar.bz2" version="2.24.2"
hash="sha256:50ecf5f37d377492e8943a3c359ffe64176d4e7f045e9980790eca999a1c6856"/>
<dependencies>
@@ -147,33 +124,22 @@ Optionally you may want to install GConf 1.0.7 (or later).
</dependencies>
</autotools>
-<!-- libgnomeui requires the old gnome-keyring library, deleted after
- the release of gnome-keyring 2.28-->
- <autotools id="gnome-keyring-28">
- <branch module="gnome-keyring/2.28/gnome-keyring-2.28.2.tar.bz2"
- version="2.28.2" hash="sha256:d2d686fb2528ee045bbcd9f18d0d452e0eb88c2265a1947f639152b61a5987f6"/>
- <dependencies>
- <dep package="gtk+"/>
- <dep package="libgcrypt"/>
- <dep package="libtasn1"/>
- </dependencies>
- </autotools>
- <autotools id="libgnomeui" >
+ <autotools id="libgnomeui" autogen-sh="configure">
<branch module="libgnomeui/2.24/libgnomeui-2.24.2.tar.bz2" version="2.24.2"
repo="ftp.gnome.org" hash="sha256:ae7459b3ddee78258bb2d619fd199b0b24647f1df45fc397fee83d659c354910">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/libgnomeui.patch" skip="0"/>
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/libgnomeui.patch" skip="0"/>
</branch>
<dependencies>
<dep package="libbonoboui"/>
<dep package="libglade"/>
<dep package="gnome-icon-theme"/>
- <dep package="gnome-keyring-28"/>
+ <dep package="libgnome-keyring"/>
</dependencies>
</autotools>
- <autotools id="libbonobo">
+ <autotools id="libbonobo" autogen-sh="configure">
<!-- DEPENDS says "ORBit" -->
<branch module="libbonobo/2.24/libbonobo-2.24.2.tar.bz2" version="2.24.2"
hash="sha256:95c0230a31a657e1873fc601318bbaa16722986699219317053f1cd1aa2a28bf"/>
@@ -186,8 +152,8 @@ Optionally you may want to install GConf 1.0.7 (or later).
</dependencies>
</autotools>
- <autotools id="libbonoboui" autogenargs="--without-x">
- <branch module="libbonoboui/2.24/libbonoboui-2.24.2.tar.bz2"
+ <autotools id="libbonoboui" autogenargs="--without-x" autogen-sh="configure">
+ <branch module="libbonoboui/2.24/libbonoboui-2.24.2.tar.bz2"
version="2.24.2" hash="sha256:aebcf9dc56a76f4ab1ae2134920d962e12c6f7397028052658dad5b1bebdbe00"/>
<dependencies>
<dep package="libgnome"/>
@@ -197,7 +163,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
</dependencies>
</autotools>
- <autotools id="libgnome" autogenargs="--disable-esd" >
+ <autotools id="libgnome" autogenargs="--disable-esd" autogen-sh="configure">
<branch module="libgnome/2.26/libgnome-2.26.0.tar.bz2" version="2.26.0"
md5sum="a5634fe9ddc54bbb726cbaaa35abc0b9"/>
<dependencies>
@@ -208,7 +174,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
</dependencies>
</autotools>
- <autotools id="libgnomecanvas">
+ <autotools id="libgnomecanvas" autogen-sh="configure">
<branch module="libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2"
version="2.26.0" md5sum="9bbc635e5ae70e63af071af74ba7e72f"/>
<dependencies>
commit fbf0df71cf0f08706e8ec9b55b570fb018c7744b
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Sep 20 15:44:43 2012 -0700
Remove dependencies on LibGnome etc. (except libgnomecanvas) for trunk (Yay Geert!)
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 471104a..0ec6180 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -215,7 +215,7 @@
<dep package="meta-gtk-osx-core"/>
<dep package="libofx"/>
<dep package="aqbanking"/>
- <dep package="libgnomeui"/>
+ <dep package="libgnomecanvas"/>
<dep package="meta-gtk-osx-webkit"/>
<dep package="Slib"/>
<dep package="goffice"/>
@@ -235,7 +235,7 @@
<dep package="meta-gtk-osx-core"/>
<dep package="libofx"/>
<dep package="aqbanking"/>
- <dep package="libgnomeui"/>
+ <dep package="libgnomecanvas"/>
<dep package="meta-gtk-osx-webkit"/>
<dep package="Slib"/>
<dep package="goffice"/>
commit 81fc9a3f97cba8a2fa8518d7eedf6412b7c3ac16
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Sep 20 15:41:50 2012 -0700
Update my local moduleset location.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index ef2aaea..471104a 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -34,7 +34,7 @@
href="git://github.com/"/>
<include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
-<!-- <include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/> -->
+<!-- <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/> -->
<include href="gtkhtml.modules"/>
<autotools id="libchipcard" autogen-sh="configure" >
commit c3bacd7f5bf8e018464fbe0d3956d79384fce625
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jul 14 15:37:45 2012 -0700
Release Gnucash 2.4.11
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 6aea97f..cd1a5a7 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.4.10 © 2012 Gnucash Contributors</string>
+ <string>Gnucash version 2.4.11 © 2012 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4.10 © 2012 Gnucash Contributers</string>
+ <string>2.4.11 © 2012 Gnucash Contributers</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4.10</string>
+ <string>2.4.11</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.4.10</string>
+ <string>2.4.11</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 612eec8..ef2aaea 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -169,7 +169,7 @@
autogenargs='--with-sqlite3 --disable-docs --with-sqlite3-incdir="/usr/include" --with-sqlite3-libdir="/usr/lib" '>
<branch repo="sourceforge" version="0.8.3-1"
module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz">
- <patch file="https://github.com/jralls/gnucash-on-osx/master/patches/dbi-drv.patch" strip="1"/>
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/dbi-drv.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libdbi"/>
@@ -190,7 +190,7 @@
<autotools id="gnucash"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
<!--branch module="gnucash" revision="20812" repo="svn.gnucash.org"-->
- <branch module="gnucash/stable/gnucash-2.4.10.tar.bz2" version="2.4.10"
+ <branch module="gnucash/stable/gnucash-2.4.11.tar.bz2" version="2.4.11"
repo="sourceforge">
</branch>
<dependencies>
commit 98ff589c3e49d4acb81d5f857c702538cfd1495e
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jul 14 15:37:29 2012 -0700
Fix up github URL -- a couple of years late!
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index be7013a..0ee4c31 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -83,7 +83,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
repo="ftp.gnome.org" version="2.18.6"
md5sum="10a9e58aabecf541bc6852f64b3a9294">
<!-- Note: A fix was committed to SVN 9APR2009, so this patch should be removed when this module is upgraded to the next release. -->
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/libgnomeprint.patch" skip="0"/>
+ <patch file="http://raw.github.com/jralls/gnucash-on-osx/raw/master/patches/libgnomeprint.patch" skip="0"/>
</branch>
<dependencies>
<dep package="bison"/>
@@ -162,7 +162,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
<autotools id="libgnomeui" >
<branch module="libgnomeui/2.24/libgnomeui-2.24.2.tar.bz2" version="2.24.2"
repo="ftp.gnome.org" hash="sha256:ae7459b3ddee78258bb2d619fd199b0b24647f1df45fc397fee83d659c354910">
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/libgnomeui.patch" skip="0"/>
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/libgnomeui.patch" skip="0"/>
</branch>
<dependencies>
<dep package="libbonoboui"/>
commit 7eb0f75d356748d4a623491939bda8a66f9f4214
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jan 27 16:24:26 2012 -0800
Move dbi patches over from gtk-osx-build
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index db01ee9..612eec8 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -150,7 +150,7 @@
<cmake id="mysql">
<branch repo="csclub" module="Connector-C/mysql-connector-c-6.0.2.tar.gz"
version="6.0.2" >
- <patch file="http://raw.github.com/jralls/gnucash-on-osx/master/patches/libmysql.patch"/>
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/libmysql.patch"/>
</branch>
<dependencies>
<dep package="cmake"/>
@@ -161,7 +161,7 @@
autogenargs="--disable-docs">
<branch repo="sourceforge" module="libdbi/libdbi-0.8.3.tar.gz"
version="0.8.4">
- <patch file="http://github.com/jralls/gtk-osx-build/raw/master/patches/dbi.patch" strip="1"/>
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/dbi.patch" strip="1"/>
</branch>
</autotools>
@@ -169,7 +169,7 @@
autogenargs='--with-sqlite3 --disable-docs --with-sqlite3-incdir="/usr/include" --with-sqlite3-libdir="/usr/lib" '>
<branch repo="sourceforge" version="0.8.3-1"
module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz">
- <patch file="http://github.com/jralls/gtk-osx-build/raw/master/patches/dbi-drv.patch" strip="1"/>
+ <patch file="https://github.com/jralls/gnucash-on-osx/master/patches/dbi-drv.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libdbi"/>
diff --git a/patches/dbi-drv.patch b/patches/dbi-drv.patch
new file mode 100644
index 0000000..31ef4e5
--- /dev/null
+++ b/patches/dbi-drv.patch
@@ -0,0 +1,16 @@
+diff -c /usr/local/src/gnucash/libdbi-drivers-0.8.3-1/configure.in\~ /usr/local/src/gnucash/libdbi-drivers-0.8.3-1/configure.in
+*** a/configure.in Mon Mar 3 09:41:41 2008
+--- b/configure.in Tue Dec 8 17:05:50 2009
+***************
+*** 63,68 ****
+--- 63,70 ----
+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8"
+ CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
+ PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
++ *-*-darwin*)
++ ;;
+ *)
+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+ CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
+
+Diff finished. Tue Dec 8 17:06:44 2009
diff --git a/patches/dbi.patch b/patches/dbi.patch
new file mode 100644
index 0000000..f5e2f40
--- /dev/null
+++ b/patches/dbi.patch
@@ -0,0 +1,16 @@
+diff -c /usr/local/src/gnucash/libdbi-0.8.3/configure.in\~ /usr/local/src/gnucash/libdbi-0.8.3/configure.in
+*** a/configure.in Wed Feb 6 08:03:27 2008
+--- b/configure.in Tue Dec 8 17:09:30 2009
+***************
+*** 61,66 ****
+--- 61,68 ----
+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
+ CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
+ PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99" ;;
++ *-*-darwin*)
++ ;;
+ *)
+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
+ CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
+
+Diff finished. Tue Dec 8 17:09:36 2009
commit 90187e53089877cd9f287487a391b968a2a7f7db
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jan 27 16:20:52 2012 -0800
Remove aqbanking-qt. We're not going to use that anymore!
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 1e6f0ff..db01ee9 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -80,20 +80,6 @@
</dependencies>
</autotools>
- <autotools id="aqbanking-qt" autogen-sh="configure"
- autogenargs="--enable-ofx=yes --disable-kde --disable-chipcard-client --disable-python --with-frontends='cbanking g2banking q4banking' qt4_libs='-framework QtCore -framework QtGui -framework Qt3Support' qt4_includes='-framework QtCore -framework QtGui -framework Qt3Support'">
- <branch module="aqbanking-4.2.4.tar.gz" version="4.2.4"
- repo="github_gnucash" >
- <patch file="http://raw.github.com/jralls/gnucash-on-osx/master/patches/aqbankingOSX.patch" strip="0"/>
- </branch>
- <dependencies>
- <dep package="libofx"/>
- <dep package="gwenhywfar"/>
- <dep package="gmp"/>
- <dep package="ktoblzcheck"/>
- </dependencies>
- </autotools>
-
<autotools id="aqbanking-svn"
autogenargs='--enable-ofx=yes --disable-kde --disable-chipcard-client --disable-python --with-frontends="cbanking g2banking"'
autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" >
diff --git a/patches/aqbankingOSX.patch b/patches/aqbankingOSX.patch
deleted file mode 100644
index 277286b..0000000
--- a/patches/aqbankingOSX.patch
+++ /dev/null
@@ -1,1639 +0,0 @@
-Index: src/frontends/q4banking/lib/qbanking.h
-===================================================================
---- src/frontends/q4banking/lib/qbanking.h (revision 1972)
-+++ src/frontends/q4banking/lib/qbanking.h (working copy)
-@@ -35,12 +35,12 @@
- #include <aqbanking/banking.h>
- #include <aqbanking/accstatus.h>
-
--#include <Qt/qobject.h>
--#include <Qt/qdatetime.h>
--#include <Qt/qstring.h>
--#include <Qt/qstringlist.h>
--#include <Qt/qwidget.h> // needed for QPointer<QWidget>
--#include <Qt/qpointer.h>
-+#include <QtCore/qobject.h>
-+#include <QtCore/qdatetime.h>
-+#include <QtCore/qstring.h>
-+#include <QtCore/qstringlist.h>
-+#include <QtGui/qwidget.h> // needed for QPointer<QWidget>
-+#include <QtCore/qpointer.h>
-
- #include <list>
-
-Index: src/frontends/q4banking/lib/dialogs/qbimporter.h
-===================================================================
---- src/frontends/q4banking/lib/dialogs/qbimporter.h (revision 1972)
-+++ src/frontends/q4banking/lib/dialogs/qbimporter.h (working copy)
-@@ -24,7 +24,7 @@
- #include <list>
- #include <string>
-
--#include <Qt/qstring.h>
-+#include <QtCore/qstring.h>
-
- #include <gwenhywfar/logger.h>
-
-Index: src/frontends/q4banking/lib/widgets/qbplugindescrlist.cpp
-===================================================================
---- src/frontends/q4banking/lib/widgets/qbplugindescrlist.cpp (revision 1972)
-+++ src/frontends/q4banking/lib/widgets/qbplugindescrlist.cpp (working copy)
-@@ -17,7 +17,7 @@
-
- #include "qbplugindescrlist.h"
- #include <assert.h>
--#include <Qt/qstring.h>
-+#include <QtCore/qstring.h>
-
-
-
-Index: src/frontends/q4banking/lib/widgets/qbaccountlist.cpp
-===================================================================
---- src/frontends/q4banking/lib/widgets/qbaccountlist.cpp (revision 1972)
-+++ src/frontends/q4banking/lib/widgets/qbaccountlist.cpp (working copy)
-@@ -17,7 +17,7 @@
-
- #include "qbaccountlist.h"
- #include <assert.h>
--#include <Qt/qstring.h>
-+#include <QtCore/qstring.h>
-
-
-
-Index: src/frontends/q4banking/lib/widgets/qbcfgtabpage.h
-===================================================================
---- src/frontends/q4banking/lib/widgets/qbcfgtabpage.h (revision 1972)
-+++ src/frontends/q4banking/lib/widgets/qbcfgtabpage.h (working copy)
-@@ -18,8 +18,8 @@
- #include <aqbanking/banking.h>
- #include <q4banking/qbanking.h>
-
--#include <Qt/qwidget.h>
--#include <Qt/qstring.h>
-+#include <QtGui/qwidget.h>
-+#include <QtCore/qstring.h>
- //Added by qt3to4:
- #include <Q3VBoxLayout>
-
-Index: src/frontends/q4banking/lib/widgets/qbjoblist.cpp
-===================================================================
---- src/frontends/q4banking/lib/widgets/qbjoblist.cpp (revision 1972)
-+++ src/frontends/q4banking/lib/widgets/qbjoblist.cpp (working copy)
-@@ -17,8 +17,8 @@
-
- #include "qbjoblist.h"
- #include <assert.h>
--#include <Qt/qstring.h>
--#include <Qt/qwidget.h>
-+#include <QtCore/qstring.h>
-+#include <QtGui/qwidget.h>
- #include <gwenhywfar/debug.h>
-
-
-Index: src/frontends/q4banking/lib/qbflagstaff.h
-===================================================================
---- src/frontends/q4banking/lib/qbflagstaff.h (revision 1972)
-+++ src/frontends/q4banking/lib/qbflagstaff.h (working copy)
-@@ -16,7 +16,7 @@
- class QBFlagStaff;
-
- #include <q4banking/qbanking.h>
--#include <Qt/qobject.h>
-+#include <QtCore/qobject.h>
-
-
- class Q4BANKING_API QBFlagStaff: public QObject {
-Index: src/plugins/backends/aqofxconnect/ui/qt4/libs/cfgtabpageuserofx.cpp
---- src/plugins/backends/aqofxconnect/ui/qt4/libs/cfgtabpageuserofx.cpp 2010-01-15
-+++ src/plugins/backends/aqofxconnect/ui/qt4/libs/cfgtabpageuserofx.cpp 2010-08-03
-@@ -27,13 +27,13 @@
- #include <gwenhywfar/debug.h>
- #include <gwenhywfar/url.h>
-
--#include <qmessagebox.h>
--#include <qtimer.h>
--#include <qcheckbox.h>
--#include <qspinbox.h>
--#include <qpushbutton.h>
--#include <qlineedit.h>
--#include <qcombobox.h>
-+#include <QtGui/qmessagebox.h>
-+#include <QtCore/qtimer.h>
-+#include <QtGui/qcheckbox.h>
-+#include <QtGui/qspinbox.h>
-+#include <QtGui/qpushbutton.h>
-+#include <QtGui/qlineedit.h>
-+#include <QtGui/qcombobox.h>
-
-
-
-Index: src/plugins/backends/aqofxconnect/ui/qt4/libs/cfgtabpageaccountofx.cpp
---- src/plugins/backends/aqofxconnect/ui/qt4/libs/cfgtabpageaccountofx.cpp 2010-01-15
-+++ src/plugins/backends/aqofxconnect/ui/qt4/libs/cfgtabpageaccountofx.cpp 2010-08-03
-@@ -22,11 +22,11 @@
-
- #include <q4banking/qbanking.h>
-
--#include <qmessagebox.h>
--#include <qtimer.h>
--#include <qcheckbox.h>
--#include <qspinbox.h>
--#include <q3filedialog.h>
-+#include <QtGui/qmessagebox.h>
-+#include <QtCore/qtimer.h>
-+#include <QtGui/qcheckbox.h>
-+#include <QtGui/qspinbox.h>
-+#include <Qt3Support/q3filedialog.h>
-
-
-
-Index: src/plugins/backends/aqhbci/ui/qt4/qt4_debug/qt4_debug.cpp
---- src/plugins/backends/aqhbci/ui/qt4/qt4_debug/qt4_debug.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/qt4_debug/qt4_debug.cpp 2010-08-03
-@@ -15,10 +15,10 @@
- #endif
-
-
--#include <qapplication.h>
--#include <qtranslator.h>
--#include <qtextcodec.h>
--#include <qdir.h>
-+#include <QtGui/qapplication.h>
-+#include <QtCore/qtranslator.h>
-+#include <QtCore/qtextcodec.h>
-+#include <QtCore/qdir.h>
-
- #include <gwenhywfar/logger.h>
- #include <gwenhywfar/debug.h>
-Index:src/plugins/backends/aqhbci/ui/qt4/qt4_debug/Makefile.in
---- src/plugins/backends/aqhbci/ui/qt4/qt4_debug/Makefile.in 2010-02-06
-+++ src/plugins/backends/aqhbci/ui/qt4/qt4_debug/Makefile.in 2010-08-03
-@@ -409,7 +409,7 @@
- $(aqbanking_internal_libs) \
- $(q4banking_internal_libs) \
- $(aqhbci_internal_libs) \
-- $(gwenhywfar_libs) $(qt3_libs) -lQtCore
-+ $(gwenhywfar_libs) $(qt3_libs)
-
- CLEANFILES = qt4_debug.xml
- all: all-am
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/Makefile.in
---- src/plugins/backends/aqhbci/ui/qt4/libs/Makefile.in 2010-02-06
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/Makefile.in 2010-08-03
-@@ -452,7 +452,7 @@
- $(aqhbci_internal_libs) \
- $(aqbanking_internal_libs) \
- $(q4banking_internal_libs) \
-- $(gwenhywfar_libs) $(qt4_libs) -lQt3Support
-+ $(gwenhywfar_libs) $(qt4_libs)
-
- BUILT_SOURCES = $(nodist_aqhbci_la_SOURCES)
- CLEANFILES = $(nodist_aqhbci_la_SOURCES)
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/logmanager/logmanager.h
---- src/plugins/backends/aqhbci/ui/qt4/libs/logmanager/logmanager.h 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/logmanager/logmanager.h 2010-08-03
-@@ -18,7 +18,7 @@
- #include "logmanager.ui.h"
- #include <gwenhywfar/msgengine.h>
-
--#include <QDialog>
-+#include <QtGui/QDialog>
-
- #include <string>
- #include <list>
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/logmanager/logmanager.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/logmanager/logmanager.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/logmanager/logmanager.cpp 2010-08-03
-@@ -36,13 +36,13 @@
- #include <string.h>
- #include <errno.h>
-
--#include <qmessagebox.h>
--#include <qcombobox.h>
--#include <q3listview.h>
--#include <q3textbrowser.h>
--#include <qpushbutton.h>
--#include <q3filedialog.h>
--#include <qdir.h>
-+#include <QtGui/qmessagebox.h>
-+#include <QtGui/qcombobox.h>
-+#include <Qt3Support/q3listview.h>
-+#include <Qt3Support/q3textbrowser.h>
-+#include <QtGui/qpushbutton.h>
-+#include <Qt3Support/q3filedialog.h>
-+#include <QtCore/qdir.h>
-
- #include <q4banking/qbanking.h>
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/userwizard.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/userwizard.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/userwizard.cpp 2010-08-03
-@@ -30,7 +30,7 @@
- #include <gwenhywfar/debug.h>
- #include <gwenhywfar/gui.h>
-
--#include <qmessagebox.h>
-+#include <QtGui/qmessagebox.h>
-
-
- UserWizard::UserWizard(QBanking *qb, AB_PROVIDER *pro, QWidget *parent)
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/selectmode.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/selectmode.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/selectmode.cpp 2010-08-03
-@@ -17,9 +17,9 @@
-
- #include "selectmode.h"
-
--#include <qradiobutton.h>
--#include <qtimer.h>
--#include <qlabel.h> // for qt4 setWordWrap(true)
-+#include <QtGui/qradiobutton.h>
-+#include <QtCore/qtimer.h>
-+#include <QtGui/qlabel.h> // for qt4 setWordWrap(true)
- #include <gwenhywfar/debug.h>
-
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/cfgtabpageuserhbci.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/cfgtabpageuserhbci.cpp 2010-01-18
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/cfgtabpageuserhbci.cpp 2010-08-03
-@@ -21,14 +21,14 @@
- #include <q4banking/qbanking.h>
- #include <q4banking/qbcfgtab.h>
-
--#include <qpushbutton.h>
--#include <qcombobox.h>
--#include <qlineedit.h>
--#include <qmessagebox.h>
--#include <q3listview.h>
--#include <qtimer.h>
--#include <q3groupbox.h>
--#include <qcheckbox.h>
-+#include <QtGui/qpushbutton.h>
-+#include <QtGui/qcombobox.h>
-+#include <QtGui/qlineedit.h>
-+#include <QtGui/qmessagebox.h>
-+#include <Qt3Support/q3listview.h>
-+#include <QtCore/qtimer.h>
-+#include <Qt3Support/q3groupbox.h>
-+#include <QtGui/qcheckbox.h>
-
- #include <aqhbci/user.h>
- #include <aqhbci/provider.h>
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/cfgtabpageaccounthbci.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/cfgtabpageaccounthbci.cpp 2010-01-18
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/cfgtabpageaccounthbci.cpp 2010-08-03
-@@ -22,16 +22,16 @@
-
- #include <q4banking/qbanking.h>
-
--#include <qpushbutton.h>
--#include <qcombobox.h>
--#include <qlineedit.h>
--#include <qmessagebox.h>
--#include <q3listview.h>
--#include <qtimer.h>
--#include <q3groupbox.h>
--#include <qcheckbox.h>
--#include <qspinbox.h>
--#include <q3filedialog.h>
-+#include <QtGui/qpushbutton.h>
-+#include <QtGui/qcombobox.h>
-+#include <QtGui/qlineedit.h>
-+#include <QtGui/qmessagebox.h>
-+#include <Qt3Support/q3listview.h>
-+#include <QtCore/qtimer.h>
-+#include <Qt3Support/q3groupbox.h>
-+#include <QtGui/qcheckbox.h>
-+#include <QtGui/qspinbox.h>
-+#include <Qt3Support/q3filedialog.h>
-
-
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_new2.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_new2.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_new2.cpp 2010-08-03
-@@ -21,7 +21,7 @@
-
- #include <aqhbci/user.h>
-
--#include <qtimer.h>
-+#include <QtCore/qtimer.h>
-
-
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_new.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_new.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_new.cpp 2010-08-03
-@@ -26,7 +26,7 @@
-
- #include <aqhbci/user.h>
-
--#include <qtimer.h>
-+#include <QtCore/qtimer.h>
-
-
- WizardRdhNew::WizardRdhNew(QBanking *qb,
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_import.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_import.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_import.cpp 2010-08-03
-@@ -26,7 +26,7 @@
-
- #include <aqhbci/user.h>
-
--#include <qtimer.h>
-+#include <QtCore/qtimer.h>
-
-
- WizardRdhImport::WizardRdhImport(QBanking *qb,
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_ddv_import.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_ddv_import.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_ddv_import.cpp 2010-08-03
-@@ -23,7 +23,7 @@
-
- #include <aqhbci/user.h>
-
--#include <qtimer.h>
-+#include <QtCore/qtimer.h>
-
-
- WizardDdvImport::WizardDdvImport(QBanking *qb,
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_pintan_new.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_pintan_new.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_pintan_new.cpp 2010-08-03
-@@ -23,7 +23,7 @@
-
- #include <aqhbci/user.h>
-
--#include <qtimer.h>
-+#include <QtCore/qtimer.h>
-
-
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getaccounts.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getaccounts.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getaccounts.cpp 2010-08-03
-@@ -19,8 +19,8 @@
- #include "wizard.h"
- #include "actionwidget.h"
-
--#include <qpushbutton.h>
--#include <qmessagebox.h>
-+#include <QtGui/qpushbutton.h>
-+#include <QtGui/qmessagebox.h>
-
- #include <q4banking/qbanking.h>
- #include <aqhbci/provider.h>
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_finished.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_finished.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_finished.cpp 2010-08-03
-@@ -23,7 +23,7 @@
-
- #include <assert.h>
-
--#include <qlabel.h>
-+#include <QtGui/qlabel.h>
-
-
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_wait.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_wait.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_wait.cpp 2010-08-03
-@@ -23,7 +23,7 @@
-
- #include <assert.h>
-
--#include <qlabel.h>
-+#include <QtGui/qlabel.h>
-
-
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getsysid.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getsysid.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getsysid.cpp 2010-08-03
-@@ -24,8 +24,8 @@
- #include <gwenhywfar/debug.h>
- #include <gwenhywfar/gui.h>
-
--#include <qpushbutton.h>
--#include <qmessagebox.h>
-+#include <QtGui/qpushbutton.h>
-+#include <QtGui/qmessagebox.h>
-
- #include <assert.h>
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_useriniletter.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_useriniletter.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_useriniletter.cpp 2010-08-03
-@@ -24,8 +24,8 @@
-
- #include <q4banking/qbanking.h>
-
--#include <qpushbutton.h>
--#include <q3textview.h>
-+#include <QtGui/qpushbutton.h>
-+#include <Qt3Support/q3textview.h>
-
- #include <gwenhywfar/debug.h>
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_sendkeys.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_sendkeys.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_sendkeys.cpp 2010-08-03
-@@ -19,7 +19,7 @@
- #include "wizard.h"
- #include "actionwidget.h"
-
--#include <qpushbutton.h>
-+#include <QtGui/qpushbutton.h>
-
- #include <q4banking/qbanking.h>
- #include <aqhbci/provider.h>
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_mkkeys.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_mkkeys.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_mkkeys.cpp 2010-08-03
-@@ -19,7 +19,7 @@
- #include "wizard.h"
- #include "actionwidget.h"
-
--#include <qpushbutton.h>
-+#include <QtGui/qpushbutton.h>
-
- #include <q4banking/qbanking.h>
- #include <aqhbci/provider.h>
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_bankiniletter.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_bankiniletter.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_bankiniletter.cpp 2010-08-03
-@@ -23,8 +23,8 @@
-
- #include <q4banking/qbanking.h>
-
--#include <qpushbutton.h>
--#include <q3textview.h>
-+#include <QtGui/qpushbutton.h>
-+#include <Qt3Support/q3textview.h>
-
- #include <gwenhywfar/debug.h>
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getkeys.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getkeys.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getkeys.cpp 2010-08-03
-@@ -19,7 +19,7 @@
- #include "wizard.h"
- #include "actionwidget.h"
-
--#include <qpushbutton.h>
-+#include <QtGui/qpushbutton.h>
-
- #include <q4banking/qbanking.h>
- #include <aqhbci/provider.h>
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getcert.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getcert.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getcert.cpp 2010-08-03
-@@ -25,7 +25,7 @@
-
- #include <assert.h>
-
--#include <qlabel.h>
-+#include <QtGui/qlabel.h>
-
-
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_edituser.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_edituser.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_edituser.cpp 2010-08-03
-@@ -19,7 +19,7 @@
- #include "wizard.h"
- #include "editctuser.h"
-
--#include <qlayout.h>
-+#include <QtGui/qlayout.h>
-
-
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_checkfile.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_checkfile.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_checkfile.cpp 2010-08-03
-@@ -19,7 +19,7 @@
- #include "wizard.h"
- #include "actionwidget.h"
-
--#include <qpushbutton.h>
-+#include <QtGui/qpushbutton.h>
-
- #include <q4banking/qbanking.h>
- #include <aqhbci/provider.h>
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_createfile.H
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_createfile.H 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_createfile.H 2010-08-02
-@@ -21,7 +21,7 @@
- #include "winfo.h"
- #include "a_selectfile.h"
-
--#include <qstring.h>
-+#include <QtCore/qstring.h>
-
-
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_selectfile.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_selectfile.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_selectfile.cpp 2010-08-02
-@@ -21,11 +21,11 @@
- #include <aqhbci/provider.h>
- #include <gwenhywfar/debug.h>
-
--#include <qpushbutton.h>
--#include <qlineedit.h>
--#include <qfile.h>
--#include <q3filedialog.h>
--#include <qlabel.h>
-+#include <QtGui/qpushbutton.h>
-+#include <QtGui/qlineedit.h>
-+#include <QtCore/qfile.h>
-+#include <Qt3Support/q3filedialog.h>
-+#include <QtGui/qlabel.h>
-
-
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_selectfile.h
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_selectfile.h 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_selectfile.h 2010-08-02
-@@ -18,7 +18,7 @@
- #include "winfo.h"
- #include "selectfile.ui.h"
-
--#include <qstring.h>
-+#include <QtCore/qstring.h>
-
-
- class ActionSelectFile: public WizardAction {
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/iniletter.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/iniletter.cpp 2010-01-15 15:07:28.000000000 -0800
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/iniletter.cpp 2010-08-02 16:39:22.000000000 -0700
-@@ -22,14 +22,11 @@
-
- #include <gwenhywfar/debug.h>
-
--#include <qmessagebox.h>
--#include <qstring.h>
--#include <qlabel.h>
--#include <qpushbutton.h>
--#include <q3textview.h>
--#include <qlabel.h> // for qt4 setWordWrap(true)
--
--
-+#include <QtGui/qmessagebox.h>
-+#include <QtCore/qstring.h>
-+#include <QtGui/qlabel.h>
-+#include <QtGui/qpushbutton.h>
-+#include <Qt3Support/q3textview.h>
-
- IniLetter::IniLetter(bool useUserKey,
- AB_PROVIDER *pro,
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/iniletter.h
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/iniletter.h 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/iniletter.h 2010-08-02
-@@ -19,7 +19,7 @@
- #include <aqbanking/provider.h>
- #include <aqbanking/user.h>
-
--#include <qstring.h>
-+#include <QtCore/qstring.h>
- #include <string>
-
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/editctuser.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/editctuser.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/editctuser.cpp 2010-08-02
-@@ -21,25 +21,25 @@
- #include <q4banking/qbanking.h>
- #include <q4banking/qbselectbank.h>
- //#include "selectcontext.h"
--#include <qradiobutton.h>
--#include <qpushbutton.h>
--#include <q3wizard.h>
--#include <qcombobox.h>
--#include <q3textbrowser.h>
--#include <qlabel.h>
--#include <q3groupbox.h>
--#include <qcheckbox.h>
--
--#include <qlineedit.h>
--#include <qmessagebox.h>
--#include <q3filedialog.h>
--#include <qpalette.h>
--#include <qbrush.h>
--#include <qpainter.h>
--#include <q3paintdevicemetrics.h>
--#include <qprinter.h>
--#include <q3simplerichtext.h>
--#include <q3textview.h>
-+#include <QtGui/qradiobutton.h>
-+#include <QtGui/qpushbutton.h>
-+#include <Qt3Support/q3wizard.h>
-+#include <QtGui/qcombobox.h>
-+#include <Qt3Support/q3textbrowser.h>
-+#include <QtGui/qlabel.h>
-+#include <Qt3Support/q3groupbox.h>
-+#include <QtGui/qcheckbox.h>
-+
-+#include <QtGui/qlineedit.h>
-+#include <QtGui/qmessagebox.h>
-+#include <Qt3Support/q3filedialog.h>
-+#include <QtGui/qpalette.h>
-+#include <QtGui/qbrush.h>
-+#include <QtGui/qpainter.h>
-+#include <Qt3Support/q3paintdevicemetrics.h>
-+#include <QtGui/qprinter.h>
-+#include <Qt3Support/q3simplerichtext.h>
-+#include <Qt3Support/q3textview.h>
-
- #include <gwenhywfar/debug.h>
- #include <gwenhywfar/gui.h>
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/actionwidget.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/actionwidget.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/actionwidget.cpp 2010-08-02
-@@ -18,11 +18,11 @@
-
- #include <gwenhywfar/debug.h>
-
--#include <qmessagebox.h>
--#include <qstring.h>
--#include <qlabel.h>
--#include <q3textview.h>
--#include <qpushbutton.h>
-+#include <QtGui/qmessagebox.h>
-+#include <QtCore/qstring.h>
-+#include <QtGui/qlabel.h>
-+#include <Qt3Support/q3textview.h>
-+#include <QtGui/qpushbutton.h>
-
-
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/wizard.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/wizard.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/wizard.cpp 2010-08-02
-@@ -17,12 +17,12 @@
-
- #include "wizard.h"
-
--#include <qlabel.h>
--#include <qpushbutton.h>
--#include <q3listview.h>
--#include <qdatetime.h>
--#include <q3textbrowser.h>
--#include <qapplication.h>
-+#include <QtGui/qlabel.h>
-+#include <QtGui/qpushbutton.h>
-+#include <Qt3Support/q3listview.h>
-+#include <QtCore/qdatetime.h>
-+#include <Qt3Support/q3textbrowser.h>
-+#include <QtGui/qapplication.h>
-
- #include <gwenhywfar/debug.h>
-
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/wizard.h
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/wizard.h 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/wizard.h 2010-08-02
-@@ -25,8 +25,8 @@
- #include "waction.h"
- #include "winfo.h"
-
--#include <qstring.h>
--#include <q3wizard.h>
-+#include <QtCore/qstring.h>
-+#include <Qt3Support/q3wizard.h>
- #include <aqbanking/banking.h>
-
- #include <list>
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/waction.h
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/waction.h 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/waction.h 2010-08-02
-@@ -1,5 +1,5 @@
- //Added by qt3to4:
--#include <Q3VBoxLayout>
-+#include <Qt3Support/Q3VBoxLayout>
- /***************************************************************************
- $RCSfile$
- -------------------
-@@ -22,8 +22,8 @@
-
- class Q3VBoxLayout;
-
--#include <qstring.h>
--#include <qwidget.h>
-+#include <QtCore/qstring.h>
-+#include <QtGui/qwidget.h>
-
-
- class WizardAction: public QWidget {
-Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/waction.cpp
---- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/waction.cpp 2010-01-15
-+++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/waction.cpp 2010-08-02
-@@ -17,10 +17,10 @@
- #include "waction.h"
- #include "wizard.h"
-
--#include <qwidget.h>
--#include <qlayout.h>
-+#include <QtGui/qwidget.h>
-+#include <QtGui/qlayout.h>
- //Added by qt3to4:
--#include <Q3VBoxLayout>
-+#include <Qt3Support/Q3VBoxLayout>
-
-
- WizardAction::WizardAction(Wizard *w,
-Index: src/aqbanking-4.2.4/src/frontends/q4banking/bin/helpbrowser/Makefile.in
---- src/frontends/q4banking/bin/helpbrowser/Makefile.in 2010-02-06
-+++ src/frontends/q4banking/bin/helpbrowser/Makefile.in 2010-08-02
-@@ -392,7 +392,7 @@
-
- q4b_help at Q4BANKING_SO_EFFECTIVE@_SOURCES = qb_help.cpp qbhelpbrowser.cpp
- q4b_help at Q4BANKING_SO_EFFECTIVE@_LDADD = \
-- $(qt4_libs) -lQtCore -lQt3Support \
-+ $(qt4_libs) \
- $(gwenhywfar_libs)
-
- BUILT_SOURCES = $(MOC_FILES) $(nodist_libqbhelp_la_SOURCES) $(nodist_noinst_HEADERS)
-Index: src/frontends/q4banking/bin/helpbrowser/qbhelpbrowser.cpp
---- src/frontends/q4banking/bin/helpbrowser/qbhelpbrowser.cpp 2010-01-15
-+++ src/frontends/q4banking/bin/helpbrowser/qbhelpbrowser.cpp 2010-08-02
-@@ -15,34 +15,34 @@
- #endif
-
- #include "qbhelpbrowser.h"
--#include <qstatusbar.h>
--#include <qpixmap.h>
--#include <q3popupmenu.h>
--#include <qmenubar.h>
--#include <q3toolbar.h>
--#include <qtoolbutton.h>
--#include <qicon.h>
--#include <qfile.h>
--#include <q3textstream.h>
--#include <q3stylesheet.h>
--#include <qmessagebox.h>
--#include <q3filedialog.h>
--#include <qapplication.h>
--#include <qcombobox.h>
--#include <qevent.h>
--#include <qlineedit.h>
--#include <qobject.h>
--#include <qfileinfo.h>
--#include <qfile.h>
--#include <qdatastream.h>
--#include <qprinter.h>
--#include <q3simplerichtext.h>
--#include <qpainter.h>
--#include <q3paintdevicemetrics.h>
-+#include <QtGui/qstatusbar.h>
-+#include <QtGui/qpixmap.h>
-+#include <Qt3Support/q3popupmenu.h>
-+#include <QtGui/qmenubar.h>
-+#include <Qt3Support/q3toolbar.h>
-+#include <QtGui/qtoolbutton.h>
-+#include <QtGui/qicon.h>
-+#include <QtCore/qfile.h>
-+#include <Qt3Support/q3textstream.h>
-+#include <Qt3Support/q3stylesheet.h>
-+#include <QtGui/qmessagebox.h>
-+#include <Qt3Support/q3filedialog.h>
-+#include <QtGui/qapplication.h>
-+#include <QtGui/qcombobox.h>
-+#include <QtGui/qevent.h>
-+#include <QtGui/qlineedit.h>
-+#include <QtCore/qobject.h>
-+#include <QtCore/qfileinfo.h>
-+#include <QtCore/qfile.h>
-+#include <QtCore/qdatastream.h>
-+#include <QtGui/qprinter.h>
-+#include <Qt3Support/q3simplerichtext.h>
-+#include <QtGui/qpainter.h>
-+#include <Qt3Support/q3paintdevicemetrics.h>
-
--#include <q3textbrowser.h>
-+#include <Qt3Support/q3textbrowser.h>
- //Added by qt3to4:
--#include <Q3Frame>
-+#include <Qt3Support/Q3Frame>
-
- #include <ctype.h>
-
-Index: src/frontends/q4banking/bin/helpbrowser/qbhelpbrowser.h
---- src/frontends/q4banking/bin/helpbrowser/qbhelpbrowser.h 2010-01-15
-+++ src/frontends/q4banking/bin/helpbrowser/qbhelpbrowser.h 2010-08-02
-@@ -13,17 +13,17 @@
- #ifndef QBHELPWINDOW_H
- #define QBHELPWINDOW_H
-
--#include <q3mainwindow.h>
--#include <q3textbrowser.h>
--#include <qstringlist.h>
--#include <qmap.h>
--#include <qdir.h>
--#include <qstringlist.h>
-+#include <Qt3Support/q3mainwindow.h>
-+#include <Qt3Support/q3textbrowser.h>
-+#include <QtCore/qstringlist.h>
-+#include <QtCore/qmap.h>
-+#include <QtCore/qdir.h>
-+#include <QtCore/qstringlist.h>
-
- #include "qbhelpbrowser.ui.h"
- #include <q4banking/qbanking.h>
- //Added by qt3to4:
--#include <Q3PopupMenu>
-+#include <Qt3Support/Q3PopupMenu>
-
-
- class QComboBox;
-Index: src/frontends/q4banking/bin/helpbrowser/qb_help.cpp
---- src/frontends/q4banking/bin/helpbrowser/qb_help.cpp 2010-01-15
-+++ src/frontends/q4banking/bin/helpbrowser/qb_help.cpp 2010-08-02
-@@ -15,9 +15,11 @@
- #endif
-
-
--#include <qapplication.h>
--#include <qtranslator.h>
--#include <qtextcodec.h>
-+#include <QtGui/qapplication.h>
-+#include <QtCore/qtranslator.h>
-+#include <QtCore/qtextcodec.h>
-+#include <QtCore/qstringlist.h>
-+#include <QtGui/qmessagebox.h>
-
- #include <gwenhywfar/logger.h>
- #include <gwenhywfar/debug.h>
-@@ -26,11 +28,6 @@
-
- #include "qbhelpbrowser.h"
-
--#include <qapplication.h>
--#include <qstringlist.h>
--#include <qtextcodec.h>
--#include <qtranslator.h>
--#include <qmessagebox.h>
-
-
- #ifdef OS_WIN32
-Index: src/frontends/q4banking/bin/wizard/qt4_wizard.cpp
---- src/frontends/q4banking/bin/wizard/qt4_wizard.cpp 2010-01-15
-+++ src/frontends/q4banking/bin/wizard/qt4_wizard.cpp 2010-08-02
-@@ -15,7 +15,7 @@
- #endif
-
-
--#include <qapplication.h>
-+#include <QtGui/qapplication.h>
-
- #include <gwenhywfar/logger.h>
- #include <gwenhywfar/debug.h>
-Index: src/frontends/q4banking/lib/checklib.cpp
---- src/frontends/q4banking/lib/checklib.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/checklib.cpp 2010-08-02
-@@ -1,15 +1,15 @@
- #include <q4banking/qbanking.h>
-
--#include <qapplication.h>
--#include <qmessagebox.h>
--#include <qtranslator.h>
--#include <qtextcodec.h>
--#include <qregexp.h>
-+#include <QtGui/qapplication.h>
-+#include <QtGui/qmessagebox.h>
-+#include <QtCore/qtranslator.h>
-+#include <Qtcore/qtextcodec.h>
-+#include <QtCore/qregexp.h>
-
- #include <gwenhywfar/debug.h>
- #include <gwenhywfar/gwenhywfar.h>
-
--#include <qdir.h>
-+#include <QtCore/qdir.h>
-
-
- int main(int argc, char *argv[]){
-Index: src/frontends/q4banking/lib/testlib.cpp
---- src/frontends/q4banking/lib/testlib.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/testlib.cpp 2010-08-02
-@@ -1,7 +1,7 @@
- #include <q4banking/qbanking.h>
-
--#include <qapplication.h>
--#include <qmessagebox.h>
-+#include <QtGui/qapplication.h>
-+#include <QtGui/qmessagebox.h>
-
- #include <gwenhywfar/debug.h>
- #include <gwenhywfar/gwenhywfar.h>
-Index: src/frontends/q4banking/lib/Makefile.in
---- src/frontends/q4banking/lib/Makefile.in 2010-02-06
-+++ src/frontends/q4banking/lib/Makefile.in 2010-08-03
-@@ -493,7 +493,7 @@
- dialogs/libdialogs.la \
- views/libviews.la \
- gui/libqgui.la \
-- $(i18n_libs) $(aqbanking_internal_libs) $(gwenhywfar_libs) $(qt4_libs) -lQt3Support
-+ $(i18n_libs) $(aqbanking_internal_libs) $(gwenhywfar_libs) $(qt4_libs)
-
- libq4banking_la_LDFLAGS = -no-undefined -version-info \
- @Q4BANKING_SO_CURRENT@:@Q4BANKING_SO_REVISION@:@Q4BANKING_SO_AGE@ \
-@@ -504,9 +504,9 @@
- dialogs/libdialogs.la views/libviews.la gui/libqgui.la \
- $(aqbanking_internal_libs) $(am__append_1)
- testlib_SOURCES = testlib.cpp
--testlib_LDADD = libq4banking.la $(aqbanking_internal_libs) $(gwenhywfar_libs) $(qt4_libs) -lQtCore -lQt3Support
-+testlib_LDADD = libq4banking.la $(aqbanking_internal_libs) $(gwenhywfar_libs) $(qt4_libs)
- checklib_SOURCES = checklib.cpp
--checklib_LDADD = libq4banking.la $(aqbanking_internal_libs) $(gwenhywfar_libs) $(qt4_libs) -lQtCore -lQt3Support
-+checklib_LDADD = libq4banking.la $(aqbanking_internal_libs) $(gwenhywfar_libs) $(qt4_libs)
- all: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-Index: src/frontends/q4banking/bin/wizard/Makefile.in
---- src/frontends/q4banking/bin/wizard/Makefile.in 2010-02-06
-+++ src/frontends/q4banking/bin/wizard/Makefile.in 2010-08-03
-@@ -410,7 +410,7 @@
- qt4_wizard_LDADD = \
- $(q4banking_internal_libs) \
- $(aqbanking_internal_libs) \
-- $(gwenhywfar_libs) $(qt4_libs) -lQtCore
-+ $(gwenhywfar_libs) $(qt4_libs)
-
- CLEANFILES = qt4_wizard.xml
- all: all-am
-Index: src/frontends/q4banking/lib/qbgui.cpp
---- src/frontends/q4banking/lib/qbgui.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/qbgui.cpp 2010-08-02
-@@ -20,7 +20,7 @@
- #include "qbprintdialog.h"
-
-
--#include <qwidget.h>
-+#include <QtGui/qwidget.h>
-
- #include <aqbanking/abgui.h>
-
-Index: src/frontends/q4banking/lib/qbanking.cpp
---- src/frontends/q4banking/lib/qbanking.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/qbanking.cpp 2010-08-02
-@@ -26,22 +26,22 @@
- #include "qbcfgmodule.h"
- #include "qbcfgtabsettings.h"
- //Added by qt3to4:
--#include <Q3CString>
-+#include <Qt3Support/Q3CString>
-
- #include <aqbanking/jobgetbalance.h>
- #include <aqbanking/jobgettransactions.h>
-
- #include <assert.h>
--#include <qstring.h>
--#include <qmessagebox.h>
--#include <qinputdialog.h>
--#include <qapplication.h>
--#include <qdatetime.h>
--#include <qwidget.h>
--#include <qtranslator.h>
--#include <qtextcodec.h>
--#include <q3process.h>
--#include <qdir.h>
-+#include <QtCore/qstring.h>
-+#include <QtGui/qmessagebox.h>
-+#include <QtGui/qinputdialog.h>
-+#include <QtGui/qapplication.h>
-+#include <QtCore/qdatetime.h>
-+#include <QtGui/qwidget.h>
-+#include <QtCore/qtranslator.h>
-+#include <QtCore/qtextcodec.h>
-+#include <Qt3Support/q3process.h>
-+#include <QtCore/qdir.h>
-
- #include <gwenhywfar/debug.h>
- #include <gwenhywfar/libloader.h>
-Index: src/frontends/q4banking/lib/gui/qguisimplebox.cpp
---- src/frontends/q4banking/lib/gui/qguisimplebox.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/gui/qguisimplebox.cpp 2010-08-02
-@@ -15,8 +15,8 @@
- #endif
-
-
--#include <qlabel.h>
--#include <qtimer.h>
-+#include <QtGui/qlabel.h>
-+#include <QtCore/qtimer.h>
-
- #include "qguisimplebox.h"
-
-Index: src/frontends/q4banking/lib/gui/qguiprogresswidget.cpp
---- src/frontends/q4banking/lib/gui/qguiprogresswidget.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/gui/qguiprogresswidget.cpp 2010-08-02
-@@ -17,16 +17,16 @@
- #include "qguiprogresswidget.h"
- #include "qguiprogress.h"
-
--#include <qlabel.h>
--#include <q3progressbar.h>
--#include <qapplication.h>
--#include <qpushbutton.h>
--#include <qdatetime.h>
--#include <q3textbrowser.h>
--#include <q3progressbar.h>
--#include <q3groupbox.h>
-+#include <QtGui/qlabel.h>
-+#include <Qt3Support/q3progressbar.h>
-+#include <QtGui/qapplication.h>
-+#include <QtGui/qpushbutton.h>
-+#include <QtCore/qdatetime.h>
-+#include <Qt3Support/q3textbrowser.h>
-+#include <Qt3Support/q3progressbar.h>
-+#include <Qt3Support/q3groupbox.h>
- //Added by qt3to4:
--#include <QCloseEvent>
-+#include <QtGui/QCloseEvent>
-
- #include <gwenhywfar/debug.h>
-
-Index:src/frontends/q4banking/lib/gui/qguiinputbox.cpp
---- src/frontends/q4banking/lib/gui/qguiinputbox.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/gui/qguiinputbox.cpp 2010-08-02
-@@ -15,21 +15,21 @@
- #endif
-
-
--#include <qlabel.h>
--#include <qapplication.h>
--#include <qpushbutton.h>
--#include <q3textbrowser.h>
--#include <qlineedit.h>
--#include <q3simplerichtext.h>
--#include <qvalidator.h>
--#include <qlayout.h>
--#include <qtimer.h>
-+#include <QtGui/qlabel.h>
-+#include <QtGui/qapplication.h>
-+#include <QtGui/qpushbutton.h>
-+#include <Qt3Support/q3textbrowser.h>
-+#include <QtGui/qlineedit.h>
-+#include <Qt3Support/q3simplerichtext.h>
-+#include <QtGui/qvalidator.h>
-+#include <QtGui/qlayout.h>
-+#include <QtCore/qtimer.h>
- //Added by qt3to4:
--#include <Q3GridLayout>
--#include <Q3BoxLayout>
--#include <Q3HBoxLayout>
--#include <Q3VBoxLayout>
--#include <Q3Frame>
-+#include <Qt3Support/Q3GridLayout>
-+#include <Qt3Support/Q3BoxLayout>
-+#include <Qt3Support/Q3HBoxLayout>
-+#include <Qt3Support/Q3VBoxLayout>
-+#include <Qt3Support/Q3Frame>
-
- #include <gwenhywfar/debug.h>
- #include <gwenhywfar/gui.h>
-Index: src/frontends/q4banking/lib/gui/qgui.cpp
---- src/frontends/q4banking/lib/gui/qgui.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/gui/qgui.cpp 2010-08-02
-@@ -21,12 +21,12 @@
- #include "qguiinputbox.h"
- #include "qguisimplebox.h"
- //Added by qt3to4:
--#include <Q3CString>
-+#include <Qt3Support/Q3CString>
-
- #include <gwenhywfar/debug.h>
-
--#include <qmessagebox.h>
--#include <qapplication.h>
-+#include <QtGui/qmessagebox.h>
-+#include <QtGui/qapplication.h>
-
- #include <assert.h>
-
-Index: src/frontends/q4banking/lib/dialogs/qbmapaccount.cpp
---- src/frontends/q4banking/lib/dialogs/qbmapaccount.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/dialogs/qbmapaccount.cpp 2010-08-02
-@@ -21,13 +21,13 @@
- #include "qbaccountlist.h"
-
- // QT includes
--#include <qlabel.h>
--#include <qpushbutton.h>
--#include <qmessagebox.h>
--#include <qlayout.h>
--#include <qpushbutton.h>
--#include <q3groupbox.h>
--#include <qlineedit.h>
-+#include <QtGui/qlabel.h>
-+#include <QtGui/qpushbutton.h>
-+#include <QtGui/qmessagebox.h>
-+#include <QtGui/qlayout.h>
-+#include <QtGui/qpushbutton.h>
-+#include <Qt3Support/q3groupbox.h>
-+#include <QtGui/qlineedit.h>
-
-
-
-Index: src/frontends/q4banking/lib/gui/qguiinputbox.h
---- src/frontends/q4banking/lib/gui/qguiinputbox.h 2010-01-15
-+++ src/frontends/q4banking/lib/gui/qguiinputbox.h 2010-08-02
-@@ -16,8 +16,8 @@
-
- #include <gwenhywfar/types.h>
-
--#include <qdialog.h>
--#include <qvalidator.h>
-+#include <QtGui/qdialog.h>
-+#include <QtGui/qvalidator.h>
-
-
- class QLineEdit;
-Index: src/frontends/q4banking/lib/gui/qguiprogresswidget.h
---- src/frontends/q4banking/lib/gui/qguiprogresswidget.h 2010-01-15
-+++ src/frontends/q4banking/lib/gui/qguiprogresswidget.h 2010-08-02
-@@ -16,7 +16,7 @@
-
- #include "qguiprogresswidget.ui.h"
- //Added by qt3to4:
--#include <QCloseEvent>
-+#include <QtGui/QCloseEvent>
- #include <gwenhywfar/types.h>
- #include <gwenhywfar/gui.h>
-
-Index: src/aqbanking-4.2.4/src/frontends/q4banking/lib/gui/qguiprogress.h
---- src/frontends/q4banking/lib/gui/qguiprogress.h 2010-01-15
-+++ src/frontends/q4banking/lib/gui/qguiprogress.h 2010-08-02
-@@ -18,7 +18,7 @@
-
- #include <time.h>
-
--#include <qstring.h>
-+#include <QtCore/qstring.h>
-
-
- class QGuiProgressWidget;
-Index: src/frontends/q4banking/lib/widgets/qbcfgtab.h
---- src/frontends/q4banking/lib/widgets/qbcfgtab.h 2010-01-15
-+++ src/frontends/q4banking/lib/widgets/qbcfgtab.h 2010-08-02
-@@ -20,7 +20,7 @@
- #include <q4banking/qbanking.h>
-
- #include "qbcfgtab.ui.h"
--#include <qstring.h>
-+#include <QtCore/qstring.h>
-
-
- class QBanking;
-Index: src/frontends/q4banking/lib/views/qbbankselector.cpp
---- src/frontends/q4banking/lib/views/qbbankselector.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/views/qbbankselector.cpp 2010-08-02
-@@ -17,7 +17,7 @@
-
- #include "qbbankselector.h"
- #include "qbselectbank.h"
--#include <qlineedit.h>
-+#include <QtGui/qlineedit.h>
-
-
-
-Index: src/frontends/q4banking/lib/dialogs/qbselectbackend.cpp
---- src/frontends/q4banking/lib/dialogs/qbselectbackend.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/dialogs/qbselectbackend.cpp 2010-08-02
-@@ -22,10 +22,10 @@
- #include <gwenhywfar/debug.h>
-
- // QT includes
--#include <qcombobox.h>
--#include <qpushbutton.h>
--#include <q3textbrowser.h>
--#include <qlabel.h> // for qt4 setWordWrap(true)
-+#include <QtGui/qcombobox.h>
-+#include <QtGui/qpushbutton.h>
-+#include <Qt3Support/q3textbrowser.h>
-+#include <QtGui/qlabel.h> // for qt4 setWordWrap(true)
-
-
-
-Index: src/frontends/q4banking/lib/dialogs/qbeditaccount.cpp
---- src/frontends/q4banking/lib/dialogs/qbeditaccount.cpp 2010-01-24
-+++ src/frontends/q4banking/lib/dialogs/qbeditaccount.cpp 2010-08-02
-@@ -21,7 +21,7 @@
- #include "qbanking.h"
-
- // QT includes
--#include <qmessagebox.h>
-+#include <QtGui/qmessagebox.h>
-
- // Gwenhywfar includes
- #include <gwenhywfar/debug.h>
-Index: src/frontends/q4banking/lib/dialogs/qbedituser.cpp
---- src/frontends/q4banking/lib/dialogs/qbedituser.cpp 2010-01-24
-+++ src/frontends/q4banking/lib/dialogs/qbedituser.cpp 2010-08-02
-@@ -21,7 +21,7 @@
- #include "qbanking.h"
-
- // QT includes
--#include <qmessagebox.h>
-+#include <QtGui/qmessagebox.h>
-
- // Gwenhywfar includes
- #include <gwenhywfar/debug.h>
-Index: src/frontends/q4banking/lib/dialogs/qbcfgtabpagebackends.cpp
---- src/frontends/q4banking/lib/dialogs/qbcfgtabpagebackends.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/dialogs/qbcfgtabpagebackends.cpp 2010-08-02
-@@ -24,11 +24,11 @@
- #include <gwenhywfar/debug.h>
-
- // QT includes
--#include <qlineedit.h>
--#include <qcombobox.h>
--#include <qpushbutton.h>
--#include <qmessagebox.h>
--#include <qlayout.h>
-+#include <QtGui/qlineedit.h>
-+#include <QtGui/qcombobox.h>
-+#include <QtGui/qpushbutton.h>
-+#include <QtGui/qmessagebox.h>
-+#include <QtGui/qlayout.h>
-
-
-
-Index: src/frontends/q4banking/lib/dialogs/qbcfgtabpageusers.cpp
---- src/frontends/q4banking/lib/dialogs/qbcfgtabpageusers.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/dialogs/qbcfgtabpageusers.cpp 2010-08-02
-@@ -27,12 +27,12 @@
- #include <gwenhywfar/debug.h>
-
- // QT includes
--#include <qlineedit.h>
--#include <qcombobox.h>
--#include <qpushbutton.h>
--#include <qmessagebox.h>
--#include <qlayout.h>
--#include <qtextcodec.h>
-+#include <QtGui/qlineedit.h>
-+#include <QtGui/qcombobox.h>
-+#include <QtGui/qpushbutton.h>
-+#include <QtGui/qmessagebox.h>
-+#include <QtGui/qlayout.h>
-+#include <QtCore/qtextcodec.h>
-
-
-
-Index: src/frontends/q4banking/lib/dialogs/qbimporter.cpp
---- src/frontends/q4banking/lib/dialogs/qbimporter.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/dialogs/qbimporter.cpp 2010-08-02
-@@ -27,17 +27,17 @@
- #include <gwenhywfar/iomanager.h>
-
- // QT includes
--#include <q3listview.h>
--#include <qpushbutton.h>
--#include <q3textbrowser.h>
--#include <qmessagebox.h>
--#include <qapplication.h>
--#include <q3progressbar.h>
--#include <qfile.h>
--#include <q3filedialog.h>
--#include <qcombobox.h>
--#include <qlabel.h>
--#include <qlineedit.h>
-+#include <Qt3Support/q3listview.h>
-+#include <QtGui/qpushbutton.h>
-+#include <Qt3Support/q3textbrowser.h>
-+#include <QtGui/qmessagebox.h>
-+#include <QtGui/qapplication.h>
-+#include <Qt3Support/q3progressbar.h>
-+#include <QtCore/qfile.h>
-+#include <Qt3Support/q3filedialog.h>
-+#include <QtGui/qcombobox.h>
-+#include <QtGui/qlabel.h>
-+#include <QtGui/qlineedit.h>
-
- // C includes
- #include <sys/types.h>
-Index: src/frontends/q4banking/lib/dialogs/qbedituser.h
---- src/frontends/q4banking/lib/dialogs/qbedituser.h 2010-01-15
-+++ src/frontends/q4banking/lib/dialogs/qbedituser.h 2010-08-02
-@@ -16,7 +16,7 @@
-
- #include <q4banking/qbcfgtab.h>
-
--#include <qstring.h>
-+#include <QtCore/qstring.h>
-
-
- class QBanking;
-Index: src/frontends/q4banking/lib/dialogs/qbcfgtabpageaccounts.cpp
---- src/frontends/q4banking/lib/dialogs/qbcfgtabpageaccounts.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/dialogs/qbcfgtabpageaccounts.cpp 2010-08-02
-@@ -27,12 +27,12 @@
- #include <gwenhywfar/debug.h>
-
- // QT includes
--#include <qlineedit.h>
--#include <qcombobox.h>
--#include <qpushbutton.h>
--#include <qmessagebox.h>
--#include <qlayout.h>
--#include <qtextcodec.h>
-+#include <QtGui/qlineedit.h>
-+#include <QtGui/qcombobox.h>
-+#include <QtGui/qpushbutton.h>
-+#include <QtGui/qmessagebox.h>
-+#include <QtGui/qlayout.h>
-+#include <QtCore/qtextcodec.h>
-
-
-
-Index: src/frontends/q4banking/lib/qbcfgmodule.h
---- src/frontends/q4banking/lib/qbcfgmodule.h 2010-01-15 15:07:21.000000000 -0800
-+++ src/frontends/q4banking/lib/qbcfgmodule.h 2010-08-02 15:46:29.000000000 -0700
-@@ -17,7 +17,7 @@
- #include <aqbanking/banking.h>
- #include <gwenhywfar/plugin.h>
-
--#include <qstring.h>
-+#include <QtCore/qstring.h>
-
-
- #define Q4BCFGMODULE_FLAGS_CAN_CREATE_USER 0x00000001
-Index: src/frontends/q4banking/lib/dialogs/qbcfgtabpageaccountgen.cpp
---- src/frontends/q4banking/lib/dialogs/qbcfgtabpageaccountgen.cpp 2010-01-18
-+++ src/frontends/q4banking/lib/dialogs/qbcfgtabpageaccountgen.cpp 2010-08-02
-@@ -22,12 +22,12 @@
- #include <gwenhywfar/debug.h>
-
- // QT includes
--#include <qlineedit.h>
--#include <qcombobox.h>
--#include <qpushbutton.h>
--#include <qmessagebox.h>
--#include <qlayout.h>
--#include <qcheckbox.h>
-+#include <QtGui/qlineedit.h>
-+#include <QtGui/qcombobox.h>
-+#include <QtGui/qpushbutton.h>
-+#include <QtGui/qmessagebox.h>
-+#include <QtGui/qlayout.h>
-+#include <QtGui/qcheckbox.h>
-
-
-
-Index: src/frontends/q4banking/lib/dialogs/qbcfgtabpageusergen.cpp
---- src/frontends/q4banking/lib/dialogs/qbcfgtabpageusergen.cpp 2010-01-18
-+++ src/frontends/q4banking/lib/dialogs/qbcfgtabpageusergen.cpp 2010-08-02
-@@ -22,12 +22,12 @@
- #include <gwenhywfar/debug.h>
-
- // QT includes
--#include <qlineedit.h>
--#include <qcombobox.h>
--#include <qpushbutton.h>
--#include <qmessagebox.h>
--#include <qlabel.h>
--#include <qlocale.h>
-+#include <QtGui/qlineedit.h>
-+#include <QtGui/qcombobox.h>
-+#include <QtGui/qpushbutton.h>
-+#include <QtGui/qmessagebox.h>
-+#include <QtGui/qlabel.h>
-+#include <QtCore/qlocale.h>
-
-
-
-Index: src/frontends/q4banking/lib/dialogs/qbprintdialog.h
---- src/frontends/q4banking/lib/dialogs/qbprintdialog.h 2010-01-15
-+++ src/frontends/q4banking/lib/dialogs/qbprintdialog.h 2010-08-02
-@@ -17,7 +17,7 @@
-
- #include "qbprintdialog.ui.h"
-
--#include <qstring.h>
-+#include <QtCore/qstring.h>
-
- class QPrinter;
-
-Index: src/frontends/q4banking/lib/dialogs/qbprintdialog.cpp
---- src/frontends/q4banking/lib/dialogs/qbprintdialog.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/dialogs/qbprintdialog.cpp 2010-08-02
-@@ -25,15 +25,15 @@
- #include <gwenhywfar/gui.h>
-
- // QT includes
--#include <qlabel.h>
--#include <q3textbrowser.h>
--#include <qpushbutton.h>
--#include <qprinter.h>
--#include <qpainter.h>
--#include <q3paintdevicemetrics.h>
--#include <q3simplerichtext.h>
--#include <qmessagebox.h>
--#include <qfontdialog.h>
-+#include <QtGui/qlabel.h>
-+#include <Qt3Support/q3textbrowser.h>
-+#include <QtGui/qpushbutton.h>
-+#include <QtGui/qprinter.h>
-+#include <QtGui/qpainter.h>
-+#include <Qt3Support/q3paintdevicemetrics.h>
-+#include <Qt3Support/q3simplerichtext.h>
-+#include <QtGui/qmessagebox.h>
-+#include <QtGui/qfontdialog.h>
-
-
-
-Index: src/frontends/q4banking/lib/dialogs/qbselectfromlist.cpp
---- src/frontends/q4banking/lib/dialogs/qbselectfromlist.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/dialogs/qbselectfromlist.cpp 2010-08-02
-@@ -22,10 +22,10 @@
- #include <gwenhywfar/debug.h>
-
- // QT includes
--#include <qlabel.h>
--#include <qpushbutton.h>
--#include <q3groupbox.h>
--#include <q3listview.h>
-+#include <QtGui/qlabel.h>
-+#include <QtGui/qpushbutton.h>
-+#include <Qt3Support/q3groupbox.h>
-+#include <Qt3Support/q3listview.h>
-
-
-
-Index: src/frontends/q4banking/lib/dialogs/qbselectbank.cpp
---- src/frontends/q4banking/lib/dialogs/qbselectbank.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/dialogs/qbselectbank.cpp 2010-08-02
-@@ -27,12 +27,12 @@
- #include <gwenhywfar/debug.h>
-
- // QT includes
--#include <q3listview.h>
--#include <qlineedit.h>
--#include <qlabel.h>
--#include <qmessagebox.h>
--#include <qcheckbox.h>
--#include <qpushbutton.h>
-+#include <Qt3Support/q3listview.h>
-+#include <QtGui/qlineedit.h>
-+#include <QtGui/qlabel.h>
-+#include <QtGui/qmessagebox.h>
-+#include <QtGui/qcheckbox.h>
-+#include <QtGui/qpushbutton.h>
-
- // C++ includes
- #include <string>
-Index: src/frontends/q4banking/lib/dialogs/qbpickstartdate.cpp
---- src/frontends/q4banking/lib/dialogs/qbpickstartdate.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/dialogs/qbpickstartdate.cpp 2010-08-02
-@@ -21,11 +21,11 @@
- #include <gwenhywfar/debug.h>
-
- // QT includes
--#include <q3datetimeedit.h>
--#include <qradiobutton.h>
--#include <qlabel.h>
--#include <qpushbutton.h>
--#include <q3buttongroup.h>
-+#include <Qt3Support/q3datetimeedit.h>
-+#include <QtGui/qradiobutton.h>
-+#include <QtGui/qlabel.h>
-+#include <QtGui/qpushbutton.h>
-+#include <Qt3Support/q3buttongroup.h>
-
-
-
-Index: src/frontends/q4banking/lib/dialogs/qbpickstartdate.h
---- src/frontends/q4banking/lib/dialogs/qbpickstartdate.h 2010-01-15
-+++ src/frontends/q4banking/lib/dialogs/qbpickstartdate.h 2010-08-02
-@@ -15,7 +15,7 @@
-
- #include <q4banking/qbpickstartdate.ui.h>
- #include <q4banking/qbanking.h>
--#include <qdatetime.h>
-+#include <QtCore/qdatetime.h>
-
-
- class QBanking;
-Index: src/frontends/q4banking/lib/dialogs/qbselectfromlist.h
---- src/frontends/q4banking/lib/dialogs/qbselectfromlist.h 2010-01-15
-+++ src/frontends/q4banking/lib/dialogs/qbselectfromlist.h 2010-08-02
-@@ -16,7 +16,7 @@
- class QBanking;
-
-
--#include <qstringlist.h>
-+#include <QtCore/qstringlist.h>
-
- #include <q4banking/qbselectfromlist.ui.h>
- #include <q4banking/qbanking.h>
-Index: src/frontends/q4banking/lib/dialogs/qbprocesswatcher.cpp
---- src/frontends/q4banking/lib/dialogs/qbprocesswatcher.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/dialogs/qbprocesswatcher.cpp 2010-08-02
-@@ -22,11 +22,11 @@
- #include <gwenhywfar/debug.h>
-
- // QT includes
--#include <q3process.h>
--#include <qapplication.h>
--#include <qlabel.h>
--#include <qpushbutton.h>
--#include <qmessagebox.h>
-+#include <Qt3Support/q3process.h>
-+#include <QtGui/qapplication.h>
-+#include <QtGui/qlabel.h>
-+#include <QtGui/qpushbutton.h>
-+#include <QtGui/qmessagebox.h>
-
-
-
-Index: src/frontends/q4banking/lib/widgets/qbcfgtabpage.cpp
---- src/frontends/q4banking/lib/widgets/qbcfgtabpage.cpp 2010-01-18
-+++ src/frontends/q4banking/lib/widgets/qbcfgtabpage.cpp 2010-08-02
-@@ -17,17 +17,17 @@
-
- #include "qbcfgtabpage.h"
- //Added by qt3to4:
--#include <Q3VBoxLayout>
-+#include <Qt3Support/Q3VBoxLayout>
-
- #include <gwenhywfar/debug.h>
-
-
--#include <qlayout.h>
-+#include <QtGui/qlayout.h>
- #if (QT_VERSION >= 0x040100)
- // qt-4.1.0 errorneously forgets to add this include
--# include <QComboBox>
-+# include <QtGui/QComboBox>
- #endif
--#include <qcombobox.h>
-+#include <QtGui/qcombobox.h>
-
-
- QBCfgTabPage::QBCfgTabPage(QBanking *qb,
-Index: src/frontends/q4banking/lib/dialogs/qbprocesswatcher.h
---- src/frontends/q4banking/lib/dialogs/qbprocesswatcher.h 2010-01-15
-+++ src/frontends/q4banking/lib/dialogs/qbprocesswatcher.h 2010-08-02
-@@ -17,7 +17,7 @@
- #include <q4banking/qbprocesswatcher.ui.h>
- #include <q4banking/qbanking.h>
-
--#include <qstring.h>
-+#include <QtCore/qstring.h>
- #include <time.h>
-
- class Q3Process;
-Index: src/frontends/q4banking/lib/widgets/qbuserlist.cpp
---- src/frontends/q4banking/lib/widgets/qbuserlist.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/widgets/qbuserlist.cpp 2010-08-02
-@@ -17,7 +17,7 @@
-
- #include "qbuserlist.h"
- #include <assert.h>
--#include <qstring.h>
-+#include <QtCore/qstring.h>
-
- #include <gwenhywfar/debug.h>
-
-Index: src/frontends/q4banking/lib/widgets/qbcfgtab.cpp
---- src/frontends/q4banking/lib/widgets/qbcfgtab.cpp 2010-01-15
-+++ src/frontends/q4banking/lib/widgets/qbcfgtab.cpp 2010-08-02
-@@ -18,9 +18,9 @@
- #include "qbcfgtab.h"
- #include "qbcfgtabpage.h"
-
--#include <qtabwidget.h>
--#include <q3textbrowser.h>
--#include <qpushbutton.h>
-+#include <QtGui/qtabwidget.h>
-+#include <Qt3Support/q3textbrowser.h>
-+#include <QtGui/qpushbutton.h>
-
- #include <gwenhywfar/debug.h>
-
-Index: src/frontends/q4banking/lib/widgets/qbcfgtabpage.h
---- src/frontends/q4banking/lib/widgets/qbcfgtabpage.h 2010-08-02
-+++ src/frontends/q4banking/lib/widgets/qbcfgtabpage.h 2010-08-02
-@@ -21,7 +21,7 @@
- #include <QtGui/qwidget.h>
- #include <QtCore/qstring.h>
- //Added by qt3to4:
--#include <Q3VBoxLayout>
-+#include <Qt3Support/Q3VBoxLayout>
-
-
-
-Index: src/frontends/q4banking/lib/gui/qgui.h
---- src/frontends/q4banking/lib/gui/qgui.h 2010-01-15
-+++ src/frontends/q4banking/lib/gui/qgui.h 2010-08-02
-@@ -10,7 +10,7 @@
-
- #include <q4banking/cppgui.h>
-
--#include <Qt/qstring.h>
-+#include <QtCore/qstring.h>
- #include <string>
-
- class QBanking;
commit ddd6cba850de6649bc4793b9c767206a36801932
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jan 27 16:18:58 2012 -0800
Clear out some unused patches
diff --git a/patches/aqbanking.patch b/patches/aqbanking.patch
deleted file mode 100644
index 39fbb10..0000000
--- a/patches/aqbanking.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/frontends/qbanking/lib/Makefile.in 2007-10-15 12:47:51 -0700
-+++ src/frontends/qbanking/lib/Makefile.in 2009-08-25 13:27:27 -0700
-@@ -556,9 +556,9 @@
- dialogs/libdialogs.la views/libviews.la \
- $(aqbanking_internal_libs) $(am__append_1)
- testlib_SOURCES = testlib.cpp
--testlib_LDADD = libqbanking.la $(aqbanking_internal_libs)
-+testlib_LDADD = libqbanking.la $(aqbanking_internal_libs) $(qt3_libs)
- checklib_SOURCES = checklib.cpp
--checklib_LDADD = libqbanking.la $(aqbanking_internal_libs)
-+checklib_LDADD = libqbanking.la $(aqbanking_internal_libs) $(qt3_libs)
- TESTS = checklib
- all: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
---- src/frontends/qbanking/lib/dialogs/qbimporter.cpp 2009-08-23 15:11:25 -0700
-+++ src/frontends/qbanking/lib/dialogs/qbimporter.cpp 2009-08-25 12:53:25 -0700
-@@ -835,7 +835,7 @@
- // conversion operator "QCString::operator const char * ()
- // const" that will correctly convert the QCString to the
- // const char*
-- fd=open(fname.local8Bit().data(), O_RDONLY);
-+ fd=::open(fname.local8Bit().data(), O_RDONLY);
- if (fd==-1) {
- qs=QWidget::tr("Could not open file \"%1\": %2")
- .arg(fname)
---- Makefile.in 2007-10-15 12:48:21.000000000 -0700
-+++ Makefile.in 2009-08-25 14:01:07.000000000 -0700
-@@ -548,6 +548,7 @@
- ilocaledir = $(datadir)/locale
- qtlocaledir = $(pkgdatadir)/i18n
- all: $(BUILT_SOURCES) config.h
-+ $(MAKE) $(AM_MAKEFLAGS) qt4-port
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
- .SUFFIXES:
-
diff --git a/patches/aqbanking_accountgen.patch b/patches/aqbanking_accountgen.patch
deleted file mode 100644
index ac99cbc..0000000
--- a/patches/aqbanking_accountgen.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- a/src/frontends/qbanking/lib/dialogs/qbcfgtabpageaccountgen.ui 2010-06-13 16:40:41.000000000 -0700
-+++ b/src/frontends/qbanking/lib/dialogs/qbcfgtabpageaccountgen.ui 2010-06-13 16:50:05.000000000 -0700
-@@ -187,7 +187,11 @@
- <property name="title">
- <string>Bank Settings</string>
- </property>
-- <widget class="QLineEdit">
-+ <grid>
-+ <property name="name">
-+ <cstring>unnamed</cstring>
-+ </property>
-+ <widget class="QLineEdit" row="2" column="1">
- <property name="name">
- <cstring>bankNameEdit</cstring>
- </property>
-@@ -200,7 +204,7 @@
- </rect>
- </property>
- </widget>
-- <widget class="QLineEdit">
-+ <widget class="QLineEdit" row="1" column="1">
- <property name="name">
- <cstring>bankIdEdit</cstring>
- </property>
-@@ -213,7 +217,7 @@
- </rect>
- </property>
- </widget>
-- <widget class="QComboBox">
-+ <widget class="QComboBox" row="0" column="1">
- <property name="name">
- <cstring>countryCombo</cstring>
- </property>
-@@ -226,7 +230,7 @@
- </rect>
- </property>
- </widget>
-- <widget class="QLabel">
-+ <widget class="QLabel" row="3" column="0">
- <property name="name">
- <cstring>textLabel1_4_3</cstring>
- </property>
-@@ -242,7 +246,7 @@
- <string>BIC</string>
- </property>
- </widget>
-- <widget class="QLabel">
-+ <widget class="QLabel" row="2" column="0">
- <property name="name">
- <cstring>textLabel1_4_2</cstring>
- </property>
-@@ -258,7 +262,7 @@
- <string>Name</string>
- </property>
- </widget>
-- <widget class="QLineEdit">
-+ <widget class="QLineEdit" row="3" column="1">
- <property name="name">
- <cstring>bicEdit</cstring>
- </property>
-@@ -271,7 +275,7 @@
- </rect>
- </property>
- </widget>
-- <widget class="QLabel">
-+ <widget class="QLabel" row="1" column="0">
- <property name="name">
- <cstring>textLabel1_4</cstring>
- </property>
-@@ -287,7 +291,7 @@
- <string>Code</string>
- </property>
- </widget>
-- <widget class="QLabel">
-+ <widget class="QLabel" row="0" column="0">
- <property name="name">
- <cstring>textLabel2_2</cstring>
- </property>
-@@ -303,7 +307,7 @@
- <string>Country</string>
- </property>
- </widget>
-- <widget class="QPushButton">
-+ <widget class="QPushButton" row="1" column="2">
- <property name="name">
- <cstring>bankIdButton</cstring>
- </property>
-@@ -319,6 +323,7 @@
- <string>...</string>
- </property>
- </widget>
-+ </grid>
- </widget>
- <spacer>
- <property name="name">
diff --git a/patches/dot_gnucash.patch b/patches/dot_gnucash.patch
deleted file mode 100644
index 5f17015..0000000
--- a/patches/dot_gnucash.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-Index: AUTHORS
-===================================================================
---- AUTHORS (revision 18612)
-+++ AUTHORS (working copy)
-@@ -240,6 +240,7 @@
- Gavin Porter <maufk at csv.warwick.ac.uk> for euro style dates
- Tomas Pospisek <tpo at spin.ch> Debian patches
- Paul Poulain <famille.p.poulain at free.fr> French translations
-+John Ralls <jralls at ceridwen.fremont.ca.us> MacOSX integration
- Ron Record <rr at sco.com> for SCO Unixware & OpenServer binaries
- Keith Refson <Keith.Refson at earth.ox.ac.uk> Solaris fixes
- Jerry Quinn <jlquinn at optonline.net> Bugfixes
-Index: src/bin/gnucash-setup-env-osx.in
-===================================================================
---- src/bin/gnucash-setup-env-osx.in (revision 18612)
-+++ src/bin/gnucash-setup-env-osx.in (working copy)
-@@ -33,6 +33,7 @@
- export LD_LIBRARY_PATH
- export DYLD_LIBRARY_PATH
- export GNC_STANDARD_REPORTS_DIR
-+export GNC_DOT_DIR="$HOME/Library/Application Support/Gnucash"
-
- if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
- eval `dbus-launch --sh-syntax --exit-with-session --config-file=@-PREFIX-@/etc/dbus-1/session.conf`
-Index: src/engine/gnc-filepath-utils.c
-===================================================================
---- src/engine/gnc-filepath-utils.c (revision 18612)
-+++ src/engine/gnc-filepath-utils.c (working copy)
-@@ -46,133 +46,13 @@
- #include <errno.h>
-
- #include "gnc-engine.h"
-+#include "gnc-path.h"
- #include "gnc-filepath-utils.h"
-
-+
- static QofLogModule log_module = GNC_MOD_BACKEND;
-
-
--/* ====================================================================== */
--/*
-- * If $HOME/.gnucash/data directory doesn't exist, then create it.
-- */
--
--static void
--MakeHomeDir (void)
--{
-- const gchar *home;
-- char *path;
-- char *data;
--
-- /* Punt. Can't figure out where home is. */
-- home = g_get_home_dir();
-- if (!home) return;
--
-- path = g_build_filename(home, ".gnucash", (gchar *)NULL);
--
-- if (!g_file_test(path, G_FILE_TEST_EXISTS))
-- {
-- /* Go ahead and make it. Don't bother much with checking mkdir
-- * for errors; seems pointless. */
-- g_mkdir (path, S_IRWXU); /* perms = S_IRWXU = 0700 */
-- }
--
-- data = g_build_filename (path, "data", (gchar *)NULL);
-- if (!g_file_test(data, G_FILE_TEST_EXISTS))
-- g_mkdir (data, S_IRWXU);
--
-- g_free (path);
-- g_free (data);
--}
--
--/* ====================================================================== */
--
--/* XXX hack alert -- we should be yanking this out of some config file */
--/* These are obviously meant to be hard-coded paths to the gnucash
-- data file. That is insane. These should be thrown out
-- altogether. On non-Unix systems (Windows) these paths would not
-- only have different directory separator characters but these
-- would certainly be completely different paths. I'd vote to
-- throw this out completely. -- cstim, 2006-07-19 */
--static char * searchpaths[] =
--{
-- "/usr/share/gnucash/data",
-- "/usr/local/share/gnucash/data",
-- "/usr/share/gnucash/accounts",
-- "/usr/local/share/gnucash/accounts",
-- NULL,
--};
--
--typedef gboolean (*pathGenerator)(char *pathbuf, int which);
--
--static gboolean
--xaccCwdPathGenerator(char *pathbuf, int which)
--{
-- if(which != 0)
-- {
-- return FALSE;
-- }
-- else
-- {
-- /* try to find a file by this name in the cwd ... */
-- if (getcwd (pathbuf, PATH_MAX) == NULL)
-- return FALSE;
--
-- return TRUE;
-- }
--}
--
--static gboolean
--xaccDataPathGenerator(char *pathbuf, int which)
--{
-- if(which != 0)
-- {
-- return FALSE;
-- }
-- else
-- {
-- const gchar *home;
-- gchar *tmppath;
--
-- home = g_get_home_dir ();
-- if (!home)
-- return FALSE;
--
-- tmppath = g_build_filename (home, ".gnucash", "data", (gchar *)NULL);
-- if (strlen(tmppath) >= PATH_MAX)
-- {
-- g_free (tmppath);
-- return FALSE;
-- }
--
-- g_strlcpy (pathbuf, tmppath, PATH_MAX);
-- g_free (tmppath);
-- return TRUE;
-- }
--}
--
--static gboolean
--xaccUserPathPathGenerator(char *pathbuf, int which)
--{
-- char *path = NULL;
--
-- if(searchpaths[which] == NULL)
-- {
-- return FALSE;
-- }
-- else
-- {
-- path = searchpaths[which];
--
-- if (PATH_MAX <= strlen(path))
-- return FALSE;
--
-- g_strlcpy (pathbuf, path, PATH_MAX);
-- return TRUE;
-- }
--}
--
--/* ====================================================================== */
--
- /**
- * Scrubs a filename by changing "strange" chars (e.g. those that are not
- * valid in a win32 file name) to "_".
-@@ -192,14 +72,36 @@
- }
- }
-
--char *
-+/** \fn gchar * check_file_return_if_true (path)
-+ * \brief Check if the path exists and is a regular file
-+ *
-+ * \param path -- freed if the path doesn't exist or isn't a regular file
-+ *
-+ * \return NULL or the path
-+ */
-+
-+static gchar *
-+check_path_return_if_valid(gchar *path)
-+{
-+ ENTER("Path: %s", path);
-+ if (g_file_test(path, G_FILE_TEST_IS_REGULAR))
-+ {
-+ LEAVE("found %s", path);
-+ return path;
-+ }
-+ g_free (path);
-+ return NULL;
-+}
-+
-+char *
- xaccResolveFilePath (const char * filefrag)
- {
- char pathbuf[PATH_MAX];
-- pathGenerator gens[4];
-+/* pathGenerator gens[4];*/
- char *filefrag_dup;
- int namelen;
- int i;
-+ gchar *fullpath = NULL, *tmp_path = NULL;
-
- /* seriously invalid */
- if (!filefrag)
-@@ -235,73 +137,61 @@
- return g_strdup( filefrag + 4);
- }
-
-+
- /* get conservative on the length so that sprintf(getpid()) works ... */
- /* strlen ("/.LCK") + sprintf (%x%d) */
-- namelen = strlen (filefrag) + 25;
-+ namelen = strlen (filefrag) + 25;
-
-- gens[0] = xaccCwdPathGenerator;
-- gens[1] = xaccDataPathGenerator;
-- gens[2] = xaccUserPathPathGenerator;
-- gens[3] = NULL;
--
-- for (i = 0; gens[i] != NULL; i++)
-+ /* Look in the current working directory */
-+ tmp_path = g_get_current_dir();
-+ fullpath = g_build_filename(tmp_path, filefrag, (gchar *)NULL);
-+ g_free(tmp_path);
-+ fullpath = check_path_return_if_valid(fullpath);
-+ if (fullpath != NULL)
- {
-- int j;
-- for(j = 0; gens[i](pathbuf, j) ; j++)
-- {
-- gchar *fullpath = g_build_filename(pathbuf, filefrag, (gchar *)NULL);
-+ LEAVE("found %s", fullpath);
-+ return fullpath;
-+ }
-
-- if (g_file_test(fullpath, G_FILE_TEST_IS_REGULAR))
-- {
-- LEAVE("found %s", fullpath);
-- return fullpath;
-- }
-- g_free (fullpath);
-- }
-+ /* Look in the data dir (e.g. $PREFIX/share/gnucash) */
-+ tmp_path = gnc_path_get_pkgdatadir();
-+ fullpath = g_build_filename(tmp_path, filefrag, (gchar *)NULL);
-+ g_free(tmp_path);
-+ fullpath = check_path_return_if_valid(fullpath);
-+ if (fullpath != NULL)
-+ {
-+ LEAVE("found %s", fullpath);
-+ return fullpath;
- }
-- /* OK, we didn't find the file. */
-
-- /* make sure that the gnucash home dir exists. */
-- MakeHomeDir();
--
-- filefrag_dup = g_strdup (filefrag);
--
-- /* Replace "strange" chars with "_" for non-file backends. */
-- if (strstr (filefrag, "://"))
-+ /* Look in the config dir (e.g. $PREFIX/etc/gnucash) */
-+ tmp_path = gnc_path_get_accountsdir();
-+ fullpath = g_build_filename(tmp_path, filefrag, (gchar *)NULL);
-+ g_free(tmp_path);
-+ fullpath = check_path_return_if_valid(fullpath);
-+ if (fullpath != NULL)
- {
-- scrub_filename(filefrag_dup);
-+ LEAVE("found %s", fullpath);
-+ return fullpath;
- }
-
-- /* Lets try creating a new file in $HOME/.gnucash/data */
-- if (xaccDataPathGenerator(pathbuf, 0))
-+ /* Look in the users config dir (e.g. $HOME/.gnucash/data) */
-+ fullpath = gnc_build_data_path(filefrag);
-+ if (g_file_test(fullpath, G_FILE_TEST_IS_REGULAR))
- {
-- gchar *result;
-- result = g_build_filename(pathbuf, filefrag_dup, (gchar *)NULL);
-- g_free (filefrag_dup);
-- LEAVE("create new file %s", result);
-- return result;
-- }
--
-- /* OK, we still didn't find the file */
-- /* Lets try creating a new file in the cwd */
-- if (xaccCwdPathGenerator(pathbuf, 0))
-- {
-- gchar *result;
-- result = g_build_filename(pathbuf, filefrag_dup, (gchar *)NULL);
-- g_free (filefrag_dup);
-- LEAVE("create new file %s", result);
-- return result;
-+ LEAVE("found %s", fullpath);
-+ return fullpath;
- }
-+ /* OK, it's not there. Note that it needs to be created and pass it
-+ * back anyway */
-+ LEAVE("create new file %s", fullpath);
-+ return fullpath;
-
-- g_free (filefrag_dup);
--
-- LEAVE("%s not found", filefrag);
-- return NULL;
- }
-
- /* ====================================================================== */
-
--char *
-+char *
- xaccResolveURL (const char * pathfrag)
- {
- GList* list;
-@@ -317,7 +207,7 @@
- * to make sure the uri is in good form.
- */
-
-- if (!g_ascii_strncasecmp (pathfrag, "http://", 7) ||
-+ if (!g_ascii_strncasecmp (pathfrag, "http://", 7) ||
- !g_ascii_strncasecmp (pathfrag, "https://", 8))
- {
- return g_strdup(pathfrag);
-@@ -338,15 +228,6 @@
- }
- }
- g_list_free(list);
--
-- /* "file:" and "xml:" are handled specially */
-- if (!g_ascii_strncasecmp (pathfrag, "file:", 5)) {
-- return (xaccResolveFilePath (pathfrag));
-- }
-- if (!g_ascii_strncasecmp (pathfrag, "xml:", 4)) {
-- return (g_strdup_printf( "xml:%s", xaccResolveFilePath (pathfrag)) );
-- }
--
- return (xaccResolveFilePath (pathfrag));
- }
-
-@@ -393,7 +274,7 @@
- "the file and start GnuCash again.\n"),
- dirname);
- exit(1);
--
-+
- default:
- g_fprintf(stderr,
- _("An unknown error occurred when validating that the\n"
-@@ -428,16 +309,19 @@
- const gchar *
- gnc_dotgnucash_dir (void)
- {
-- static gchar *dotgnucash = NULL, *tmp_dir;
-- const gchar *home;
-+ static gchar *dotgnucash = NULL;
-+ gchar *tmp_dir;
-
- if (dotgnucash)
- return dotgnucash;
-
- dotgnucash = g_strdup(g_getenv("GNC_DOT_DIR"));
-- if (!dotgnucash) {
-- home = g_get_home_dir();
-- if (!home) {
-+
-+ if (!dotgnucash)
-+ {
-+ const gchar *home = g_get_home_dir();
-+ if (!home)
-+ {
- g_warning("Cannot find home directory. Using tmp directory instead.");
- home = g_get_tmp_dir();
- }
-@@ -467,13 +351,26 @@
- gchar *
- gnc_build_book_path (const gchar *filename)
- {
-- char* filename_dup = g_strdup(filename);
-- char* result;
-+ gchar* filename_dup = g_strdup(filename);
-+ gchar* result = NULL;
-
- scrub_filename(filename_dup);
-- result = g_build_filename(gnc_dotgnucash_dir(), "books", filename_dup, (gchar *)NULL);
-+ result = g_build_filename(gnc_dotgnucash_dir(), "books",
-+ filename_dup, (gchar *)NULL);
- g_free(filename_dup);
- return result;
- }
-
-+gchar *
-+gnc_build_data_path (const gchar *filename)
-+{
-+ gchar* filename_dup = g_strdup(filename);
-+ gchar* result;
-+
-+ scrub_filename(filename_dup);
-+ result = g_build_filename(gnc_dotgnucash_dir(), "data", filename_dup, (gchar *)NULL);
-+ g_free(filename_dup);
-+ return result;
-+}
-+
- /* =============================== END OF FILE ========================== */
-Index: src/engine/gnc-filepath-utils.h
-===================================================================
---- src/engine/gnc-filepath-utils.h (revision 18612)
-+++ src/engine/gnc-filepath-utils.h (working copy)
-@@ -49,5 +49,6 @@
- const gchar *gnc_dotgnucash_dir (void);
- gchar *gnc_build_dotgnucash_path (const gchar *filename);
- gchar *gnc_build_book_path (const gchar *filename);
-+gchar *gnc_build_data_path (const gchar *filename);
-
- #endif /* GNC_FILEPATH_UTILS_H */
diff --git a/patches/gnucash-in.patch b/patches/gnucash-in.patch
deleted file mode 100644
index 4130e36..0000000
--- a/patches/gnucash-in.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/bin/gnucash.in 2008-01-07 17:05:50.000000000 -0800
-+++ src/bin/gnucash.in 2009-03-22 22:33:05.000000000 -0700
-@@ -2,6 +2,11 @@
-
- PATH="@-BIN_DIR-@:${PATH}"
- export PATH
-+XDG_CONFIG_DIRS=@-PREFIX-@/etc/xdg
-+export XDG_CONFIG_DIRS
-+XDG_DATA_DIRS=@-PREFIX-@/share
-+export XDG_DATA_DIRS
-+
-
- GUILE_WARN_DEPRECATED="no"
- export GUILE_WARN_DEPRECATED
-@@ -13,6 +18,7 @@
- GUILE_LOAD_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@${GUILE_LOAD_PATH}"
-
- EXTRA_LIBS="${GNC_MODULE_PATH}"
-+EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
- EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_LIB_INSTALLDIR-@"
- EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_PKGLIB_INSTALLDIR-@"
-
-@@ -24,4 +30,8 @@
- export LD_LIBRARY_PATH
- export DYLD_LIBRARY_PATH
-
-+if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-+ eval `dbus-launch --sh-syntax --exit-with-session --config-file=@-PREFIX-@/etc/dbus-1/session.conf`
-+fi
-+
- exec gnucash-bin "$@"
-
---- src/bin/Makefile.in 2009-02-23 12:25:48.000000000 -0700
-+++ src/bin/Makefile.in 2009-03-22 22:32:32.000000000 -0700
-@@ -804,6 +804,7 @@
- gnucash: gnucash.in ${top_builddir}/config.status Makefile
- rm -f $@.tmp
- sed < $< > $@.tmp \
-+ -e 's#@-PREFIX-@#${prefix}#g' \
- -e 's#@-BIN_DIR-@#${bindir}#g' \
- -e 's#@-GNC_GUILE_MODULE_DIR-@#${GNC_SHAREDIR}/guile-modules#g' \
- -e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
deleted file mode 100644
index d3ac78b..0000000
--- a/patches/gnucash-integration.patch
+++ /dev/null
@@ -1,462 +0,0 @@
---- a/configure 2009-02-23 12:25:34.000000000 -0800
-+++ b/configure 2009-05-31 18:26:34.000000000 -0700
-@@ -891,6 +891,10 @@
- DL_LIB
- HAVE_GLIB_2_8_FALSE
- HAVE_GLIB_2_8_TRUE
-+GDK_TARGET_QUARTZ_TRUE
-+GDK_TARGET_QUARTZ_FALSE
-+IGE_MAC_CFLAGS
-+IGE_MAC_LIBS
- GLIB26_LIBS
- GLIB_MKENUMS
- GOBJECT_QUERY
-@@ -26750,5 +26754,124 @@
- esac
-
-
-+
-+### --------------------------------------------------------------------------
-+### Check to see if GDK uses the quartz backend and if we can use
-+### MacOSX integration
-+_gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
-+ if test x$_gdk_tgt = xquartz; then
-+ GDK_TARGET_QUARTZ_TRUE=
-+ GDK_TARGET_QUARTZ_FALSE='#'
-+else
-+ GDK_TARGET_QUARTZ_TRUE='#'
-+ GDK_TARGET_QUARTZ_FALSE=
-+fi
-+
-+if test "x$_gdk_tgt" = xquartz; then
-+
-+ succeeded=no
-+
-+ if test -z "$PKG_CONFIG"; then
-+ # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+ $as_echo_n "(cached) " >&6
-+else
-+ case $PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-+ ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&6; }
-+else
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+ fi
-+
-+ if test "$PKG_CONFIG" = "no" ; then
-+ echo "*** The pkg-config script could not be found. Make sure it is"
-+ echo "*** in your path, or set the PKG_CONFIG environment variable"
-+ echo "*** to the full path to pkg-config."
-+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+ else
-+ pkg_config_min_version=0.9.0
-+ if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-+ { $as_echo "$as_me:$LINENO: checking for ige-mac-integration" >&5
-+$as_echo_n "checking for ige-mac-integration... " >&6; }
-+
-+ if $PKG_CONFIG --silence-errors --exists "ige-mac-integration" ; then
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ succeeded=yes
-+
-+ { $as_echo "$as_me:$LINENO: checking IGE_MAC_CFLAGS" >&5
-+$as_echo_n "checking IGE_MAC_CFLAGS... " >&6; }
-+ IGE_MAC_CFLAGS=`$PKG_CONFIG --cflags "ige-mac-integration"`
-+ { $as_echo "$as_me:$LINENO: result: $IGE_MAC_CFLAGS" >&5
-+$as_echo "$IGE_MAC_CFLAGS" >&6; }
-+
-+ { $as_echo "$as_me:$LINENO: checking IGE_MAC_LIBS" >&5
-+$as_echo_n "checking IGE_MAC_LIBS... " >&6; }
-+ IGE_MAC_LIBS=`$PKG_CONFIG --libs "ige-mac-integration"`
-+ { $as_echo "$as_me:$LINENO: result: $IGE_MAC_LIBS" >&5
-+$as_echo "$IGE_MAC_LIBS" >&6; }
-+ else
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+ IGE_MAC_CFLAGS=""
-+ IGE_MAC_LIBS=""
-+ ## If we have a custom action on failure, don't print errors, but
-+ ## do set a variable so people can do so.
-+ IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ige-mac-integration" 2>&1`
-+ echo $IGE_MAC_PKG_ERRORS
-+ fi
-+
-+
-+
-+ else
-+ echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+ fi
-+ fi
-+
-+ if test $succeeded = yes; then
-+ :
-+ else
-+ { { $as_echo "$as_me:$LINENO: error: Library requirements (ige-mac-integration) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-+$as_echo "$as_me: error: Library requirements (ige-mac-integration) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+
-+
-+
-+fi
-+
- ### --------------------------------------------------------------------------
- ### Guile version checks (should this be something other than the Gnome check?
-@@ -33564,6 +33692,13 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-+if test -z "${GDK_TARGET_QUARTZ_TRUE}" && test -z "${GDK_TARGET_QUARTZ_FALSE}";then
-+ { { $as_echo "$as_me:$LINENO: error: conditional \"GDK_TARGET_QUARTZ\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+$as_echo "$as_me: error: conditional \"GDK_TARGET_QUARTZ\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- if test -z "${GUILE_TRUE}" && test -z "${GUILE_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"GUILE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
---- a/src/engine/Makefile.in 2009-02-23 12:25:25.000000000 -0800
-+++ b/src/engine/Makefile.in 2009-06-01 09:52:04.000000000 -0700
-@@ -215,6 +214,8 @@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -374,6 +376,7 @@
- -I${top_srcdir}/src/gnc-module \
- ${QOF_CFLAGS} \
- ${GLIB_CFLAGS} \
-+ ${IGE_MAC_CFLAGS} \
- ${GUILE_INCS}
-
- libgncmod_engine_la_SOURCES = \
-@@ -477,6 +480,7 @@
- ${REGEX_LIBS} \
- ${GLIB_LIBS} \
- ${BINRELOC_LIBS} \
-+ ${IGE_MAC_LIBS} \
- ${top_builddir}/lib/libc/libc-missing.la
-
- gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
---- a/src/gnome-utils/Makefile.in 2009-02-23 12:25:26.000000000 -0800
-+++ b/src/gnome-utils/Makefile.in 2009-06-01 09:52:04.000000000 -0700
-@@ -280,6 +280,8 @@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -439,7 +441,8 @@
- -I${top_srcdir}/src -I${top_builddir}/src \
- -I${top_srcdir}/lib/libc ${GLIB_CFLAGS} ${GLADE_CFLAGS} \
- ${GTK_CFLAGS} ${GNOME_CFLAGS} ${GTKHTML_CFLAGS} ${GUILE_INCS} \
-- ${QOF_CFLAGS} ${GOFFICE_CFLAGS} $(am__append_3)
-+ ${QOF_CFLAGS} ${GOFFICE_CFLAGS} $(IGE_MAC_CFLAGS) \
-+ $(am__append_3)
- libgncmod_gnome_utils_la_SOURCES = QuickFill.c account-quickfill.c \
- cursors.c dialog-account.c dialog-book-close.c \
- dialog-commodity.c dialog-options.c dialog-preferences.c \
-@@ -557,8 +560,8 @@
- $(top_builddir)/lib/libc/libc-missing.la ${GNOME_LIBS} \
- ${GTKHTML_LIBS} ${GUILE_LIBS} ${GDK_PIXBUF_LIBS} ${GLADE_LIBS} \
- ${GUILE_LIBS} ${GLIB_LIBS} ${DB_LIBS} ${QOF_LIBS} \
-- ${GOFFICE_LIBS} ${REGEX_LIBS} ${LIBXML2_LIBS} $(am__append_1) \
-- $(am__append_4)
-+ ${GOFFICE_LIBS} ${REGEX_LIBS} ${LIBXML2_LIBS} ${IGE_MAC_LIBS} \
-+ $(am__append_1) $(am__append_4)
- gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
- gncmod_DATA = gnome-utils.scm
- gncscmdir = ${GNC_SHAREDIR}/scm
-diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c
-index a664630..42ed231 100644
---- a/src/gnome-utils/gnc-main-window.c
-+++ b/src/gnome-utils/gnc-main-window.c
-@@ -32,7 +32,6 @@
- @author Copyright (C) 2003 Jan Arne Petersen <jpetersen at uni-bonn.de>
- @author Copyright (C) 2003,2005,2006 David Hampton <hampton at employees.org>
- */
--
- #include "config.h"
-
- #include <gnome.h>
-@@ -67,6 +66,9 @@
- // +JSLED
- #include "gnc-html.h"
- #include "gnc-autosave.h"
-+#ifdef MAC_INTEGRATION
-+#include <igemacintegration/ige-mac-integration.h>
-+#endif
-
- /** Names of signals generated by the main window. */
- enum {
-@@ -145,6 +147,9 @@ static void do_popup_menu(GncPluginPage *page, GdkEventButton *event);
- static gboolean gnc_main_window_popup_menu_cb (GtkWidget *widget, GncPluginPage *page);
-
- static GtkAction *gnc_main_window_find_action (GncMainWindow *window, const gchar *name);
-+#ifdef MAC_INTEGRATION
-+static void gtk_quartz_set_menu(GncMainWindow* window);
-+#endif
-
- /** The instance private data structure for an embedded window
- * object. */
-@@ -1344,7 +1349,14 @@ gnc_main_window_update_one_menu_action (GncMainWindow *window,
- "label", data->label,
- "visible", data->visible,
- (char *)NULL);
-- LEAVE(" ");
-+#ifdef MAC_INTEGRATION
-+ {
-+ GtkWidget *menu = gtk_ui_manager_get_widget(window->ui_merge,
-+ "/menubar"
-+);
-+ ige_mac_menu_sync(GTK_MENU_SHELL( menu ));
-+ }
-+ #endif LEAVE(" ");
- }
-
-
-@@ -1900,6 +1912,9 @@ gnc_main_window_init (GncMainWindow *window,
- qof_event_register_handler(gnc_main_window_event_handler, window);
-
- gnc_main_window_setup_window (window);
-+#ifdef MAC_INTEGRATION
-+ gtk_quartz_set_menu(window);
-+#endif
- gnc_gobject_tracking_remember(G_OBJECT(window),
- G_OBJECT_CLASS(klass));
- }
-@@ -2948,6 +2963,44 @@ gnc_main_window_setup_window (GncMainWindow *window)
- LEAVE(" ");
- }
-
-+#ifdef MAC_INTEGRATION
-+static void
-+gtk_quartz_set_menu(GncMainWindow* window) {
-+ IgeMacMenuGroup *group;
-+ GtkWidget *menu;
-+ GtkWidget *item;
-+
-+ menu = gtk_ui_manager_get_widget (window->ui_merge, "/menubar");
-+ if (GTK_IS_MENU_ITEM (menu))
-+ menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
-+ gtk_widget_hide(menu);
-+ ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (menu));
-+
-+ item = gtk_ui_manager_get_widget (window->ui_merge,
-+ "/menubar/File/FileQuit");
-+ if (GTK_IS_MENU_ITEM (item))
-+ ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (item));
-+
-+ /* the about group */
-+ group = ige_mac_menu_add_app_menu_group ();
-+
-+ item = gtk_ui_manager_get_widget (window->ui_merge,
-+ "/menubar/Help/HelpAbout");
-+ if (GTK_IS_MENU_ITEM (item))
-+ ige_mac_menu_add_app_menu_item (group, GTK_MENU_ITEM (item),
-+ _("About GnuCash"));
-+
-+ /* the preferences group */
-+ group = ige_mac_menu_add_app_menu_group ();
-+
-+ item = gtk_ui_manager_get_widget (window->ui_merge,
-+ "/menubar/Edit/EditPreferences");
-+ if (GTK_IS_MENU_ITEM (item))
-+ ige_mac_menu_add_app_menu_item (group, GTK_MENU_ITEM (item), NULL);
-+
-+}
-+#endif //MAC_INTEGRATION
-+
- /* Callbacks */
- static void
- gnc_main_window_add_widget (GtkUIManager *merge,
-diff --git a/src/engine/binreloc.c b/src/engine/binreloc.c
-index d582a5d..032f2af 100644
---- a/src/engine/binreloc.c
-+++ b/src/engine/binreloc.c
-@@ -18,6 +18,9 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
-+#ifdef MAC_INTEGRATION
-+#include <igemacintegration/ige-mac-bundle.h>
-+#endif
- #endif /* ENABLE_BINRELOC */
- #include <stdio.h>
- #include <stdlib.h>
-@@ -27,7 +30,9 @@
- #include <glib.h>
-
- G_BEGIN_DECLS
--
-+#if defined ENABLE_BINRELOC && defined MAC_INTEGRATION
-+static IgeMacBundle *bundle = NULL;
-+#endif
-
- /** @internal
- * Find the canonical filename of the executable. Returns the filename
-@@ -61,6 +66,25 @@ _br_find_exe (GbrInitError *error)
- (char*)NULL);
- g_free (prefix);
- return result;
-+#elif MAC_INTEGRATION
-+ gchar *prefix = NULL, *result = NULL;
-+ g_type_init();
-+ bundle = ige_mac_bundle_get_default();
-+ if (!bundle) {
-+ *error = GBR_INIT_ERROR_MAC_NOT_BUNDLE;
-+ return NULL;
-+ }
-+ if (!ige_mac_bundle_get_is_app_bundle (bundle)) {
-+ *error = GBR_INIT_ERROR_MAC_NOT_APP_BUNDLE;
-+ bundle = NULL;
-+ return NULL;
-+ }
-+ ige_mac_bundle_setup_environment(bundle);
-+ prefix = g_strdup(ige_mac_bundle_get_path(bundle));
-+ result = g_build_filename(prefix, "Contents/MacOS",
-+ "gnucash-bin.exe", NULL);
-+ g_free(prefix);
-+ return result;
- #else
- char *path, *path2, *line, *result;
- size_t buf_size;
-@@ -202,7 +224,7 @@ _br_find_exe_for_symbol (const void *symbol, GbrInitError *error)
- *error = GBR_INIT_ERROR_DISABLED;
- return (char *) NULL;
- #else
--#ifdef G_OS_WIN32
-+#if defined G_OS_WIN32 || defined MAC_INTEGRATION
- g_warning ("_br_find_exe_for_symbol not implemented on win32.");
- if (error)
- *error = GBR_INIT_ERROR_DISABLED;
-@@ -414,6 +414,12 @@ set_gerror (GError **error, GbrInitError errcode)
- case GBR_INIT_ERROR_INVALID_MAPS:
- error_message = "The file format of /proc/self/maps is invalid.";
- break;
-+ case GBR_INIT_ERROR_MAC_NOT_BUNDLE:
-+ error_message = "Binreloc did not find a bundle";
-+ break;
-+ case GBR_INIT_ERROR_MAC_NOT_APP_BUNDLE:
-+ error_message = "Binreloc found that the bundle is not an app bundle";
-+ break;
- case GBR_INIT_ERROR_DISABLED:
- error_message = "Binary relocation support is disabled.";
- break;
-@@ -474,18 +496,33 @@ gbr_find_prefix (const gchar *default_prefix)
- {
- gchar *dir1, *dir2;
-
-- if (exe == NULL) {
-+#if defined ENABLE_BINRELOC && defined MAC_INTEGRATION
-+ gchar *prefix = NULL, *result = NULL;
-+ if (bundle == NULL) {
- /* BinReloc not initialized. */
- if (default_prefix != NULL)
- return g_strdup (default_prefix);
- else
- return NULL;
- }
-+ prefix = g_strdup(ige_mac_bundle_get_path(bundle));
-+ result = g_build_filename(prefix, "Contents/Resources", NULL);
-+ g_free(prefix);
-+ return result;
-+#else
-
-+ if (exe == NULL) {
-+ /* BinReloc not initialized. */
-+ if (default_prefix != NULL)
-+ return g_strdup (default_prefix);
-+ else
-+ return NULL;
-+ }
- dir1 = g_path_get_dirname (exe);
- dir2 = g_path_get_dirname (dir1);
- g_free (dir1);
- return dir2;
-+#endif //ENABLE_BINRELOC && MAC_INTEGRATION
- }
-
-
-@@ -506,6 +543,19 @@ gchar *
- gbr_find_bin_dir (const gchar *default_bin_dir)
- {
- gchar *prefix, *dir;
-+#if defined ENABLE_BINRELOC && defined MAC_INTEGRATION
-+ if (bundle == NULL) {
-+ /* BinReloc not initialized. */
-+ if (default_bin_dir != NULL)
-+ return g_strdup (default_bin_dir);
-+ else
-+ return NULL;
-+ }
-+ prefix = g_strdup(ige_mac_bundle_get_path(bundle));
-+ dir = g_build_filename(prefix, "Contents/MacOS", NULL);
-+ g_free(prefix);
-+ return dir;
-+#else
-
- prefix = gbr_find_prefix (NULL);
- if (prefix == NULL) {
-@@ -519,4 +569,5 @@ gbr_find_bin_dir (const gchar *default_bin_dir)
- dir = g_build_filename (prefix, "bin", NULL);
- g_free (prefix);
- return dir;
-+#endif //ENABLE_BINRELOC && MAC_INTEGRATION
- }
-diff -u src/engine/binreloc.h
---- a/src/engine/binreloc.h 2008-01-07 17:06:44.000000000 -0800
-+++ b/src/engine/binreloc.h 2009-08-27 14:50:44.000000000 -0700
-@@ -28,6 +28,10 @@
- GBR_INIT_ERROR_READ_MAPS,
- /** The file format of /proc/self/maps is invalid; kernel bug? */
- GBR_INIT_ERROR_INVALID_MAPS,
-+ /** BinReloc determined that gnucash is not running from a bundle */
-+ GBR_INIT_ERROR_MAC_NOT_BUNDLE,
-+ /** Binreloc determined that the bundle is not an app bundle */
-+ GBR_INIT_ERROR_MAC_NOT_APP_BUNDLE,
- /** BinReloc is disabled (the ENABLE_BINRELOC macro is not defined). */
- GBR_INIT_ERROR_DISABLED
- } GbrInitError;
diff --git a/patches/gnucash-xlib.patch b/patches/gnucash-xlib.patch
deleted file mode 100644
index 818476f..0000000
--- a/patches/gnucash-xlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure 2009-02-23 12:25:34.000000000 -0800
-+++ configure 2009-03-23 11:37:40.000000000 -0700
-@@ -24912,7 +24912,7 @@
- # These are unavailable on windows/mingw32
-
-
--for ac_header in X11/Xlib.h glob.h
-+for ac_header in glob.h
- do
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
commit 0f9693c31d1c07814dea378eb79de33a6803154f
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jan 27 09:48:05 2012 -0800
Update for 2.4.10 release
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index cd0d577..6aea97f 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.4.9 © 2012 Gnucash Contributors</string>
+ <string>Gnucash version 2.4.10 © 2012 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4.9 © 2011 Gnucash Contributers</string>
+ <string>2.4.10 © 2012 Gnucash Contributers</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4.9</string>
+ <string>2.4.10</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.4.9</string>
+ <string>2.4.10</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 599b5a0..1e6f0ff 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -204,7 +204,7 @@
<autotools id="gnucash"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
<!--branch module="gnucash" revision="20812" repo="svn.gnucash.org"-->
- <branch module="gnucash/stable/gnucash-2.4.9.tar.bz2" version="2.4.9"
+ <branch module="gnucash/stable/gnucash-2.4.10.tar.bz2" version="2.4.10"
repo="sourceforge">
</branch>
<dependencies>
commit b57b194674f191da5e2f76684963aca8e003e5fb
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jan 21 12:04:08 2012 -0800
Fix URL on swig-quile patch
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 2603328..599b5a0 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -134,7 +134,7 @@
<autotools id="swig">
<branch repo="sourceforge" module="swig/swig-2.0.4.tar.gz" version="2.0.4">
- <patch file="http://raw.github.com/jralls/gnucash-on-osx/master/patches/0001-Updated-swig-guile-deprecated-patch.patch"
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/0001-Updated-swig-guile-deprecated-patch.patch"
strip="1"/>
</branch>
<dependencies>
commit a0fcfd07ffe6aed9fe16e43239855efda4b4fe39
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jan 17 21:50:16 2012 -0800
Patch swig to not generate guile code with deprecated functions
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index ce7ed9b..2603328 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -134,7 +134,7 @@
<autotools id="swig">
<branch repo="sourceforge" module="swig/swig-2.0.4.tar.gz" version="2.0.4">
- <patch file="/Users/john/0001-Updated-swig-guile-deprecated-patch.patch"
+ <patch file="http://raw.github.com/jralls/gnucash-on-osx/master/patches/0001-Updated-swig-guile-deprecated-patch.patch"
strip="1"/>
</branch>
<dependencies>
diff --git a/patches/0001-Updated-swig-guile-deprecated-patch.patch b/patches/0001-Updated-swig-guile-deprecated-patch.patch
new file mode 100644
index 0000000..d69f698
--- /dev/null
+++ b/patches/0001-Updated-swig-guile-deprecated-patch.patch
@@ -0,0 +1,186 @@
+From 908eab348ca34f6a8c765682179eb00b8c3bee95 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls at ceridwen.us>
+Date: Fri, 30 Dec 2011 12:05:12 -0800
+Subject: [PATCH] Updated swig-guile-deprecated patch
+
+---
+ Lib/guile/ghinterface.i | 8 ++++++++
+ Lib/guile/guile_gh_run.swg | 13 ++++++++++---
+ Lib/guile/guile_scm_run.swg | 30 +++++++++++++++++++++++-------
+ Lib/guile/typemaps.i | 2 +-
+ Source/Modules/guile.cxx | 16 ++++++++++++++++
+ configure.in | 1 +
+ 6 files changed, 59 insertions(+), 11 deletions(-)
+
+diff --git a/Lib/guile/ghinterface.i b/Lib/guile/ghinterface.i
+index c5fda62..2a9e549 100644
+--- a/Lib/guile/ghinterface.i
++++ b/Lib/guile/ghinterface.i
+@@ -20,7 +20,11 @@
+ #define gh_scm2int(a) scm_num2int(a, SCM_ARG1, FUNC_NAME)
+ #define gh_scm2long(a) scm_num2long(a, SCM_ARG1, FUNC_NAME)
+ #define gh_scm2short(a) scm_num2short(a, SCM_ARG1, FUNC_NAME)
++#ifdef HAVE_SCM_TO_LOCALE_STRINGN
++#define gh_scm2newstr scm_to_locale_stringn
++#else
+ #define gh_scm2newstr SWIG_Guile_scm2newstr
++#endif
+ #define gh_scm2ulong(a) scm_num2ulong(a, SCM_ARG1, FUNC_NAME)
+ #define gh_scm2ushort(a) scm_num2ushort(a, SCM_ARG1, FUNC_NAME)
+ #define gh_scm2uint(a) scm_num2uint(a, SCM_ARG1, FUNC_NAME)
+@@ -31,7 +35,11 @@
+ #define gh_scm2long_long(a) scm_num2long_long(a, SCM_ARG1, FUNC_NAME)
+ #define gh_ulong_long2scm scm_ulong_long2num
+ #define gh_scm2ulong_long(a) scm_num2ulong_long(a, SCM_ARG1, FUNC_NAME)
++#ifdef HAVE_SCM_IS_STRING
++#define gh_string_p scm_is_string
++#else
+ #define gh_string_p SCM_STRINGP
++#endif
+ #define gh_vector_length SCM_VECTOR_LENGTH
+ #define gh_vector_p SCM_VECTORP
+ #define gh_vector_ref scm_vector_ref
+diff --git a/Lib/guile/guile_gh_run.swg b/Lib/guile/guile_gh_run.swg
+index 0eba1f9..a15ffc2 100644
+--- a/Lib/guile/guile_gh_run.swg
++++ b/Lib/guile/guile_gh_run.swg
+@@ -17,10 +17,17 @@ extern "C" {
+
+ typedef SCM (*swig_guile_proc)();
+
+-#define SWIG_malloc(size) \
+- SCM_MUST_MALLOC(size)
++#ifdef HAVE_SCM_MALLOC
++#define SWIG_malloc(size)\
++ scm_malloc(size)
+ #define SWIG_free(mem) \
+- scm_must_free(mem)
++ free(mem)
++#else
++ #define SWIG_malloc(size) \
++ SCM_MUST_MALLOC(size)
++ #define SWIG_free(mem) \
++ scm_must_free(mem)
++#endif
+ #define SWIG_ConvertPtr(s, result, type, flags) \
+ SWIG_Guile_ConvertPtr(&swig_module, s, result, type, flags)
+ #define SWIG_MustGetPtr(s, type, argnum, flags) \
+diff --git a/Lib/guile/guile_scm_run.swg b/Lib/guile/guile_scm_run.swg
+index 91b7409..46cec56 100644
+--- a/Lib/guile/guile_scm_run.swg
++++ b/Lib/guile/guile_scm_run.swg
+@@ -20,12 +20,22 @@ typedef struct swig_guile_clientdata {
+ SCM goops_class;
+ } swig_guile_clientdata;
+
+-#define SWIG_scm2str(s) \
+- SWIG_Guile_scm2newstr(s, NULL)
+-#define SWIG_malloc(size) \
+- SCM_MUST_MALLOC(size)
++#if (defined HAVE_SCM_TO_LOCALE_STRING) && (defined HAVE_SCM_TO_LOCALE_STRINGN)
++#define SWIG_scm2str(s) scm_to_locale_string(s)
++#else
++#define SWIG_scm2str(s) SWIG_Guile_scm2newstr(s, NULL)
++#endif
++#ifdef HAVE_SCM_MALLOC
++#define SWIG_malloc(size)\
++ scm_malloc(size)
+ #define SWIG_free(mem) \
+- scm_must_free(mem)
++ free(mem)
++#else
++ #define SWIG_malloc(size) \
++ SCM_MUST_MALLOC(size)
++ #define SWIG_free(mem) \
++ scm_must_free(mem)
++#endif
+ #define SWIG_ConvertPtr(s, result, type, flags) \
+ SWIG_Guile_ConvertPtr(s, result, type, flags)
+ #define SWIG_MustGetPtr(s, type, argnum, flags) \
+@@ -56,16 +66,21 @@ typedef struct swig_guile_clientdata {
+ static swig_module_info *SWIG_Guile_GetModule(void);
+ #define SWIG_GetModule(clientdata) SWIG_Guile_GetModule()
+ #define SWIG_SetModule(clientdata, pointer) SWIG_Guile_SetModule(pointer)
+-
++
++#ifndef HAC_SCM_TO_LOCALE_STRINGN
+ SWIGINTERN char *
+ SWIG_Guile_scm2newstr(SCM str, size_t *len) {
+ #define FUNC_NAME "SWIG_Guile_scm2newstr"
+ char *ret;
+ size_t l;
+
+- SCM_ASSERT (SCM_STRINGP(str), str, 1, FUNC_NAME);
++ SCM_ASSERT (gh_string_p(str), str, 1, FUNC_NAME);
+
++ #ifdef HAC_SCM_C_STRING_LENGTH
++ l = scn_c_string_length(str);
++ #else
+ l = SCM_STRING_LENGTH(str);
++ #endif
+ ret = (char *) SWIG_malloc( (l + 1) * sizeof(char));
+ if (!ret) return NULL;
+
+@@ -75,6 +90,7 @@ SWIG_Guile_scm2newstr(SCM str, size_t *len) {
+ return ret;
+ #undef FUNC_NAME
+ }
++#endif
+
+ static int swig_initialized = 0;
+ static scm_t_bits swig_tag = 0;
+diff --git a/Lib/guile/typemaps.i b/Lib/guile/typemaps.i
+index edf227d..3bf969d 100644
+--- a/Lib/guile/typemaps.i
++++ b/Lib/guile/typemaps.i
+@@ -427,7 +427,7 @@ typedef unsigned long SCM;
+ }
+
+ %typecheck(SWIG_TYPECHECK_STRING) char * {
+- $1 = SCM_STRINGP($input) ? 1 : 0;
++ $1 = gh_string_p($input) ? 1 : 0;
+ }
+
+ %typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *, SWIGTYPE &, SWIGTYPE [] {
+diff --git a/Source/Modules/guile.cxx b/Source/Modules/guile.cxx
+index bdf11ee..4d81587 100644
+--- a/Source/Modules/guile.cxx
++++ b/Source/Modules/guile.cxx
+@@ -335,6 +335,22 @@ public:
+ Printf(f_runtime, "\n");
+ Printf(f_runtime, "#define SWIGGUILE\n");
+
++ #ifdef HAVE_SCM_MALLOC
++ Printf(f_runtime, "#define HAVE_SCM_MALLOC 1\n");
++ #endif
++ #ifdef HAVE_SCM_IS_STRING
++ Printf(f_runtime, "#define HAVE_SCM_IS_STRING 1\n");
++ #endif
++ #ifdef HAVE_SCM_C_STRING_LENGTH
++ Printf(f_runtime, "#define HAVE_SCM_C_STRING_LENGTH 1\n");
++ #endif
++ #ifdef HAVE_SCM_TO_LOCALE_STRING
++ Printf(f_runtime, "#define HAVE_SCM_TO_LOCALE_STRING 1\n");
++ #endif
++ #ifdef HAVE_SCM_TO_LOCALE_STRINGN
++ Printf(f_runtime, "#define HAVE_SCM_TO_LOCALE_STRINGN 1\n");
++ #endif
++
+ if (!use_scm_interface) {
+ if (SwigRuntime == 1)
+ Printf(f_runtime, "#define SWIG_GLOBAL\n");
+diff --git a/configure.in b/configure.in
+index 7e3b43d..42ee248 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1266,6 +1266,7 @@ else
+ AC_MSG_RESULT(no)
+ fi
+ CFLAGS=$guilesafe_CFLAGS
++AC_CHECK_FUNCS(scm_malloc scm_is_string scm_c_string_length scm_to_locale_string scm_to_locale_stringn)
+ LIBS=$guilesafe_LIBS
+ fi
+
+--
+1.7.6.3.dirty
+
commit af883fdaa53a6a32e7355a2b532a3543e03cffe4
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jan 13 10:58:34 2012 -0800
Switch Webkit dependency from WebKit to meta-gtk-osx-webkit; makes sure that the correct soft dependencies are enabled.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 19aded2..ce7ed9b 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -212,7 +212,7 @@
<dep package="libofx"/>
<dep package="aqbanking"/>
<dep package="libgnomeui"/>
- <dep package="WebKit"/>
+ <dep package="meta-gtk-osx-webkit"/>
<dep package="Slib"/>
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
@@ -230,7 +230,7 @@
<dep package="libofx"/>
<dep package="aqbanking"/>
<dep package="libgnomeui"/>
- <dep package="WebKit"/>
+ <dep package="meta-gtk-osx-webkit"/>
<dep package="Slib"/>
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
@@ -250,7 +250,7 @@
<dep package="libofx"/>
<dep package="aqbanking"/>
<dep package="libgnomeui"/>
- <dep package="WebKit"/>
+ <dep package="meta-gtk-osx-webkit"/>
<dep package="Slib"/>
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
@@ -269,7 +269,7 @@
<dep package="meta-gtk-osx-core"/>
<dep package="libofx"/>
<dep package="aqbanking"/>
- <dep package="WebKit"/>
+ <dep package="meta-gtk-osx-webkit"/>
<dep package="libgnomeui"/>
<dep package="Slib"/>
<dep package="goffice"/>
commit 7d13eb9719216c63e6eaefbfffcc5a2539815d3d
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jan 13 10:36:17 2012 -0800
Remove iso-codes; duplicates an entry in gtk-osx-unsupported modules.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 3d425ea..19aded2 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -30,8 +30,6 @@
href="http://www.cmake.org/files/"/>
<repository type="svn" name="aquamaniac"
href="http://devel.aqbanking.de/svn/"/>
- <repository type="tarball" name="iso-codes"
- href="http://ftp.us.debian.org/debian/pool/main/i/iso-codes/"/>
<repository type="git" name="github"
href="git://github.com/"/>
@@ -39,10 +37,6 @@
<!-- <include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/> -->
<include href="gtkhtml.modules"/>
- <autotools id="iso-codes" autogen-sh="configure">
- <branch module="iso-codes_3.28.orig.tar.bz2" version="3.28" repo="iso-codes" checkoutdir="iso-codes-3.28"/>
- </autotools>
-
<autotools id="libchipcard" autogen-sh="configure" >
<branch module="libchipcard-5.0.2.tar.gz" version="5.0.2"
repo="github_gnucash" />
commit 0021af4af7ae3434a76d02c568427cdec1d33a56
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jan 10 14:05:23 2012 -0800
Bump Gnucash Version to 2.4.9
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index d901359..cd0d577 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.4.7 © 2011 Gnucash Contributors</string>
+ <string>Gnucash version 2.4.9 © 2012 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4.7 © 2011 Gnucash Contributers</string>
+ <string>2.4.9 © 2011 Gnucash Contributers</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4.7</string>
+ <string>2.4.9</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.4.7</string>
+ <string>2.4.9</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
@@ -62,6 +62,6 @@
<key>LSMinimumSystemVersion</key>
<string>10.5.0</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2011 Gnucash Contributors</string>
+ <string>Copyright 2012 Gnucash Contributors</string>
</dict>
</plist>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 77ee776..3d425ea 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -139,7 +139,10 @@
</autotools>
<autotools id="swig">
- <branch repo="sourceforge" module="swig/swig-2.0.4.tar.gz" version="2.0.4"/>
+ <branch repo="sourceforge" module="swig/swig-2.0.4.tar.gz" version="2.0.4">
+ <patch file="/Users/john/0001-Updated-swig-guile-deprecated-patch.patch"
+ strip="1"/>
+ </branch>
<dependencies>
<dep package="pcre"/>
</dependencies>
@@ -207,7 +210,7 @@
<autotools id="gnucash"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
<!--branch module="gnucash" revision="20812" repo="svn.gnucash.org"-->
- <branch module="gnucash/stable/gnucash-2.4.8.tar.bz2" version="2.4.8"
+ <branch module="gnucash/stable/gnucash-2.4.9.tar.bz2" version="2.4.9"
repo="sourceforge">
</branch>
<dependencies>
commit 0b0a35963a8f0e8b9bf3c94d71795171353e9b87
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Nov 21 19:57:07 2011 -0800
[modulesets] Fix bad include in gnucash.modules
Thanks to Brad Grupczynski for noticing.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index c0ad56d..77ee776 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -35,8 +35,8 @@
<repository type="git" name="github"
href="git://github.com/"/>
- <!--include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/-->
- <include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
+ <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
+<!-- <include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/> -->
<include href="gtkhtml.modules"/>
<autotools id="iso-codes" autogen-sh="configure">
commit 897b50d9c54fc0a4043f9618ef92193b2644fb32
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 20 22:08:19 2011 -0700
Update version for 2.4.8 release
diff --git a/gnucash-bundler/gnucash.launcher b/gnucash-bundler/gnucash.launcher
index 9609278..70d9d0a 100755
--- a/gnucash-bundler/gnucash.launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -1,10 +1,10 @@
#!/bin/sh
-if test "x$IGE_DEBUG_LAUNCHER" != x; then
+if test "x$GTK_DEBUG_LAUNCHER" != x; then
set -x
fi
-if test "x$IGE_DEBUG_GDB" != x; then
+if test "x$GTK_DEBUG_GDB" != x; then
EXEC="gdb --args"
else
EXEC=exec
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index c690425..c0ad56d 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -207,7 +207,7 @@
<autotools id="gnucash"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
<!--branch module="gnucash" revision="20812" repo="svn.gnucash.org"-->
- <branch module="gnucash/stable/gnucash-2.4.7.tar.gz" version="2.4.7"
+ <branch module="gnucash/stable/gnucash-2.4.8.tar.bz2" version="2.4.8"
repo="sourceforge">
</branch>
<dependencies>
commit 11775f4254e1a0fb98110113cb1a507016fa44ce
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 30 14:20:04 2011 -0700
Move general use patches from gnucash-on-osx to gtk-osx.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index cd1c3cd..c690425 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -35,8 +35,8 @@
<repository type="git" name="github"
href="git://github.com/"/>
- <include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/>
- <!--include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
+ <!--include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/-->
+ <include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
<include href="gtkhtml.modules"/>
<autotools id="iso-codes" autogen-sh="configure">
diff --git a/patches/dbus-install.patch b/patches/dbus-install.patch
deleted file mode 100644
index c0d445b..0000000
--- a/patches/dbus-install.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- Makefile.in~ 2009-10-15 14:49:03.000000000 -0700
-+++ Makefile.in 2009-10-15 16:39:10.000000000 -0700
---- Makefile.in 2009-01-06 16:30:43.000000000 -0800
-+++ Makefile.in 2009-04-19 15:06:17.000000000 -0700
-@@ -851,6 +851,8 @@
- info-am:
-
- install-data-am: install-pkgconfigDATA
-+ @$(NORMAL_INSTALL)
-+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
-
- install-dvi: install-dvi-recursive
-
-@@ -899,7 +899,7 @@
- uninstall-am: uninstall-pkgconfigDATA
-
- .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-- ctags-recursive install-am install-strip tags-recursive
-+ ctags-recursive install-am install-data-am install-strip tags-recursive
-
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am all-local am--refresh check check-am clean \
-@@ -911,14 +911,15 @@
- distclean-hdr distclean-libtool distclean-tags distcleancheck \
- distdir distuninstallcheck dvi dvi-am html html-am info \
- info-am install install-am install-data install-data-am \
-- install-dvi install-dvi-am install-exec install-exec-am \
-- install-html install-html-am install-info install-info-am \
-- install-man install-pdf install-pdf-am install-pkgconfigDATA \
-- install-ps install-ps-am install-strip installcheck \
-- installcheck-am installdirs installdirs-am maintainer-clean \
-- maintainer-clean-generic mostlyclean mostlyclean-generic \
-- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-- uninstall uninstall-am uninstall-pkgconfigDATA
-+ install-data-hook install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-man install-pdf install-pdf-am \
-+ install-pkgconfigDATA install-ps install-ps-am install-strip \
-+ installcheck installcheck-am installdirs installdirs-am \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps \
-+ ps-am tags tags-recursive uninstall uninstall-am \
-+ uninstall-pkgconfigDATA
-
-
- all-local: Doxyfile
-@@ -956,6 +957,10 @@
- @DBUS_GCOV_ENABLED_FALSE at check-coverage:
- @DBUS_GCOV_ENABLED_FALSE@ echo "Need to reconfigure with --enable-gcov"
-
-+
-+install-data-hook:
-+ $(mkinstalldirs) $(DESTDIR)/tmp
-+ $(DESTDIR)$(bindir)/dbus-uuidgen --ensure=$(DESTDIR)$(localstatedir)/lib/dbus/machine-id
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/libtasn1.patch b/patches/libtasn1.patch
deleted file mode 100644
index 65845ac..0000000
--- a/patches/libtasn1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: lib/gllib/Makefile.am
-==============================================
-*** lib/gllib/Makefile.am Fri Jan 16 03:30:43 2009
---- lib/gllib/Makefile.am Fri Mar 20 10:59:24 2009
-***************
-*** 28,40 ****
-
- AM_CPPFLAGS =
-
-! noinst_LTLIBRARIES += libgnu.la
-
-! libgnu_la_SOURCES =
-! libgnu_la_LIBADD = $(lgl_LTLIBOBJS)
-! libgnu_la_DEPENDENCIES = $(lgl_LTLIBOBJS)
-! EXTRA_libgnu_la_SOURCES =
-! libgnu_la_LDFLAGS = $(AM_LDFLAGS)
-
- ## begin gnulib module link-warning
-
---- 28,40 ----
-
- AM_CPPFLAGS =
-
-! # noinst_LTLIBRARIES += libgnu.la
-
-! # libgnu_la_SOURCES =
-! # libgnu_la_LIBADD = $(lgl_LTLIBOBJS)
-! # libgnu_la_DEPENDENCIES = $(lgl_LTLIBOBJS)
-! # EXTRA_libgnu_la_SOURCES =
-! # libgnu_la_LDFLAGS = $(AM_LDFLAGS)
-
- ## begin gnulib module link-warning
commit 960a93af618fcae918bc9b8d0011e2c41d1a7846
Merge: 645b8a6 7b87025
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 13 11:00:11 2011 -0700
Merge pull request #2 from gjanssens/master
Choose another repository for pkg-isocodes
commit 7b870258fa5d86496d5ad52c583a394f11b002d8
Author: Geert Janssens <info at kobaltwit.be>
Date: Tue Sep 13 18:58:42 2011 +0200
Update isocodes to 3.28, the most recent stable version
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 188e452..cd1c3cd 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -40,7 +40,7 @@
<include href="gtkhtml.modules"/>
<autotools id="iso-codes" autogen-sh="configure">
- <branch module="iso-codes_3.23.orig.tar.bz2" version="3.23" repo="iso-codes" checkoutdir="iso-codes-3.23"/>
+ <branch module="iso-codes_3.28.orig.tar.bz2" version="3.28" repo="iso-codes" checkoutdir="iso-codes-3.28"/>
</autotools>
<autotools id="libchipcard" autogen-sh="configure" >
commit 9676c9d19189a36f76b80abe5a4f7dfd5619713d
Author: Geert Janssens <info at kobaltwit.be>
Date: Sun Sep 11 17:54:11 2011 +0200
Change repository for isocodes
The current one has been refusing connections for quite some time
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index e66308a..188e452 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -31,7 +31,7 @@
<repository type="svn" name="aquamaniac"
href="http://devel.aqbanking.de/svn/"/>
<repository type="tarball" name="iso-codes"
- href="ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/"/>
+ href="http://ftp.us.debian.org/debian/pool/main/i/iso-codes/"/>
<repository type="git" name="github"
href="git://github.com/"/>
@@ -40,7 +40,7 @@
<include href="gtkhtml.modules"/>
<autotools id="iso-codes" autogen-sh="configure">
- <branch module="iso-codes-3.21.tar.bz2" version="3.21" repo="iso-codes"/>
+ <branch module="iso-codes_3.23.orig.tar.bz2" version="3.23" repo="iso-codes" checkoutdir="iso-codes-3.23"/>
</autotools>
<autotools id="libchipcard" autogen-sh="configure" >
commit 645b8a6d68c23baa4495041833550854d639197c
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 25 17:05:04 2011 -0700
Launcher: expr isn't a bash builtin so it needs an absolute path.
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 3075825..0c1d8bf 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -50,7 +50,7 @@ if test -f "$bundle_res/environment.sh"; then
fi
# Strip out the argument added by the OS.
-if expr "x$1" : '^x-psn_' > /dev/null; then
+if /bin/expr "x$1" : '^x-psn_' > /dev/null; then
shift 1
fi
diff --git a/gnucash-bundler/gnucash.launcher b/gnucash-bundler/gnucash.launcher
index 63ff650..9609278 100755
--- a/gnucash-bundler/gnucash.launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -50,7 +50,7 @@ if test -f "$bundle_res/environment.sh"; then
fi
# Strip out the argument added by the OS.
-if expr "x$1" : "x-psn_.*" > /dev/null; then
+if /bin/expr "x$1" : "x-psn_.*" > /dev/null; then
shift 1
fi
commit 2766f10cc71d56e559be55b3fe8ce304e4c7217c
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 25 15:43:29 2011 -0700
Cleanup trailing whitespace in the launcher scripts.
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 13f3c85..3075825 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -63,32 +63,32 @@ export GUILE_WARN_DEPRECATED
if [ -w "$PREFIXDIR" ]; then
if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
- if [ ! -d "$PREFIX" ]; then
- rm "$PREFIX"; else
- mv "$PREFIX" "$PREFIX.Save";
+ if [ ! -d "$PREFIX" ]; then
+ rm "$PREFIX"; else
+ mv "$PREFIX" "$PREFIX.Save";
fi
ln -s "$RESPFX" "$PREFIX"
elif [ ! -e "$PREFIX" ] ; then
echo "Linking $RESPFX to $PREFIX"
- if [ ! -d "$PREFIXDIR" ]; then
- mkdir -p "$PREFIXDIR";
- fi
+ if [ ! -d "$PREFIXDIR" ]; then
+ mkdir -p "$PREFIXDIR";
+ fi
ln -s "$RESPFX" "$PREFIX"
fi
-else
+else
echo "Don't have write access to $PREFIXDIR"
if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
echo "moving the $PREFIX directory to $PREFIX.save"
- osascript <<EOF
+ osascript <<EOF
display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
do shell script "echo foo; if [ ! -d \"$PREFIX\" ]; then rm \"$PREFIX\"; else mv \"$PREFIX\" \"$PREFIX.Save\"; fi; ln -s \"$RESPFX\" \"$PREFIX\" " with administrator privileges
EOF
- elif [ ! -e "$PREFIX" ] ;
- then
- echo "Linking $RESPFX to $PREFIX"
- osascript <<EOF
+ elif [ ! -e "$PREFIX" ] ;
+ then
+ echo "Linking $RESPFX to $PREFIX"
+ osascript <<EOF
display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
do shell script "if [ ! -d \"$PREFIXDIR\" ]; then mkdir -p \"$PREFIXDIR\"; fi; ln -s \"$RESPFX\" \"$PREFIX\"" with administrator privileges
diff --git a/gnucash-bundler/gnucash.launcher b/gnucash-bundler/gnucash.launcher
index 72ffc66..63ff650 100755
--- a/gnucash-bundler/gnucash.launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -63,32 +63,32 @@ export GUILE_WARN_DEPRECATED
if [ -w "$PREFIXDIR" ]; then
if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
- if [ ! -d "$PREFIX" ]; then
- rm "$PREFIX"; else
- mv "$PREFIX" "$PREFIX.Save";
+ if [ ! -d "$PREFIX" ]; then
+ rm "$PREFIX"; else
+ mv "$PREFIX" "$PREFIX.Save";
fi
ln -s "$RESPFX" "$PREFIX"
elif [ ! -e "$PREFIX" ] ; then
echo "Linking $RESPFX to $PREFIX"
- if [ ! -d "$PREFIXDIR" ]; then
- mkdir -p "$PREFIXDIR";
- fi
+ if [ ! -d "$PREFIXDIR" ]; then
+ mkdir -p "$PREFIXDIR";
+ fi
ln -s "$RESPFX" "$PREFIX"
fi
-else
+else
echo "Don't have write access to $PREFIXDIR"
if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
echo "moving the $PREFIX directory to $PREFIX.save"
- osascript <<EOF
+ osascript <<EOF
display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
do shell script "echo foo; if [ ! -d \"$PREFIX\" ]; then rm \"$PREFIX\"; else mv \"$PREFIX\" \"$PREFIX.Save\"; fi; ln -s \"$RESPFX\" \"$PREFIX\" " with administrator privileges
EOF
- elif [ ! -e "$PREFIX" ] ;
- then
- echo "Linking $RESPFX to $PREFIX"
- osascript <<EOF
+ elif [ ! -e "$PREFIX" ] ;
+ then
+ echo "Linking $RESPFX to $PREFIX"
+ osascript <<EOF
display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
do shell script "if [ ! -d \"$PREFIXDIR\" ]; then mkdir -p \"$PREFIXDIR\"; fi; ln -s \"$RESPFX\" \"$PREFIX\"" with administrator privileges
commit 7cdd022a7560af075f1bc8530986b9f539d20df2
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 25 15:42:46 2011 -0700
Improve shell argument handling. Thanks to Peter <prl at ozemail.com.au>
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index c5b0fee..13f3c85 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -50,7 +50,7 @@ if test -f "$bundle_res/environment.sh"; then
fi
# Strip out the argument added by the OS.
-if [ x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ]; then
+if expr "x$1" : '^x-psn_' > /dev/null; then
shift 1
fi
@@ -143,4 +143,4 @@ if test -f "$GNC_DOT_DIR/gnucashrc"; then
fi
#Don't quote $EXTRA_ARGS or it will turn into a single arg and fail.
-$EXEC "$bundle_contents/MacOS/$name-bin" $EXTRA_ARGS $*
+$EXEC "$bundle_contents/MacOS/$name-bin" $EXTRA_ARGS "$@"
diff --git a/gnucash-bundler/gnucash.launcher b/gnucash-bundler/gnucash.launcher
index 222b13e..72ffc66 100755
--- a/gnucash-bundler/gnucash.launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -50,7 +50,7 @@ if test -f "$bundle_res/environment.sh"; then
fi
# Strip out the argument added by the OS.
-if [ x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ]; then
+if expr "x$1" : "x-psn_.*" > /dev/null; then
shift 1
fi
@@ -143,4 +143,4 @@ if test -f "$GNC_DOT_DIR/gnucashrc"; then
fi
#Don't quote $EXTRA_ARGS or it will turn into a single arg and fail.
-$EXEC "$bundle_contents/MacOS/$name-bin" $EXTRA_ARGS $*
+$EXEC "$bundle_contents/MacOS/$name-bin" $EXTRA_ARGS "$@"
commit d3f9b9a78ae6ce450823f0661b78791bbb2e204a
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 25 15:41:30 2011 -0700
Change Gnucash module to use the 2.4.7 tarball instead of subversion.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 2d5d261..e66308a 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -205,9 +205,10 @@
<autotools id="gnucash"
- autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
- <branch module="gnucash" revision="20812" repo="svn.gnucash.org">
+ <!--branch module="gnucash" revision="20812" repo="svn.gnucash.org"-->
+ <branch module="gnucash/stable/gnucash-2.4.7.tar.gz" version="2.4.7"
+ repo="sourceforge">
</branch>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit 75b769b7240daa53d55ba461868802ce59262fdb
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 25 15:40:09 2011 -0700
Fix stray github href error (http no longer works).
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 764b168..2d5d261 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -151,7 +151,7 @@
module="slib"/> -->
<branch repo="csail" module="scm/slib-3b3.zip" version="3b1"
checkoutdir="slib">
- <patch file="http://raw.github.com/jralls/gnucash-on-osx/master/patches/slib-install.patch"/>
+ <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/slib-install.patch"/>
</branch>
<dependencies>
<dep package="guile"/>
commit 82435b2f030a0371106f84916d9c8bccadda33c3
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jul 3 17:08:53 2011 -0700
Bump version to 2.4.7
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index d2566ac..d901359 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.4.6 © 2011 Gnucash Contributors</string>
+ <string>Gnucash version 2.4.7 © 2011 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4.6 © 2011 Gnucash Contributers</string>
+ <string>2.4.7 © 2011 Gnucash Contributers</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4.6</string>
+ <string>2.4.7</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.4.6</string>
+ <string>2.4.7</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
commit d60dee274bc019dbce9103372ef843f35bde1038
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jul 1 21:48:45 2011 -0700
Update Gnucash revision number for 2.4.7.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index b631f24..764b168 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -207,7 +207,7 @@
<autotools id="gnucash"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
- <branch module="gnucash" revision="2.4" repo="svn.gnucash.org">
+ <branch module="gnucash" revision="20812" repo="svn.gnucash.org">
</branch>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit 388e29bce7464f096a457653ef423a1b288892ae
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jun 28 14:32:06 2011 -0700
Update Aqbanking and friends to latest versions.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index ebd3a9c..b631f24 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -44,7 +44,7 @@
</autotools>
<autotools id="libchipcard" autogen-sh="configure" >
- <branch module="libchipcard-5.0.0.tar.gz" version="5.0.0"
+ <branch module="libchipcard-5.0.2.tar.gz" version="5.0.2"
repo="github_gnucash" />
<dependencies>
<dep package="libgcrypt"/>
@@ -54,7 +54,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--disable-qt4 --with-guis=gtk2">
- <branch module="gwenhywfar-4.0.9.tar.gz" version="4.0.9"
+ <branch module="gwenhywfar-4.1.0.tar.gz" version="4.1.0"
repo="github_gnucash" />
<dependencies>
<dep package="libgcrypt"/>
@@ -77,7 +77,7 @@
</autotools>
<autotools id="aqbanking" autogen-sh="configure">
- <branch module="aqbanking-5.0.6.tar.gz" version="5.0.6"
+ <branch module="aqbanking-5.0.10.tar.gz" version="5.0.10"
repo="github_gnucash"/>
<dependencies>
<dep package="gwenhywfar"/>
commit de4a49b570f56a23b87668141ee52e1fa868c680
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jun 28 14:31:35 2011 -0700
Libgsf moved to gtk-osx-random.modules
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 69c531e..ebd3a9c 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -193,13 +193,6 @@
</dependencies>
</autotools>
- <autotools id="libgsf" autogenargs="--without-python">
- <branch module="libgsf/1.14/libgsf-1.14.19.tar.bz2" version="1.14.19"
- hash="sha256:8cf82ce95ef97e61bae02099d2f39e4d814747b546899b7c28a695e15391b56c"/>
- <dependencies>
- </dependencies>
- </autotools>
-
<autotools id="goffice" autogenargs="--without-gconf">
<branch module="goffice/0.8/goffice-0.8.12.tar.bz2" version="0.8.12"
hash="sha256:c165f8b7aaab709295c8225b30f49fe75655149b982fd045d8c23bb7772eb22a"/>
commit 8d0a9fd179eef3d5056627cc25e669447515cb50
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 11 14:55:10 2011 -0700
Fix incorrect path in gnucash-svn.bundle
diff --git a/gnucash-bundler/gnucash-svn.bundle b/gnucash-bundler/gnucash-svn.bundle
index 7ab7edf..16884cf 100644
--- a/gnucash-bundler/gnucash-svn.bundle
+++ b/gnucash-bundler/gnucash-svn.bundle
@@ -214,7 +214,7 @@
</data>
<data dest="${bundle}/Contents/Resources/License">
- ${prefix}/share/gnucash/doc/LICENSE
+ ${prefix}/share/doc/gnucash/LICENSE
</data>
<data dest="${bundle}/Contents/Resources/Sources">
commit d9ce5abf1d6dcfc91c64cd9520ef6874247fea40
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 11 14:54:42 2011 -0700
Add Swig and its dependency PCRE for gnucash-svn and gnu cash-git.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 8479a28..69c531e 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -133,6 +133,18 @@
</dependencies>
</autotools>
+ <autotools id="pcre">
+ <branch repo="sourceforge" module="pcre/pcre-8.12.tar.bz2"
+ version="8.12"/>
+ </autotools>
+
+ <autotools id="swig">
+ <branch repo="sourceforge" module="swig/swig-2.0.4.tar.gz" version="2.0.4"/>
+ <dependencies>
+ <dep package="pcre"/>
+ </dependencies>
+ </autotools>
+
<autotools id="Slib" autogen-sh="install.sh" makeargs="-f Makefile.gnucash"
makeinstallargs="-f Makefile.gnucash">
<!-- <branch repo="slib.savannah.gnu.org"
@@ -232,6 +244,7 @@
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
+ <dep package="swig"/>
</dependencies>
</autotools>
@@ -251,6 +264,7 @@
<dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
+ <dep package="swig"/>
</dependencies>
</autotools>
commit deefb143cba2fa0b358ca113b2d5e1aebb76f336
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 11 14:52:40 2011 -0700
Update libofx to 0.9.4; fixes Gnucash bug 576163.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index e93697d..8479a28 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -126,8 +126,8 @@
</autotools>
<autotools id="libofx" autogen-sh='configure'>
- <branch repo="sourceforge" module="libofx/libofx-0.9.1.tar.gz"
- version='0.9.1'/>
+ <branch repo="sourceforge" module="libofx/libofx-0.9.4.tar.gz"
+ version='0.9.4'/>
<dependencies>
<dep package="OpenSP"/>
</dependencies>
commit 525ad380fe26f10b0f174a6768683d2358c0165f
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jun 10 15:27:05 2011 -0700
Update patch URLs in gnucash.modules to reflect new scheme at Github.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 5a3dc56..e93697d 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -90,7 +90,7 @@
autogenargs="--enable-ofx=yes --disable-kde --disable-chipcard-client --disable-python --with-frontends='cbanking g2banking q4banking' qt4_libs='-framework QtCore -framework QtGui -framework Qt3Support' qt4_includes='-framework QtCore -framework QtGui -framework Qt3Support'">
<branch module="aqbanking-4.2.4.tar.gz" version="4.2.4"
repo="github_gnucash" >
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/aqbankingOSX.patch" strip="0"/>
+ <patch file="http://raw.github.com/jralls/gnucash-on-osx/master/patches/aqbankingOSX.patch" strip="0"/>
</branch>
<dependencies>
<dep package="libofx"/>
@@ -139,7 +139,7 @@
module="slib"/> -->
<branch repo="csail" module="scm/slib-3b3.zip" version="3b1"
checkoutdir="slib">
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/slib-install.patch"/>
+ <patch file="http://raw.github.com/jralls/gnucash-on-osx/master/patches/slib-install.patch"/>
</branch>
<dependencies>
<dep package="guile"/>
@@ -155,7 +155,7 @@
<cmake id="mysql">
<branch repo="csclub" module="Connector-C/mysql-connector-c-6.0.2.tar.gz"
version="6.0.2" >
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/libmysql.patch"/>
+ <patch file="http://raw.github.com/jralls/gnucash-on-osx/master/patches/libmysql.patch"/>
</branch>
<dependencies>
<dep package="cmake"/>
commit bd72fb8b3396bf09032389a8228c88c9ed213cf0
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jun 10 15:26:26 2011 -0700
Move readline, gmp, and guile out of gnucash.modules (they went to gtk-osx-randome.modules in gtk-osx-build). Move gsf into gnucash.modules (it's needed only for goffice.)
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index f482d61..5a3dc56 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -26,8 +26,6 @@
href="http://svn.gnucash.org/repo/"/>
<repository type="tarball" name="github_gnucash"
href="https://github.com/downloads/jralls/gnucash-on-osx/"/>
- <repository type="tarball" name="gmplib.org"
- href="ftp://ftp.gmplib.org/pub/"/>
<repository type="tarball" name="cmake"
href="http://www.cmake.org/files/"/>
<repository type="svn" name="aquamaniac"
@@ -41,17 +39,6 @@
<!--include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
<include href="gtkhtml.modules"/>
- <autotools id='readline' >
- <branch repo="ftp.gnu.org" module="readline/readline-6.0.tar.gz"
- version="6.0"/>
- </autotools>
-
- <!-- gmp is also provided in theory by bootstrap, but it seems not to always get built, so it's provided here as well. -->
- <autotools id="gmp">
- <!--branch repo="ftp.gnu.org" module="gmp/gmp-5.0.0.tar.bz2" version="5.0.0"/-->
- <branch repo="ftp.gnu.org" module="gmp/gmp-4.3.1.tar.bz2" version="4.3.1"/>
- </autotools>
-
<autotools id="iso-codes" autogen-sh="configure">
<branch module="iso-codes-3.21.tar.bz2" version="3.21" repo="iso-codes"/>
</autotools>
@@ -146,11 +133,6 @@
</dependencies>
</autotools>
- <autotools id="guile" autogen-sh="configure">
- <branch repo="ftp.gnu.org" module="guile/guile-1.8.8.tar.gz"
- version="1.8.8"/>
- </autotools>
-
<autotools id="Slib" autogen-sh="install.sh" makeargs="-f Makefile.gnucash"
makeinstallargs="-f Makefile.gnucash">
<!-- <branch repo="slib.savannah.gnu.org"
@@ -199,6 +181,13 @@
</dependencies>
</autotools>
+ <autotools id="libgsf" autogenargs="--without-python">
+ <branch module="libgsf/1.14/libgsf-1.14.19.tar.bz2" version="1.14.19"
+ hash="sha256:8cf82ce95ef97e61bae02099d2f39e4d814747b546899b7c28a695e15391b56c"/>
+ <dependencies>
+ </dependencies>
+ </autotools>
+
<autotools id="goffice" autogenargs="--without-gconf">
<branch module="goffice/0.8/goffice-0.8.12.tar.bz2" version="0.8.12"
hash="sha256:c165f8b7aaab709295c8225b30f49fe75655149b982fd045d8c23bb7772eb22a"/>
commit 99f236cb7138e21dd7c178b97506110ed57a235b
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jun 10 15:23:03 2011 -0700
Revert 450e9d4. It doesn't work well in practice.
diff --git a/gnucash-bundler/gnucash-svn.launcher b/gnucash-bundler/gnucash-svn.launcher
index c131e7c..9e17981 100755
--- a/gnucash-bundler/gnucash-svn.launcher
+++ b/gnucash-bundler/gnucash-svn.launcher
@@ -98,14 +98,21 @@ EOF
fi
fi
-LAUNCH_PATH="$HOME/Library/LaunchAgents/org.freedesktop.dbus-session.plist"
-bundle_launch_path="$PREFIX/etc/dbus-1/org.freedesktop.dbus-session.plist"
-# See if the DBUS session bus is registered in launchd and register it if not
-if [ "x`launchctl list | grep 'org\.freedesktop\.dbus-session'`" == x ]; then
- if [ -e "$LAUNCH_PATH" ] || [ -L "$LAUNCH_PATH" ] && [ ! "$LAUNCH_PATH" -ef "$bundle_launch_path" ]; then
- ln -s $bundle_launch_path $LAUNCH_PATH
+if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+ # If we get here without a way to connect to an instance of dbus-daemon,
+ # then we can kill any existing instances of dbus-daemon that originate
+ # in this copy of Gnucash.
+
+ DBUS_PIDS=`ps ux | grep dbus-daemon | grep "${PREFIX}" | awk '{print $2}'`
+
+ if /bin/test "$DBUS_PIDS"; then
+ for DBUS_PID in ${DBUS_PIDS}
+ do
+ /bin/kill "${DBUS_PID}"
+ done
fi
- launchctl load -w $LAUNCH_PATH
+
+ eval `"$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
fi
GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index d9ffed0..c5b0fee 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -98,14 +98,21 @@ EOF
fi
fi
-LAUNCH_PATH="$HOME/Library/LaunchAgents/org.freedesktop.dbus-session.plist"
-bundle_launch_path="$PREFIX/etc/dbus-1/org.freedesktop.dbus-session.plist"
-# See if the DBUS session bus is registered in launchd and register it if not
-if [ "x`launchctl list | grep 'org\.freedesktop\.dbus-session'`" == x ]; then
- if [ -e "$LAUNCH_PATH" ] || [ -L "$LAUNCH_PATH" ] && [ ! "$LAUNCH_PATH" -ef "$bundle_launch_path" ]; then
- ln -s $bundle_launch_path $LAUNCH_PATH
+if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+ # If we get here without a way to connect to an instance of dbus-daemon,
+ # then we can kill any existing instances of dbus-daemon that originate
+ # in this copy of Gnucash.
+
+ DBUS_PIDS=`ps ux | grep dbus-daemon | grep "${PREFIX}" | awk '{print $2}'`
+
+ if /bin/test "$DBUS_PIDS"; then
+ for DBUS_PID in ${DBUS_PIDS}
+ do
+ /bin/kill "${DBUS_PID}"
+ done
fi
- launchctl load -w $LAUNCH_PATH
+
+ eval `"$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
fi
GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
diff --git a/gnucash-bundler/gnucash.launcher b/gnucash-bundler/gnucash.launcher
index 98e315a..222b13e 100755
--- a/gnucash-bundler/gnucash.launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -97,19 +97,22 @@ EOF
fi
fi
-LAUNCH_PLIST="org.freedesktop.dbus-session.plist"
-LAUNCH_DIR="$HOME/Library/LaunchAgents"
-LAUNCH_PATH="$LAUNCH_DIR/$LAUNCH_PLIST"
-bundle_launch_path="$PREFIX/etc/dbus-1/$LAUNCH_PLIST"
-# See if the DBUS session bus is registered in launchd and register it if not
-if [ "x`launchctl list | grep 'org\.freedesktop\.dbus-session'`" == x ]; then
- if [ ! -d $LAUNCH_DIR ]; then
- mkdir -p $LAUNCH_DIR;
- fi
- if ! ([ -e "$LAUNCH_PATH" ] && [ -L "$LAUNCH_PATH" ] && [ ! "$LAUNCH_PATH" -ef "$bundle_launch_path" ]); then
- ln -s $bundle_launch_path $LAUNCH_PATH
+
+if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+ # If we get here without a way to connect to an instance of dbus-daemon,
+ # then we can kill any existing instances of dbus-daemon that originate
+ # in this copy of Gnucash.
+
+ DBUS_PIDS=`ps ux | grep dbus-daemon | grep "${PREFIX}" | awk '{print $2}'`
+
+ if /bin/test "$DBUS_PIDS"; then
+ for DBUS_PID in ${DBUS_PIDS}
+ do
+ /bin/kill "${DBUS_PID}"
+ done
fi
- launchctl load -w $LAUNCH_PATH
+
+ eval `"$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
fi
GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
commit b341addbb721304cb612836f831925b13aaf1c92
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 28 14:57:20 2011 -0700
Fixup dbus launcher paths and conditions so that it
works correctly and has fewer repeated paths.
diff --git a/gnucash-bundler/gnucash.launcher b/gnucash-bundler/gnucash.launcher
index 236e050..98e315a 100755
--- a/gnucash-bundler/gnucash.launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -97,12 +97,16 @@ EOF
fi
fi
-
-LAUNCH_PATH="$HOME/Library/LaunchAgents/org.freedesktop.dbus-session.plist"
-bundle_launch_path="$PREFIX/etc/dbus-1/org.freedesktop.dbus-session.plist"
+LAUNCH_PLIST="org.freedesktop.dbus-session.plist"
+LAUNCH_DIR="$HOME/Library/LaunchAgents"
+LAUNCH_PATH="$LAUNCH_DIR/$LAUNCH_PLIST"
+bundle_launch_path="$PREFIX/etc/dbus-1/$LAUNCH_PLIST"
# See if the DBUS session bus is registered in launchd and register it if not
if [ "x`launchctl list | grep 'org\.freedesktop\.dbus-session'`" == x ]; then
- if [ -e "$LAUNCH_PATH" ] || [ -L "$LAUNCH_PATH" ] && [ ! "$LAUNCH_PATH" -ef "$bundle_launch_path" ]; then
+ if [ ! -d $LAUNCH_DIR ]; then
+ mkdir -p $LAUNCH_DIR;
+ fi
+ if ! ([ -e "$LAUNCH_PATH" ] && [ -L "$LAUNCH_PATH" ] && [ ! "$LAUNCH_PATH" -ef "$bundle_launch_path" ]); then
ln -s $bundle_launch_path $LAUNCH_PATH
fi
launchctl load -w $LAUNCH_PATH
commit 0e0ade7745561fdefbfb172ebcb35ef7d3f26fb1
Author: John Ralls <jralls at ceridwen.us>
Date: Fri May 27 21:22:15 2011 -0700
Correct github URL and aqbanking extension (gz, not bz2)
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index ce55014..f482d61 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -25,7 +25,7 @@
<repository type="svn" name="svn.gnucash.org"
href="http://svn.gnucash.org/repo/"/>
<repository type="tarball" name="github_gnucash"
- href="http://github.com/downloads/jralls/gnucash-on-osx/"/>
+ href="https://github.com/downloads/jralls/gnucash-on-osx/"/>
<repository type="tarball" name="gmplib.org"
href="ftp://ftp.gmplib.org/pub/"/>
<repository type="tarball" name="cmake"
@@ -90,7 +90,7 @@
</autotools>
<autotools id="aqbanking" autogen-sh="configure">
- <branch module="aqbanking-5.0.6.tar.bz2" version="5.0.6"
+ <branch module="aqbanking-5.0.6.tar.gz" version="5.0.6"
repo="github_gnucash"/>
<dependencies>
<dep package="gwenhywfar"/>
commit 3e97af14e63117f994a58c313a584687097b4777
Author: John Ralls <jralls at ceridwen.us>
Date: Fri May 27 21:21:29 2011 -0700
Update for 2.4.6 release
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 233b740..d2566ac 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.4.5 © 2011 Gnucash Contributors</string>
+ <string>Gnucash version 2.4.6 © 2011 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4.5 © 2011 Gnucash Contributers</string>
+ <string>2.4.6 © 2011 Gnucash Contributers</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4.5</string>
+ <string>2.4.6</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.4.5</string>
+ <string>2.4.6</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
commit 58831ae27eb449f4d8eb10b66a95111018667ec1
Author: John Ralls <jralls at ceridwen.us>
Date: Fri May 20 16:17:09 2011 -0700
Update aqbanking to 5.0.6 and Gwenhywfar to 4.0.9
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 5d2da88..ce55014 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -67,7 +67,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--disable-qt4 --with-guis=gtk2">
- <branch module="gwenhywfar-4.0.4.tar.gz" version="4.0.4"
+ <branch module="gwenhywfar-4.0.9.tar.gz" version="4.0.9"
repo="github_gnucash" />
<dependencies>
<dep package="libgcrypt"/>
@@ -90,7 +90,7 @@
</autotools>
<autotools id="aqbanking" autogen-sh="configure">
- <branch module="aqbanking-5.0.2.tar.bz2" version="5.0.2"
+ <branch module="aqbanking-5.0.6.tar.bz2" version="5.0.6"
repo="github_gnucash"/>
<dependencies>
<dep package="gwenhywfar"/>
commit 450e9d4f3ceda8892740ad3918354a812f7dcfa8
Author: John Ralls <jralls at ceridwen.us>
Date: Fri May 20 11:48:05 2011 -0700
Change dbus initialization to launchd. Thanks to Mike Alexander for the initial patch.
diff --git a/gnucash-bundler/gnucash-svn.launcher b/gnucash-bundler/gnucash-svn.launcher
index 9e17981..c131e7c 100755
--- a/gnucash-bundler/gnucash-svn.launcher
+++ b/gnucash-bundler/gnucash-svn.launcher
@@ -98,21 +98,14 @@ EOF
fi
fi
-if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
- # If we get here without a way to connect to an instance of dbus-daemon,
- # then we can kill any existing instances of dbus-daemon that originate
- # in this copy of Gnucash.
-
- DBUS_PIDS=`ps ux | grep dbus-daemon | grep "${PREFIX}" | awk '{print $2}'`
-
- if /bin/test "$DBUS_PIDS"; then
- for DBUS_PID in ${DBUS_PIDS}
- do
- /bin/kill "${DBUS_PID}"
- done
+LAUNCH_PATH="$HOME/Library/LaunchAgents/org.freedesktop.dbus-session.plist"
+bundle_launch_path="$PREFIX/etc/dbus-1/org.freedesktop.dbus-session.plist"
+# See if the DBUS session bus is registered in launchd and register it if not
+if [ "x`launchctl list | grep 'org\.freedesktop\.dbus-session'`" == x ]; then
+ if [ -e "$LAUNCH_PATH" ] || [ -L "$LAUNCH_PATH" ] && [ ! "$LAUNCH_PATH" -ef "$bundle_launch_path" ]; then
+ ln -s $bundle_launch_path $LAUNCH_PATH
fi
-
- eval `"$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
+ launchctl load -w $LAUNCH_PATH
fi
GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index c5b0fee..d9ffed0 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -98,21 +98,14 @@ EOF
fi
fi
-if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
- # If we get here without a way to connect to an instance of dbus-daemon,
- # then we can kill any existing instances of dbus-daemon that originate
- # in this copy of Gnucash.
-
- DBUS_PIDS=`ps ux | grep dbus-daemon | grep "${PREFIX}" | awk '{print $2}'`
-
- if /bin/test "$DBUS_PIDS"; then
- for DBUS_PID in ${DBUS_PIDS}
- do
- /bin/kill "${DBUS_PID}"
- done
+LAUNCH_PATH="$HOME/Library/LaunchAgents/org.freedesktop.dbus-session.plist"
+bundle_launch_path="$PREFIX/etc/dbus-1/org.freedesktop.dbus-session.plist"
+# See if the DBUS session bus is registered in launchd and register it if not
+if [ "x`launchctl list | grep 'org\.freedesktop\.dbus-session'`" == x ]; then
+ if [ -e "$LAUNCH_PATH" ] || [ -L "$LAUNCH_PATH" ] && [ ! "$LAUNCH_PATH" -ef "$bundle_launch_path" ]; then
+ ln -s $bundle_launch_path $LAUNCH_PATH
fi
-
- eval `"$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
+ launchctl load -w $LAUNCH_PATH
fi
GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
diff --git a/gnucash-bundler/gnucash.launcher b/gnucash-bundler/gnucash.launcher
index 222b13e..236e050 100755
--- a/gnucash-bundler/gnucash.launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -98,21 +98,14 @@ EOF
fi
fi
-if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
- # If we get here without a way to connect to an instance of dbus-daemon,
- # then we can kill any existing instances of dbus-daemon that originate
- # in this copy of Gnucash.
-
- DBUS_PIDS=`ps ux | grep dbus-daemon | grep "${PREFIX}" | awk '{print $2}'`
-
- if /bin/test "$DBUS_PIDS"; then
- for DBUS_PID in ${DBUS_PIDS}
- do
- /bin/kill "${DBUS_PID}"
- done
+LAUNCH_PATH="$HOME/Library/LaunchAgents/org.freedesktop.dbus-session.plist"
+bundle_launch_path="$PREFIX/etc/dbus-1/org.freedesktop.dbus-session.plist"
+# See if the DBUS session bus is registered in launchd and register it if not
+if [ "x`launchctl list | grep 'org\.freedesktop\.dbus-session'`" == x ]; then
+ if [ -e "$LAUNCH_PATH" ] || [ -L "$LAUNCH_PATH" ] && [ ! "$LAUNCH_PATH" -ef "$bundle_launch_path" ]; then
+ ln -s $bundle_launch_path $LAUNCH_PATH
fi
-
- eval `"$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
+ launchctl load -w $LAUNCH_PATH
fi
GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
commit 164711a1250ec0e9ff8113b38e645a140c3f076f
Author: John Ralls <jralls at ceridwen.us>
Date: Sun May 8 17:53:34 2011 -0700
Remove redundant instructions and point reader to the Gnucash Wiki page instead.
diff --git a/README.markdown b/README.markdown
index cd2cca4..8d863d7 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,98 +1,7 @@
#Building GnuCash with GTK-OSX#
-##Overview##
GnuCash can be built to run more or less natively on OSX -- meaning
without X11. Better yet, the build is almost automatic.
-This is tested and works for Macinstosh OSX Versions 10.4 (Tiger) and
-10.5 (Leopard) on both PowerPC and Intel. It does not create universal
-binaries.
-
-##Binaries available for download##
-
-Precompiled app bundles are available from [Gnucash at
-Sourceforge](http://gnucash.sourceforge.net), and users who are simply
-interested in running Gnucash on their Macs should obtain the latest
-stable release from there.
-
-More up-to-date and frequently maintained instruction can be found in
-the [Gnucash Wiki](http://wiki.gnucash.org/wiki/MacOSX/Quartz).
-
-##Preliminaries##
-Tiger or newer is <em>required</em> for gtk-osx.
-
-You need Python 2.5 to run jhbuild. This is already part of Leopard
-(OSX 10.5), but Tiger (10.4) provided Python 2.3, so the gtk-osx
-maintainer has included logic to make a new python for Tiger users.
-You will also need [Git](http://metastatic.org/source/git-osx.html)
-and Tiger users will need
-[Subversion](http://www.open.collab.net/downloads/community/)
-
-If you haven't already done so, retrieve this package:
- git clone git://github.com/jralls/gnucash-on-osx.git
-
-Copy the .jhbuildrc-custom into your home directory.
-
-There are two "prefix" lines at the top of .jhbuildrc-custom, one for stable and one for unstable. You can use these or set it to anywhere else you like. It's a good idea if your going to build both stable and unstable to keep them in separate directories, as they have different dependencies.
-
-Go to [Gtk-OSX's Build instructions](http://sourceforge.net/apps/trac/gtk-osx/wiki/Build) and follow
-the instructions. <b><em>Don't run jhbuild build yet!</em></b>
-
-Tiger users will need to retrieve and install
-[CUPS 1.2.12](http://downloads.sourceforge.net/cups/cups-1.2.12.dmg)
-
-
-##Alternate Versions##
-
-There are modules provided for building the latest stable release (gnucash), the latest unstable (development) release (gnucash-unstable), and the current subversion trunk (gnucash-svn). Just edit the "modules = " line in .jhbuildrc-custom to point at the one you want.
-
-##AQBanking and Qt##
-
-The AQbanking library requires [QT](http://qt.nokia.com/downloads/mac-os-cpp) for its online banking setup applet. If you don't want to use online banking, you can add a line
- skip.add("aqbanking-qt")
-to your .jhbuildrc-custom and add "aqbanking" to your modules list just before gnucash.
-
-Edit gnucash-on-osx/gnucash-bundler/gnucash.bundle and comment out the 4
-Qt framework elements. (You comment out XML by wrapping the elements with <!-- and -->.)
-
-##Building##
-
-Once all of the preliminaries are complete, run:
- $> jhbuild build
-
-You also need to
- $> mkdir $PREFIX/tmp
-
-##Running from the commandline##
-
-Now you're ready to try it out:
- $> $PREFIX/bin/gnucash
-
-($PREFIX is the path to where you've built gtk; you can fill it in yourself or use jhbuild shell to set it for you.)
-
-##Making a Bundle##
-
-So far so good, but you don't really want to have to open a Terminal
-window every time you want to use GnuCash, now do you? Of course
-not. You want a nice icon in your Applications folder (and maybe in
-the Dock) to click on when you run GnuCash. Here's how to do this:
-
- * Download the bundler from http://downloads.sourceforge.net/sourceforge/gtk-osx/ige-mac-bundler-0.5.tar.gz unpack it, cd into the ige-mac-bundler directory, and
-
- make install
- *
- <tt>$> cd gnucash-on-osx/gnucash-bundler</tt>
- * Look through gnucash-launcher and gnucash.bundle and adjust the paths to match your installation.
- * If you built a gnucash-unstable or gnucash-svn, edit Info.plist to have the right version information.
- * make gnucash-launcher executable :
- <tt>$> chmod +x gnucash-launcher</tt>
- * execute
- <tt>jhbuild shell</tt>
- to set up the environment for the bundler
- * while in the shell, execute
- <tt>ige-mac-bundler gnucash.bundle</tt>
- * exit the shell
-
-And your bundle should be ready to go.
-Try <tt>GnuCash.app/Contents/MacOSX/GnuCash</tt> from the command-line so that you can see any error messages. If that works, try <tt>open GnuCash.app</tt>. If that works, then you can move GnuCash.app to your Applications folder and it's ready to use. <em>Don't move or remove the prefix directory: Both dbus and GnuCash have links pointing into it which can't at present be changed.</em>
+Please see http://wiki.gnucash.org/wiki/MacOSX/Quartz for instructions.
commit ff2233ce94a1e12cfb69d533e6ba16aa786e6c3e
Author: John Ralls <jralls at ceridwen.us>
Date: Sun May 8 17:52:53 2011 -0700
Whitespace Cleanup
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index b45e5bb..5d2da88 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -250,7 +250,7 @@
<autotools id="gnucash-git"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch repo="github" module="Gnucash/gnucash.git" revision="trunk"
+ <branch repo="github" module="Gnucash/gnucash.git" revision="trunk"
checkoutdir="gnucash-git"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit ec93f94eefbbc584bbcbf6410a4dedd12c56a300
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 22 19:57:55 2011 -0700
Remove experimental include.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 5252be8..b45e5bb 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -40,9 +40,6 @@
<include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/>
<!--include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
<include href="gtkhtml.modules"/>
- <include href="finance-quote.modules"/>
-
-
<autotools id='readline' >
<branch repo="ftp.gnu.org" module="readline/readline-6.0.tar.gz"
commit 73aab12ce51fad3bc94da52c502dd6430890190c
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 22 13:20:06 2011 -0700
Updated to reflect currently used parameters.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 939bbea..02896f6 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -13,20 +13,18 @@ prefix = os.path.join(os.environ["HOME"], "gnucash-stable")
#Select which modules to build. The only difference is which gnucash
#module (and all of the dependencies, see above) get built:
-modules = ["gettext-fw", "meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash"]
-#modules = ["gettext-fw", "meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash-unstable"]
-#modules = ["gettext-fw", "meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash-svn"]
+modules = ["meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash"]
+#modules = ["meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash-unstable"]
+#modules = ["meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash-svn"]
-#Setup the build for Tiger. If you don't care about Tiger or are
-#building unstable or svn, comment out the first one and uncomment the
-#second. PPC users should change i386 to ppc when using SDK 10.5.
-setup_sdk("10.4", "10.4u")
-#setup_sdk("10.5", "10.5",["i386"])
+#Setup the build. PPC users will need to replace "i386" with
+#"ppc". Don't try to do a universal build, it doesn't work. x86_64 is
+#untested, as is building against the 10.6 or 10.7 SDKs.
+setup_sdk("10.5", "10.5",["i386"])
moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
#If you wish to enable the mysql backend, uncomment the lines below.
-#This only works for gnucash-unstable and gnucash-svn at present.
#MySQL requires CMake 2.6.0 or later to build, so the libmysql module
#has a dependency on cmake which will be built by default. If you
#already have CMake installed on the path, add "skip.append("cmake")
@@ -48,14 +46,10 @@ append_autogenargs("OpenSP", "--enable-shared") #To override the global --disabl
append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
append_autogenargs("gnucash-unstable", "--with-dbi-dbd-dir=" + prefix +"/lib/dbd")
append_autogenargs("gnucash-svn", "--with-dbi-dbd-dir=" + prefix +"/lib/dbd")
-append_autogenargs("aqbanking-qt", 'qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers" QT3TO4=/usr/bin/qt3to4')
+append_autogenargs("gnucash", "--with-dbi-dbd-dir=" + prefix +"/lib/dbd")
-append_autogenargs("gnucash-unstable", " --with-html-engine=webkit")
-append_autogenargs("gnucash-svn", " --with-html-engine=webkit")
+append_autogenargs("libiconv", "--with-libintl-prefix=" + prefix)
-append_autogenargs("python", "--with-universal-archs=32-bit --enable-universalsdk=/Developer/SDKs/MacOSX10.5.sdk")
-append_autogenargs("libiconv", "--with-libintl-prefix=" + prefix)
-branches["python"] = "http://www.python.org/ftp/python/2.6.4/Python-2.6.4.tar.bz2"
module_makecheck["gmp"] = True
commit 51e7548ac351441240e1b7ac69cc41ff2219b162
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 22 13:03:02 2011 -0700
Add module for libshipcard, but don't automatically build it; it's not clear at this point that it works on Macs.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 148ec8d..5252be8 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -59,6 +59,15 @@
<branch module="iso-codes-3.21.tar.bz2" version="3.21" repo="iso-codes"/>
</autotools>
+ <autotools id="libchipcard" autogen-sh="configure" >
+ <branch module="libchipcard-5.0.0.tar.gz" version="5.0.0"
+ repo="github_gnucash" />
+ <dependencies>
+ <dep package="libgcrypt"/>
+ <dep package="gnutls"/>
+ </dependencies>
+ </autotools>
+
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--disable-qt4 --with-guis=gtk2">
<branch module="gwenhywfar-4.0.4.tar.gz" version="4.0.4"
commit a3bba66929fdc352a592367d2c52bbe5019eddb8
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 22 13:01:42 2011 -0700
Update gnucash-unstable launcher script for new /Library/Gnucash-2.5 prefix.
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index e1ede31..c5b0fee 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -10,7 +10,7 @@ else
EXEC=exec
fi
-export PREFIX=/Library/Gnucash-2.3.x
+export PREFIX=/Library/Gnucash-2.5
export PREFIXDIR="`dirname $PREFIX`"
name=`basename "$0"`
commit e0e153b0e0eb8c206add451f7c8028d3ecb67e4a
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 22 12:59:16 2011 -0700
Version 2.4.5
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 6019b64..233b740 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.4.4 © 2011 Gnucash Contributors</string>
+ <string>Gnucash version 2.4.5 © 2011 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4.4 © 2011 Gnucash Contributers</string>
+ <string>2.4.5 © 2011 Gnucash Contributers</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4.4</string>
+ <string>2.4.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.4.4</string>
+ <string>2.4.5</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
commit 32fe1378f9377d2a3f5173fd0dfb131881ca6803
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 22 12:58:37 2011 -0700
Update gnucash module for 2.4 branch, remove 2.5 branch setting from gnucash-unstable (there isn't a 2.5 branch).
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index d3c31cc..148ec8d 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -207,7 +207,7 @@
<autotools id="gnucash"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
- <branch module="gnucash" revision="20418" repo="svn.gnucash.org">
+ <branch module="gnucash" revision="2.4" repo="svn.gnucash.org">
</branch>
<dependencies>
<dep package="meta-gtk-osx-core"/>
@@ -263,7 +263,7 @@
<autotools id="gnucash-unstable"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch revision="2.5.0" module="gnucash" repo="svn.gnucash.org"/>
+ <branch module="gnucash" repo="svn.gnucash.org"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit dc405c6d336952623d214ecb8306416e4cc4ff3f
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 22 12:56:47 2011 -0700
Restore default linked moduleset to github from local.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a3ba93c..d3c31cc 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -37,8 +37,8 @@
<repository type="git" name="github"
href="git://github.com/"/>
- <!--include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/ -->
- <include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
+ <include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/>
+ <!--include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
<include href="gtkhtml.modules"/>
<include href="finance-quote.modules"/>
commit f1f39afa2ceb43904ddfab1992e67f8c154a6c27
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 21 15:05:42 2011 -0700
Bug #645253: Add share/gwenhywfar to the bundle.
diff --git a/gnucash-bundler/gnucash-svn.bundle b/gnucash-bundler/gnucash-svn.bundle
index 52c795c..7ab7edf 100644
--- a/gnucash-bundler/gnucash-svn.bundle
+++ b/gnucash-bundler/gnucash-svn.bundle
@@ -177,6 +177,10 @@
</data>
<data>
+ ${prefix}/share/gwenhywfar
+ </data>
+
+ <data>
${prefix}/share/libofx
</data>
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index e3af12c..ac38d01 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -177,6 +177,10 @@
</data>
<data>
+ ${prefix}/share/gwenhywfar
+ </data>
+
+ <data>
${prefix}/share/libofx
</data>
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 5421b96..e2f1b16 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -178,6 +178,10 @@
</data>
<data>
+ ${prefix}/share/gwenhywfar
+ </data>
+
+ <data>
${prefix}/share/libofx
</data>
commit 4e7bad1400ed2a5c0fc15de2a2455db01d974d61
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 21 15:03:52 2011 -0700
Fix the svn launcher to point to the right prefix.
diff --git a/gnucash-bundler/gnucash-svn.launcher b/gnucash-bundler/gnucash-svn.launcher
index e1ede31..9e17981 100755
--- a/gnucash-bundler/gnucash-svn.launcher
+++ b/gnucash-bundler/gnucash-svn.launcher
@@ -10,7 +10,7 @@ else
EXEC=exec
fi
-export PREFIX=/Library/Gnucash-2.3.x
+export PREFIX=/Library/Gnucash-svn
export PREFIXDIR="`dirname $PREFIX`"
name=`basename "$0"`
commit 09ae6bbe192d1a6f91a1a786ce3bcd4ecf1f2796
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 21 15:03:16 2011 -0700
Remove the Qt frameworks from the unstable and svn bundles.
diff --git a/gnucash-bundler/gnucash-svn.bundle b/gnucash-bundler/gnucash-svn.bundle
index 3f3cb15..52c795c 100644
--- a/gnucash-bundler/gnucash-svn.bundle
+++ b/gnucash-bundler/gnucash-svn.bundle
@@ -122,30 +122,6 @@
${prefix}/lib/dbd
</binary>
- <framework>
- /Library/Frameworks/QtCore.framework
- </framework>
-
- <framework>
- /Library/Frameworks/QtGui.framework
- </framework>
-
- <framework>
- /Library/Frameworks/Qt3Support.framework
- </framework>
-
- <framework>
- /Library/Frameworks/QtSql.framework
- </framework>
-
- <framework>
- /Library/Frameworks/QtXml.framework
- </framework>
-
- <framework>
- /Library/Frameworks/QtNetwork.framework
- </framework>
-
<!-- Data to copy in, usually Glade/UI files, images, sounds files
etc. The destination inside the bundle can be specified if the
files should end up at a different location, by using the
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index ba32095..e3af12c 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -122,30 +122,6 @@
${prefix}/lib/dbd
</binary>
- <framework>
- /Library/Frameworks/QtCore.framework
- </framework>
-
- <framework>
- /Library/Frameworks/QtGui.framework
- </framework>
-
- <framework>
- /Library/Frameworks/Qt3Support.framework
- </framework>
-
- <framework>
- /Library/Frameworks/QtSql.framework
- </framework>
-
- <framework>
- /Library/Frameworks/QtXml.framework
- </framework>
-
- <framework>
- /Library/Frameworks/QtNetwork.framework
- </framework>
-
<!-- Data to copy in, usually Glade/UI files, images, sounds files
etc. The destination inside the bundle can be specified if the
files should end up at a different location, by using the
commit d1211e0bbf3c491f973d8a247be4eaf720fe7017
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 21 15:02:36 2011 -0700
Update unstable and svn bundles for use with Gtk-2.24, where gdk-pixbuf modules are in a separate directory
diff --git a/gnucash-bundler/gnucash-svn.bundle b/gnucash-bundler/gnucash-svn.bundle
index 4f01f01..3f3cb15 100644
--- a/gnucash-bundler/gnucash-svn.bundle
+++ b/gnucash-bundler/gnucash-svn.bundle
@@ -53,7 +53,7 @@
binaries link to are also copied in automatically.
-->
<binary>
- ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/loaders/*.so
+ ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so
</binary>
<!-- Copy in the theme engines. -->
<binary>
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 81b4e91..ba32095 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -53,7 +53,7 @@
binaries link to are also copied in automatically.
-->
<binary>
- ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/loaders/*.so
+ ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so
</binary>
<!-- Copy in the theme engines. -->
<binary>
commit 8277d62004e7107f6169349f79d42b5203aa1592
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 13 14:57:05 2011 -0700
Add gnucash-git for working with the git mirror.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 49056b5..a3ba93c 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -34,11 +34,14 @@
href="http://devel.aqbanking.de/svn/"/>
<repository type="tarball" name="iso-codes"
href="ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/"/>
+ <repository type="git" name="github"
+ href="git://github.com/"/>
-
- <include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/>
-
+ <!--include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/ -->
+ <include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
<include href="gtkhtml.modules"/>
+ <include href="finance-quote.modules"/>
+
<autotools id='readline' >
@@ -231,6 +234,26 @@
<dep package="libgnomeui"/>
<dep package="WebKit"/>
<dep package="Slib"/>
+ <dep package="goffice"/>
+ <dep package="libdbi-drivers"/>
+ <dep package="iso-codes"/>
+ </dependencies>
+
+ </autotools>
+
+ <autotools id="gnucash-git"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
+ <branch repo="github" module="Gnucash/gnucash.git" revision="trunk"
+ checkoutdir="gnucash-git"/>
+ <dependencies>
+ <dep package="meta-gtk-osx-core"/>
+ <dep package="libofx"/>
+ <dep package="aqbanking"/>
+ <dep package="libgnomeui"/>
+ <dep package="WebKit"/>
+ <dep package="Slib"/>
+ <dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
</dependencies>
commit be517d862b44e3d47561212e3c343d8fce2d4e74
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 13 14:52:00 2011 -0700
Update modulesets and bundle to work with new gtk-osx layout, new aqbanking-5, and gtk+-2.24.
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 5e93b8a..5421b96 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -53,7 +53,7 @@
binaries link to are also copied in automatically.
-->
<binary>
- ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/loaders/*.so
+ ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so
</binary>
<!-- Copy in the theme engines. -->
<binary>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index ce8d6ea..49056b5 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -137,6 +137,11 @@
</dependencies>
</autotools>
+ <autotools id="guile" autogen-sh="configure">
+ <branch repo="ftp.gnu.org" module="guile/guile-1.8.8.tar.gz"
+ version="1.8.8"/>
+ </autotools>
+
<autotools id="Slib" autogen-sh="install.sh" makeargs="-f Makefile.gnucash"
makeinstallargs="-f Makefile.gnucash">
<!-- <branch repo="slib.savannah.gnu.org"
@@ -146,6 +151,7 @@
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/slib-install.patch"/>
</branch>
<dependencies>
+ <dep package="guile"/>
</dependencies>
</autotools>
@@ -168,7 +174,7 @@
<autotools id="libdbi" autogen-template="%(srcdir)s/autogen.sh && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs="--disable-docs">
<branch repo="sourceforge" module="libdbi/libdbi-0.8.3.tar.gz"
- version="0.8.3">
+ version="0.8.4">
<patch file="http://github.com/jralls/gtk-osx-build/raw/master/patches/dbi.patch" strip="1"/>
</branch>
</autotools>
@@ -221,8 +227,7 @@
<dependencies>
<dep package="meta-gtk-osx-core"/>
<dep package="libofx"/>
- <!--dep package="aqbanking"/ -->
- <dep package="aqbanking-svn"/>
+ <dep package="aqbanking"/>
<dep package="libgnomeui"/>
<dep package="WebKit"/>
<dep package="Slib"/>
@@ -244,6 +249,7 @@
<dep package="WebKit"/>
<dep package="libgnomeui"/>
<dep package="Slib"/>
+ <dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
</dependencies>
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index 4f73cae..be7013a 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -147,6 +147,18 @@ Optionally you may want to install GConf 1.0.7 (or later).
</dependencies>
</autotools>
+<!-- libgnomeui requires the old gnome-keyring library, deleted after
+ the release of gnome-keyring 2.28-->
+ <autotools id="gnome-keyring-28">
+ <branch module="gnome-keyring/2.28/gnome-keyring-2.28.2.tar.bz2"
+ version="2.28.2" hash="sha256:d2d686fb2528ee045bbcd9f18d0d452e0eb88c2265a1947f639152b61a5987f6"/>
+ <dependencies>
+ <dep package="gtk+"/>
+ <dep package="libgcrypt"/>
+ <dep package="libtasn1"/>
+ </dependencies>
+ </autotools>
+
<autotools id="libgnomeui" >
<branch module="libgnomeui/2.24/libgnomeui-2.24.2.tar.bz2" version="2.24.2"
repo="ftp.gnome.org" hash="sha256:ae7459b3ddee78258bb2d619fd199b0b24647f1df45fc397fee83d659c354910">
@@ -156,7 +168,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
<dep package="libbonoboui"/>
<dep package="libglade"/>
<dep package="gnome-icon-theme"/>
- <dep package="gnome-keyring"/>
+ <dep package="gnome-keyring-28"/>
</dependencies>
</autotools>
commit f59219c8e37e2faa24e19a17a84f6c59ea3298c5
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 13 14:43:16 2011 -0700
Bump Gnucash version to 2.4.4
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index f841425..6019b64 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.4.3 © 2011 Gnucash Contributors</string>
+ <string>Gnucash version 2.4.4 © 2011 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4.3 © 2011 Gnucash Contributers</string>
+ <string>2.4.4 © 2011 Gnucash Contributers</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4.3</string>
+ <string>2.4.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.4.3</string>
+ <string>2.4.4</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 7819bc9..ce8d6ea 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -198,7 +198,7 @@
<autotools id="gnucash"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
- <branch module="gnucash" revision="20345" repo="svn.gnucash.org">
+ <branch module="gnucash" revision="20418" repo="svn.gnucash.org">
</branch>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit e7ec700c9871392cd836555324a1b22212c11271
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 13 14:35:51 2011 -0700
Bump Gnucash to 2.4.3
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 2027377..f841425 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.4.1 © 2011 Gnucash Contributors</string>
+ <string>Gnucash version 2.4.3 © 2011 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4.1 © 2009 Free Software Foundation</string>
+ <string>2.4.3 © 2011 Gnucash Contributers</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4.1</string>
+ <string>2.4.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.4.1</string>
+ <string>2.4.3</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 826e2ff..7819bc9 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -198,7 +198,7 @@
<autotools id="gnucash"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
- <branch module="gnucash" revision="20232" repo="svn.gnucash.org">
+ <branch module="gnucash" revision="20345" repo="svn.gnucash.org">
</branch>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit 89973c5b50767e4e2c88fcfe8e889f63a47e1aac
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Feb 5 07:12:55 2011 -0800
Add Gtk20 Translations to bundle.
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 5c1bbb1..5e93b8a 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -250,6 +250,10 @@
${prefix}/share/locale
</translations>
+ <translations name="gtk20">
+ ${prefix}/share/locale
+ </translations>
+
<translations name="iso_4217">
${prefix}/share/locale
</translations>
commit 80dbeb73d79ea5872a6a8e26b6b923489592aba6
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Feb 5 07:12:32 2011 -0800
Release Gnucash 2.4.1
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 35cabd6..2027377 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.4.0 © 2010 Gnucash Contributors</string>
+ <string>Gnucash version 2.4.1 © 2011 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4.0 © 2009 Free Software Foundation</string>
+ <string>2.4.1 © 2009 Free Software Foundation</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4.0</string>
+ <string>2.4.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.4.0</string>
+ <string>2.4.1</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
@@ -62,6 +62,6 @@
<key>LSMinimumSystemVersion</key>
<string>10.5.0</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2010 Gnucash Contributors</string>
+ <string>Copyright 2011 Gnucash Contributors</string>
</dict>
</plist>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index d6629dd..826e2ff 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -198,7 +198,7 @@
<autotools id="gnucash"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
- <branch module="gnucash" revision="19974" repo="svn.gnucash.org">
+ <branch module="gnucash" revision="20232" repo="svn.gnucash.org">
</branch>
<dependencies>
<dep package="meta-gtk-osx-core"/>
@@ -263,7 +263,7 @@
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
makeargs=" html" makeinstallargs="install-html" >
<branch repo="svn.gnucash.org" module="gnucash-docs"
- revision="gnucash-docs-2.4"/>
+ />
</autotools>
<autotools id="scrollkeeper">
commit 3d88d7ba6e82ff8b656c36bf38b6d59382e1ca04
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Feb 5 07:10:50 2011 -0800
More reorganization.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 6342bb5..d6629dd 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -133,30 +133,10 @@
<branch repo="sourceforge" module="libofx/libofx-0.9.1.tar.gz"
version='0.9.1'/>
<dependencies>
- <dep package='guile'/>
<dep package="OpenSP"/>
</dependencies>
</autotools>
- <autotools id="guile-1.6" autogen-sh="configure"
- autogenargs="--disable-static --enable-shared
- --disable-scrollkeeper --disable-xlib">
- <branch repo="ftp.gnu.org" module="guile/guile-1.6.8.tar.gz"
- version="1.6.8" size="3114052" />
- <dependencies>
- <dep package='readline'/>
- </dependencies>
- </autotools>
-
- <autotools id="guile" autogen-sh="configure">
- <branch repo="ftp.gnu.org" module="guile/guile-1.8.7.tar.gz"
- version="1.8.7" />
- <dependencies>
- <dep package='readline'/>
- <dep package="gmp"/>
- </dependencies>
- </autotools>
-
<autotools id="Slib" autogen-sh="install.sh" makeargs="-f Makefile.gnucash"
makeinstallargs="-f Makefile.gnucash">
<!-- <branch repo="slib.savannah.gnu.org"
@@ -166,7 +146,6 @@
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/slib-install.patch"/>
</branch>
<dependencies>
- <dep package="guile"/>
</dependencies>
</autotools>
@@ -222,14 +201,13 @@
<branch module="gnucash" revision="19974" repo="svn.gnucash.org">
</branch>
<dependencies>
- <dep package="meta-goffice"/>
<dep package="meta-gtk-osx-core"/>
<dep package="libofx"/>
- <!--dep package="aqbanking"/-->
<dep package="aqbanking"/>
<dep package="libgnomeui"/>
<dep package="WebKit"/>
<dep package="Slib"/>
+ <dep package="goffice"/>
<dep package="libdbi-drivers"/>
<dep package="iso-codes"/>
</dependencies>
@@ -242,11 +220,9 @@
<branch repo="svn.gnucash.org" module="gnucash"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
- <dep package="meta-goffice"/>
<dep package="libofx"/>
<!--dep package="aqbanking"/ -->
<dep package="aqbanking-svn"/>
- <!--dep package="meta-gtkhtml"/-->
<dep package="libgnomeui"/>
<dep package="WebKit"/>
<dep package="Slib"/>
@@ -263,7 +239,6 @@
<dependencies>
<dep package="meta-gtk-osx-core"/>
- <dep package="meta-goffice"/>
<dep package="libofx"/>
<dep package="aqbanking"/>
<dep package="WebKit"/>
@@ -295,8 +270,6 @@
<branch repo="sourceforge" module="scrollkeeper/scrollkeeper-0.3.14.tar.gz"
version="0.3.14"/>
<dependencies>
- <dep package="libxml2"/>
- <dep package="libxslt"/>
<dep package="gtk-osx-docbook"/>
</dependencies>
</autotools>
commit 181458bdb903f42834a6797877cea383392aa391
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Feb 5 07:07:13 2011 -0800
Switch to AQBanking5 with Gtk wizard.
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 47cc7f5..5c1bbb1 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -122,29 +122,6 @@
${prefix}/lib/dbd
</binary>
- <framework>
- /Library/Frameworks/QtCore.framework
- </framework>
-
- <framework>
- /Library/Frameworks/QtGui.framework
- </framework>
-
- <framework>
- /Library/Frameworks/Qt3Support.framework
- </framework>
-
- <framework>
- /Library/Frameworks/QtSql.framework
- </framework>
-
- <framework>
- /Library/Frameworks/QtXml.framework
- </framework>
-
- <framework>
- /Library/Frameworks/QtNetwork.framework
- </framework>
<!-- Data to copy in, usually Glade/UI files, images, sounds files
etc. The destination inside the bundle can be specified if the
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index da8c6cc..6342bb5 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -2,9 +2,10 @@
<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
<moduleset>
- <repository type="svn" name="svn.gnome.org" default="yes"
- href="http://svn.gnome.org/svn/"/>
- <repository type="tarball" name="kernel.org"
+
+ <repository type="tarball" name="ftp.gnome.org" default="yes"
+ href="http://ftp.gnome.org/pub/GNOME/sources/"/>
+ <repository type="tarball" name="kernel.org"
href="http://www.kernel.org/pub/linux/"/>
<repository type='tarball' name='ftp.gnu.org'
href="ftp://ftp.gnu.org/gnu/"/>
@@ -55,9 +56,10 @@
<branch module="iso-codes-3.21.tar.bz2" version="3.21" repo="iso-codes"/>
</autotools>
- <autotools id="gwenhywfar" autogen-sh="configure">
- <branch module="gwenhywfar-3.11.1.tar.gz" version="3.11.1"
- repo="github_gnucash"/>
+ <autotools id="gwenhywfar" autogen-sh="configure"
+ autogenargs="--disable-qt4 --with-guis=gtk2">
+ <branch module="gwenhywfar-4.0.4.tar.gz" version="4.0.4"
+ repo="github_gnucash" />
<dependencies>
<dep package="libgcrypt"/>
<dep package="gnutls"/>
@@ -78,12 +80,10 @@
repo="sourceforge"/>
</autotools>
- <autotools id="aqbanking" autogen-sh="configure"
- autogenargs='--enable-ofx=yes --disable-qt3 --disable-kde --disable-chipcard-client --disable-python --with-frontends="cbanking g2banking"' >
- <branch module="aqbanking-4.2.4.tar.gz" version="4.2.4"
+ <autotools id="aqbanking" autogen-sh="configure">
+ <branch module="aqbanking-5.0.2.tar.bz2" version="5.0.2"
repo="github_gnucash"/>
<dependencies>
- <dep package="libofx"/>
<dep package="gwenhywfar"/>
<dep package="gmp"/>
<dep package="ktoblzcheck"/>
@@ -226,7 +226,7 @@
<dep package="meta-gtk-osx-core"/>
<dep package="libofx"/>
<!--dep package="aqbanking"/-->
- <dep package="aqbanking-qt"/>
+ <dep package="aqbanking"/>
<dep package="libgnomeui"/>
<dep package="WebKit"/>
<dep package="Slib"/>
@@ -265,10 +265,8 @@
<dep package="meta-gtk-osx-core"/>
<dep package="meta-goffice"/>
<dep package="libofx"/>
- <!-- dep package="aqbanking"/ -->
- <dep package="aqbanking-qt"/>
- <!-- dep package="meta-gtkhtml"/ -->
- <dep package="WebKit"/>
+ <dep package="aqbanking"/>
+ <dep package="WebKit"/>
<dep package="libgnomeui"/>
<dep package="Slib"/>
<dep package="libdbi-drivers"/>
commit 33a80721d3ef8f298fa44481e65749af59a7e4a6
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Feb 5 07:05:51 2011 -0800
Clean up Gtkhtml.modules to reflect new arrangement in gtk-osx-build.
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index 92b9479..4f73cae 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -60,17 +60,14 @@ Optionally you may want to install GConf 1.0.7 (or later).
hash="sha2556:6290424e51770fc09701ebaf89b7089214bbb9c81223430800160beee6f42288"/>
<dependencies>
<dep package="gtk+"/>
- <dep package="libgnomeui"/>
- <dep package="libbonoboui"/>
- <dep package="libglade"/>
- <dep package="libgnomeprint"/>
- <dep package="libgnomeprintui"/>
<dep package="iso-codes"/>
- <dep package="enchant"/>
+ <dep package="enchant"/>
+ <dep package="gconf"/>
<dep package="libsoup"/>
+<!-- dep package="gnome-icon-theme" -->
</dependencies>
</autotools>
-
+<!-- Most of the following packages are deprecated -->
<autotools id="libgnomecups">
<branch module="libgnomecups/0.2/libgnomecups-0.2.3.tar.bz2" version="0.2.3"
md5sum="dc4920c15c9f886f73ea74fbff0ae48b"/>
@@ -173,7 +170,6 @@ Optionally you may want to install GConf 1.0.7 (or later).
<dep package="ORBit2"/>
<dep package="intltool"/>
<dep package="gnome-common"/>
- <dep package="libxml2"/>
<dep package="dbus-glib"/>
</dependencies>
</autotools>
@@ -193,8 +189,6 @@ Optionally you may want to install GConf 1.0.7 (or later).
<branch module="libgnome/2.26/libgnome-2.26.0.tar.bz2" version="2.26.0"
md5sum="a5634fe9ddc54bbb726cbaaa35abc0b9"/>
<dependencies>
- <dep package="libxml2"/>
- <dep package="libxslt"/>
<dep package="libbonobo"/>
<dep package="gnome-vfs"/>
<dep package="gconf"/>
@@ -205,6 +199,10 @@ Optionally you may want to install GConf 1.0.7 (or later).
<autotools id="libgnomecanvas">
<branch module="libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2"
version="2.26.0" md5sum="9bbc635e5ae70e63af071af74ba7e72f"/>
+ <dependencies>
+ <dep package="libart_lgpl"/>
+ <dep package="libglade"/>
+ </dependencies>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
<dep package="meta-gtk-osx-core"/>
commit 324d5761691be7de3bafec4ad732c8197499c14c
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Feb 5 07:04:53 2011 -0800
move goffice to gnucash.modules
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index f634892..da8c6cc 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -38,7 +38,6 @@
<include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/>
<include href="gtkhtml.modules"/>
- <include href="goffice.modules"/>
<autotools id='readline' >
@@ -206,6 +205,15 @@
</dependencies>
</autotools>
+ <autotools id="goffice" autogenargs="--without-gconf">
+ <branch module="goffice/0.8/goffice-0.8.12.tar.bz2" version="0.8.12"
+ hash="sha256:c165f8b7aaab709295c8225b30f49fe75655149b982fd045d8c23bb7772eb22a"/>
+ <dependencies>
+ <dep package="gtk+"/>
+ <dep package="libgsf"/>
+ <dep package="gconf"/>
+ </dependencies>
+ </autotools>
<autotools id="gnucash"
diff --git a/modulesets/goffice.modules b/modulesets/goffice.modules
index 648ec00..8e6373c 100644
--- a/modulesets/goffice.modules
+++ b/modulesets/goffice.modules
@@ -13,32 +13,6 @@
</dependencies>
</metamodule>
- <autotools id="goffice" autogenargs="--without-gconf">
- <branch module="goffice/0.8/goffice-0.8.8.tar.bz2" version="0.8.8"
- hash="sha256:7a2cd13997d74e3bad76939f7767bf4bae27a76210096c09854d80a0b8ec9cac"/>
- <dependencies>
- <dep package="gtk+"/>
- <dep package="libgsf"/>
- <dep package="libxml2"/>
- <dep package="libglade"/>
- <dep package="libart_lgpl"/>
- <dep package="gconf"/>
- </dependencies>
- </autotools>
-
- <autotools id="goffice-0.7.4" autogenargs="--without-gconf">
- <!-- gnucash 2.2.9 won't build against newer GOffice. -->
- <branch module="goffice/0.7/goffice-0.7.4.tar.bz2" version="0.7.4"
- md5sum="8fe65cb6a60e6064025fa465da99d31e"/>
- <dependencies>
- <dep package="gtk+"/>
- <dep package="libgsf"/>
- <dep package="libxml2"/>
- <dep package="libglade"/>
- <dep package="libart_lgpl"/>
- <dep package="gconf"/>
- </dependencies>
- </autotools>
commit 88ecae4a2bf25fac36ce8648e05509a037f1c922
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Dec 22 06:30:18 2010 -0800
Fix error in gnucash module's autogen.sh
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index cd4af8e..f634892 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -208,7 +208,7 @@
- <autotools id="gnucash" autogen-sh="configure"
+ <autotools id="gnucash"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
<branch module="gnucash" revision="19974" repo="svn.gnucash.org">
commit 840fb20837bd6af4026f7c554ddb50b08b9b6fd4
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Dec 21 15:07:52 2010 -0800
Clean out trailing whitespace.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index bc145a7..cd4af8e 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -2,7 +2,7 @@
<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
<moduleset>
- <repository type="svn" name="svn.gnome.org" default="yes"
+ <repository type="svn" name="svn.gnome.org" default="yes"
href="http://svn.gnome.org/svn/"/>
<repository type="tarball" name="kernel.org"
href="http://www.kernel.org/pub/linux/"/>
@@ -15,13 +15,13 @@
<!-- <repository type="cvs" name="slib.savannah.gnu.org"
cvsroot=":pserver:anonymous at cvs.savannah.gnu.org:/sources/slib"
password=""/> -->
- <repository type="tarball" name="csail"
+ <repository type="tarball" name="csail"
href="http://groups.csail.mit.edu/mac/ftpdir/"/>
- <repository type="tarball" name="csclub"
+ <repository type="tarball" name="csclub"
href="http://mirror.csclub.uwaterloo.ca/mysql/Downloads/"/>
<repository type="tarball" name="gnucash.org"
href="http://www.gnucash.org/pub/gnucash/sources/"/>
- <repository type="svn" name="svn.gnucash.org"
+ <repository type="svn" name="svn.gnucash.org"
href="http://svn.gnucash.org/repo/"/>
<repository type="tarball" name="github_gnucash"
href="http://github.com/downloads/jralls/gnucash-on-osx/"/>
@@ -79,7 +79,7 @@
repo="sourceforge"/>
</autotools>
- <autotools id="aqbanking" autogen-sh="configure"
+ <autotools id="aqbanking" autogen-sh="configure"
autogenargs='--enable-ofx=yes --disable-qt3 --disable-kde --disable-chipcard-client --disable-python --with-frontends="cbanking g2banking"' >
<branch module="aqbanking-4.2.4.tar.gz" version="4.2.4"
repo="github_gnucash"/>
@@ -91,7 +91,7 @@
</dependencies>
</autotools>
- <autotools id="aqbanking-qt" autogen-sh="configure"
+ <autotools id="aqbanking-qt" autogen-sh="configure"
autogenargs="--enable-ofx=yes --disable-kde --disable-chipcard-client --disable-python --with-frontends='cbanking g2banking q4banking' qt4_libs='-framework QtCore -framework QtGui -framework Qt3Support' qt4_includes='-framework QtCore -framework QtGui -framework Qt3Support'">
<branch module="aqbanking-4.2.4.tar.gz" version="4.2.4"
repo="github_gnucash" >
@@ -105,7 +105,7 @@
</dependencies>
</autotools>
- <autotools id="aqbanking-svn"
+ <autotools id="aqbanking-svn"
autogenargs='--enable-ofx=yes --disable-kde --disable-chipcard-client --disable-python --with-frontends="cbanking g2banking"'
autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" >
<branch module="aqbanking" repo="aquamaniac" >
@@ -126,7 +126,7 @@
and rerun build and it will work OK. -->
<autotools id="OpenSP" autogen-template="%(srcdir)s/autoinit.sh && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs="--disable-static --enable-shared --disable-doc-build --disable-nls">
- <branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
+ <branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
version='1.5.2'/>
</autotools>
@@ -140,9 +140,9 @@
</autotools>
<autotools id="guile-1.6" autogen-sh="configure"
- autogenargs="--disable-static --enable-shared
+ autogenargs="--disable-static --enable-shared
--disable-scrollkeeper --disable-xlib">
- <branch repo="ftp.gnu.org" module="guile/guile-1.6.8.tar.gz"
+ <branch repo="ftp.gnu.org" module="guile/guile-1.6.8.tar.gz"
version="1.6.8" size="3114052" />
<dependencies>
<dep package='readline'/>
@@ -150,7 +150,7 @@
</autotools>
<autotools id="guile" autogen-sh="configure">
- <branch repo="ftp.gnu.org" module="guile/guile-1.8.7.tar.gz"
+ <branch repo="ftp.gnu.org" module="guile/guile-1.8.7.tar.gz"
version="1.8.7" />
<dependencies>
<dep package='readline'/>
@@ -158,7 +158,7 @@
</dependencies>
</autotools>
- <autotools id="Slib" autogen-sh="install.sh" makeargs="-f Makefile.gnucash"
+ <autotools id="Slib" autogen-sh="install.sh" makeargs="-f Makefile.gnucash"
makeinstallargs="-f Makefile.gnucash">
<!-- <branch repo="slib.savannah.gnu.org"
module="slib"/> -->
@@ -178,7 +178,7 @@
</autotools>
<cmake id="mysql">
- <branch repo="csclub" module="Connector-C/mysql-connector-c-6.0.2.tar.gz"
+ <branch repo="csclub" module="Connector-C/mysql-connector-c-6.0.2.tar.gz"
version="6.0.2" >
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/libmysql.patch"/>
</branch>
@@ -189,7 +189,7 @@
<autotools id="libdbi" autogen-template="%(srcdir)s/autogen.sh && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs="--disable-docs">
- <branch repo="sourceforge" module="libdbi/libdbi-0.8.3.tar.gz"
+ <branch repo="sourceforge" module="libdbi/libdbi-0.8.3.tar.gz"
version="0.8.3">
<patch file="http://github.com/jralls/gtk-osx-build/raw/master/patches/dbi.patch" strip="1"/>
</branch>
@@ -248,10 +248,10 @@
</autotools>
- <autotools id="gnucash-unstable"
+ <autotools id="gnucash-unstable"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch branch="2.3.17" module="gnucash" repo="svn.gnucash.org"/>
+ <branch revision="2.5.0" module="gnucash" repo="svn.gnucash.org"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit cef58fefec8509e063bccb2594991474dbb7e15a
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Dec 21 15:07:23 2010 -0800
Release Gnucash 2.4.0
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index afb3f10..35cabd6 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.2.9 © 2009 Free Software Foundation</string>
+ <string>Gnucash version 2.4.0 © 2010 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,22 +15,53 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.2.9 © 2009 Free Software Foundation</string>
+ <string>2.4.0 © 2009 Free Software Foundation</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.2.9</string>
+ <string>2.4.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.2.9</string>
+ <string>2.4.0</string>
+ <key>CFBundleDocumentTypes</key>
+ <array>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Gnucash Document</string>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>gnucash</string>
+ </array>
+ <key>CFBundlieTypeIconFile</key>
+ <string>gnucash.icns</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Gnucash Import/Export</string>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>qif</string>
+ <string>ofx</string>
+ <string>txf</string>
+ </array>
+ <key>CFBundlieTypeIconFile</key>
+ <string>gnucash.icns</string>
+ <key>CFBundleTypeRole</key>
+ <string>Viewer</string>
+ </dict>
+ </array>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
<true/>
+ <key>LSMinimumSystemVersion</key>
+ <string>10.5.0</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2009 Free Software Foundation</string>
+ <string>Copyright 2010 Gnucash Contributors</string>
</dict>
</plist>
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 8868300..47cc7f5 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -31,7 +31,7 @@
not needed. If the source path is left out, the default
script will be used.
-->
- <launcher-script>${project}/gnucash-launcher</launcher-script>
+ <launcher-script>${project}/gnucash.launcher</launcher-script>
<!-- Not implemented: Optional runtime, could be python or mono
for example.
@@ -45,12 +45,12 @@
-->
<plist>${project}/Info.plist</plist>
- <main-binary>${prefix}/bin/gnucash-bin</main-binary>
+ <main-binary>${prefix}/bin/gnucash</main-binary>
<!-- Copy in GTK+ and Pango modules. Note the use of the
"${pkg:module:variable}" macro, which evaluates to a pkg-config
variable in the specified module. Note that any libraries that
- binaries link to are also copied in automatically.
+ binaries link to are also copied in automatically.
-->
<binary>
${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/loaders/*.so
@@ -59,6 +59,7 @@
<binary>
${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/engines/*.so
</binary>
+
<!-- And the print backends -->
<binary>
${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/printbackends/*.so
@@ -109,10 +110,18 @@
${prefix}/bin/gnc-*
</binary>
+ <binary dest="${bundle}/Contents/MacOS">
+ ${prefix}/bin/aqbanking-cli
+ </binary>
+
<binary>
${prefix}/lib/goffice
</binary>
+ <binary>
+ ${prefix}/lib/dbd
+ </binary>
+
<framework>
/Library/Frameworks/QtCore.framework
</framework>
@@ -137,7 +146,6 @@
/Library/Frameworks/QtNetwork.framework
</framework>
-
<!-- Data to copy in, usually Glade/UI files, images, sounds files
etc. The destination inside the bundle can be specified if the
files should end up at a different location, by using the
@@ -165,10 +173,6 @@
</data>
<data>
- ${prefix}/etc/gwen-public-ca.crt
- </data>
-
- <data>
${prefix}/etc/fonts
</data>
@@ -201,10 +205,6 @@
</data>
<data>
- ${prefix}/share/aqhbci
- </data>
-
- <data>
${prefix}/share/mime
</data>
@@ -221,6 +221,9 @@
${project}/gnucash.icns
</data>
+ <data dest="${bundle}/Contents/Resources">
+ ${prefix}/share/strings
+ </data>
<data dest='${bundle}/Contents/Resources/var/lib/dbus/machine-id'>
${prefix}/var/lib/dbus/machine-id
@@ -237,24 +240,48 @@
<data dest="${bundle}/Contents/Resources/Sources">
${project}/Sources
</data>
-<!-- These can be pointed to ${prefix} like in unstable for the 2.4 release -->
- <data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Help/">
- /usr/local/src/gnucash-stable/gnucash-docs-2.2.0/help/C/gnucash-help/
+
+ <data dest="${bundle}/Contents/Resources/en.lproj/GnuCash Help/">
+ ${prefix}/share/gnome/help/gnucash/C/gnucash-help
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/en.lproj/GnuCash Guide/">
+ ${prefix}/share/gnome/help/gnucash/C/gnucash-guide/
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/de.lproj/GnuCash Help/">
+ ${prefix}/share/gnome/help/gnucash/de_DE/gnucash-help
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/de.lproj/GnuCash Guide/">
+ ${prefix}/share/gnome/help/gnucash/de_DE/gnucash-guide/
</data>
- <data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Guide/">
- /usr/local/src/gnucash-stable/gnucash-docs-2.2.0/guide/C/gnucash-guide/
+ <data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Help/">
+ ${prefix}/share/gnome/help/gnucash/it_IT/gnucash-help
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Guide/">
+ ${prefix}/share/gnome/help/gnucash/it_IT/gnucash-guide/
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/ja.lproj/GnuCash Guide/">
+ ${prefix}/share/gnome/help/gnucash/ja_JP/gnucash-guide/
</data>
<translations name="gnucash">
${prefix}/share/locale
</translations>
+ <translations name="iso_4217">
+ ${prefix}/share/locale
+ </translations>
+
<translations name="aqbanking">
${prefix}/share/locale
</translations>
-<!-- This takes the Quartz theme instructions from the package and puts them in the bundle gtkrc file. You may want to cusomize the source path if you want a different theme, or if you want other stuff in your gtkrc.
+<!-- This takes the Quartz theme instructions from the package and puts them in the bundle gtkrc file. You may want to cusomize the source path if you want a different theme, or if you want other stuff in your gtkrc.
<data dest='${bundle}/Contents/Resources/etc/gtk-2.0/gtkrc'>
${prefix}/share/themes/Quartz/gtk-2.0/gtkrc
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash.launcher
similarity index 52%
rename from gnucash-bundler/gnucash-launcher
rename to gnucash-bundler/gnucash.launcher
index fb2fe4d..222b13e 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash.launcher
@@ -10,10 +10,10 @@ else
EXEC=exec
fi
-export PREFIX=/Library/Gnucash-2.2.9
+export PREFIX=/Library/Gnucash-2.4
export PREFIXDIR="`dirname $PREFIX`"
-name="`basename $0`"
+name=`basename "$0"`
tmp="$0"
tmp=`dirname "$tmp"`
tmp=`dirname "$tmp"`
@@ -28,7 +28,7 @@ bundle_etc="$bundle_res"/etc
export DYLD_LIBRARY_PATH="$bundle_lib"
export XDG_CONFIG_DIRS="$bundle_etc"/xdg
-export XDG_DATA_DIRS="$PREFIX"/share
+export XDG_DATA_DIRS="$PREFIX/share"
export GTK_DATA_PREFIX="$bundle_res"
export GTK_EXE_PREFIX="$bundle_res"
export GTK_PATH="$bundle_res"
@@ -38,89 +38,12 @@ export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
-# Set the locale-related variables appropriately for GnuCash.
-unset LANG LC_MESSAGES LC_MONETARY
-
-# Start by trying the Collation preference, in case it's the only setting that exists.
-APPLECOLLATION=`defaults read .GlobalPreferences AppleCollationOrder`
-if test "${APPLECOLLATION}"; then
- COLL=`ls -d /usr/share/locale/${APPLECOLLATION}*.UTF-8 2>> /dev/null`
- if test "${COLL}"; then
- # $COLL is potentially multi-line; concatenate lines by not using quotes.
- export LANG=`echo ${COLL} | awk '{print $1}' | awk -F/ '{print $5}'`
- fi
-fi
-unset APPLECOLLATION COLL
-
-# Continue by attempting to find the Locale preference.
-APPLELOCALE=`defaults read .GlobalPreferences AppleLocale`
-if test "${APPLELOCALE}"; then
- LOCALELANG=`echo "${APPLELOCALE}" | awk -F@ '{print $1".UTF-8"}'`
- if test -d "/usr/share/locale/${LOCALELANG}"; then
- export LANG="${LOCALELANG}"
- fi
-fi
-unset LOCALELANG
-
-# If there is still no locale value, then set US English as a default.
-if test -z "${LANG}"; then
- export LANG=en_US.UTF-8
-fi
-
-# The AppleLocale setting may contain a currency-related substring.
-# Attempt to act on it.
-# First strip the string to just the currency symbol and the language symbol
-APPLECURRENCY=`echo "${APPLELOCALE}" | awk -F= '{print $2}'`
-APPLELANG=`echo "${APPLELOCALE}" | awk -F_ '{print $1}'`
-if test "${APPLECURRENCY}"; then
- # The user has set a currency different from that of their locale.
- # Search for a locale that uses that currency, and set LC_MONETARY accordingly.
-
- # First try to find an LC_MONETARY file that combines the language with the currency.
- FILES=`find /usr/share/locale/${APPLELANG}*UTF-8 -name LC_MONETARY -exec grep -H $APPLECURRENCY {} \;`
- if test -z "$FILES"; then
- # Otherwise try to find any LC_MONETARY file that uses that currency.
- FILES=`find /usr/share/locale/*UTF-8 -name LC_MONETARY -exec grep -H $APPLECURRENCY {} \;`
- fi
-
- if test "$FILES"; then
- # We found a locale that matches; set LC_MONETARY.
- export LC_MONETARY=`echo ${FILES} | awk -F: '{print $1}' | awk -F/ '{print $5}'`
- fi
-fi
-unset APPLECURRENCY APPLELANG APPLELOCALE FILES
-
-# Has a language ordering been set?
-# If so, set LC_MESSAGES accordingly; otherwise skip it.
-APPLELANGUAGES=`defaults read .GlobalPreferences AppleLanguages | awk 'length > 2' | awk -F, '{print $1}' | sed s/\ //g | sed s/-/_/ | sed s/\"//g`
-if test "$APPLELANGUAGES"; then
- # A language ordering exists.
- # Test, item per item, to see whether there is an corresponding locale.
- for L in $APPLELANGUAGES
- do
- POS=`echo ${L} | awk '{print index(ENVIRON["LANG"], $0)}'`
- if test "$POS" -eq 1; then
- # The language symbol is a subset of the $LANG variable. We're done!
- break
- fi
- # NOTE: the following may fail for the alternate Chinese localizations.
- LC=`ls -d /usr/share/locale/${L}*.UTF-8 2>> /dev/null`
- # $LC is potentially multi-line; concatenate lines by not using quotes.
- if test $LC; then
- # There is a UTF-8 locale matching this language.
- export LC_MESSAGES=`echo ${LC} | awk '{print $1}' | awk -F/ '{print $5}'`
- break
- fi
- done
-fi
-unset APPLELANGUAGES POS LC L
-
if test -f "$bundle_lib/charset.alias"; then
export CHARSETALIASDIR="$bundle_lib"
fi
# Extra arguments can be added in environment.sh.
-EXTRA_ARGS="--config-path \"$bundle_etc/gnucash\" --share-path \"$bundle_data/gnucash\" --debug"
+EXTRA_ARGS=" --debug"
if test -f "$bundle_res/environment.sh"; then
source "$bundle_res/environment.sh"
@@ -132,8 +55,8 @@ if [ x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ]; then
fi
export RESPFX="${bundle_res}"
-export PATH="${RESPFX}/bin":"${PATH}"
-
+PATH="${RESPFX}"/bin:"${PATH}"
+export PATH
GUILE_WARN_DEPRECATED="no"
export GUILE_WARN_DEPRECATED
@@ -179,15 +102,16 @@ if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
# If we get here without a way to connect to an instance of dbus-daemon,
# then we can kill any existing instances of dbus-daemon that originate
# in this copy of Gnucash.
-
+
DBUS_PIDS=`ps ux | grep dbus-daemon | grep "${PREFIX}" | awk '{print $2}'`
-
+
if /bin/test "$DBUS_PIDS"; then
- for DBUS_PID in "${DBUS_PIDS}"
+ for DBUS_PID in ${DBUS_PIDS}
do
/bin/kill "${DBUS_PID}"
done
-fi
+ fi
+
eval `"$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
fi
@@ -205,15 +129,18 @@ EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib/gnucash"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
export DYLD_FRAMEWORK_PATH="${bundle_fw}"
+export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/guile-modules/gnucash/report/standard-reports"
+export GNC_DBD_DIR="${bundle_lib}/dbd"
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
+export GNC_DOT_DIR="$HOME/Library/Application Support/Gnucash"
-if test -f "$HOME/.gnucashrc"; then
- source "$HOME/.gnucashrc"
+if test -f "$GNC_DOT_DIR/gnucashrc"; then
+ source "$GNC_DOT_DIR/gnucashrc"
fi
-#$EXTRA_ARGS not quoted because we don't want GC to treat it as a single arg.
+#Don't quote $EXTRA_ARGS or it will turn into a single arg and fail.
$EXEC "$bundle_contents/MacOS/$name-bin" $EXTRA_ARGS $*
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 6e0e517..bc145a7 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -209,30 +209,28 @@
<autotools id="gnucash" autogen-sh="configure"
- autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc">
- <branch module="stable/gnucash-2.2.9.tar.gz" version="2.2.9"
- repo="sourceforge">
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-xlib.patch" strip="0"/>
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-in.patch" strip="0"/>
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-integration.patch" strip="1"/>
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine='webkit'">
+ <branch module="gnucash" revision="19974" repo="svn.gnucash.org">
</branch>
<dependencies>
- <dep package="goffice-0.7.4"/>
+ <dep package="meta-goffice"/>
<dep package="meta-gtk-osx-core"/>
<dep package="libofx"/>
<!--dep package="aqbanking"/-->
<dep package="aqbanking-qt"/>
- <dep package="meta-gtkhtml"/>
+ <dep package="libgnomeui"/>
+ <dep package="WebKit"/>
<dep package="Slib"/>
- <dep package="iso-codes"/>
+ <dep package="libdbi-drivers"/>
+ <dep package="iso-codes"/>
</dependencies>
</autotools>
-
- <autotools id="gnucash-svn"
- autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
- autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
+ <autotools id="gnucash-svn"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
<branch repo="svn.gnucash.org" module="gnucash"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
@@ -281,9 +279,10 @@
</autotools>
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
- makeargs=" html" >
- <branch repo="gnucash.org" module="stable/gnucash-docs-2.2.0.tar.gz"
- version="2.2.0"/>
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ makeargs=" html" makeinstallargs="install-html" >
+ <branch repo="svn.gnucash.org" module="gnucash-docs"
+ revision="gnucash-docs-2.4"/>
</autotools>
<autotools id="scrollkeeper">
commit e81fa80fcb7b1d2da60bc6d541f28bd864cef54e
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Dec 21 14:59:35 2010 -0800
As noted while working Bug 629712, having $EXTRA_ARGS at the end of the command line can produce unexpected results, so put $* at the end of the line.
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index 028111d..fb2fe4d 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -216,4 +216,4 @@ if test -f "$HOME/.gnucashrc"; then
fi
#$EXTRA_ARGS not quoted because we don't want GC to treat it as a single arg.
-$EXEC "$bundle_contents/MacOS/$name-bin" $* $EXTRA_ARGS
+$EXEC "$bundle_contents/MacOS/$name-bin" $EXTRA_ARGS $*
diff --git a/gnucash-bundler/gnucash-svn.launcher b/gnucash-bundler/gnucash-svn.launcher
index 945ed89..e1ede31 100755
--- a/gnucash-bundler/gnucash-svn.launcher
+++ b/gnucash-bundler/gnucash-svn.launcher
@@ -143,4 +143,4 @@ if test -f "$GNC_DOT_DIR/gnucashrc"; then
fi
#Don't quote $EXTRA_ARGS or it will turn into a single arg and fail.
-$EXEC "$bundle_contents/MacOS/$name-bin" $* $EXTRA_ARGS
+$EXEC "$bundle_contents/MacOS/$name-bin" $EXTRA_ARGS $*
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 945ed89..e1ede31 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -143,4 +143,4 @@ if test -f "$GNC_DOT_DIR/gnucashrc"; then
fi
#Don't quote $EXTRA_ARGS or it will turn into a single arg and fail.
-$EXEC "$bundle_contents/MacOS/$name-bin" $* $EXTRA_ARGS
+$EXEC "$bundle_contents/MacOS/$name-bin" $EXTRA_ARGS $*
commit ea13f5d9089283566a99bac71e635b9b4870c5b2
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 21 10:16:28 2010 -0800
Release Gnucash 2.3.17
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index e1a432a..3830dd3 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.3.16 © 2010 Contributors</string>
+ <string>Gnucash version 2.3.17 © 2010 Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.3.16 © 2010 Contributors</string>
+ <string>2.3.17 © 2010 Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.3.16</string>
+ <string>2.3.17</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.3.16</string>
+ <string>2.3.17</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 8551679..6e0e517 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -253,7 +253,7 @@
<autotools id="gnucash-unstable"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch branch="2.3.16" module="gnucash" repo="svn.gnucash.org"/>
+ <branch branch="2.3.17" module="gnucash" repo="svn.gnucash.org"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit 123f21357fff4be5999d356ca0bfca5f4936f650
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 7 15:22:51 2010 -0800
Update slib version, because upstream did and they don't keep old versions online.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a61b971..8551679 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -162,7 +162,7 @@
makeinstallargs="-f Makefile.gnucash">
<!-- <branch repo="slib.savannah.gnu.org"
module="slib"/> -->
- <branch repo="csail" module="scm/slib-3b2.zip" version="3b1"
+ <branch repo="csail" module="scm/slib-3b3.zip" version="3b1"
checkoutdir="slib">
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/slib-install.patch"/>
</branch>
commit 2de8f0c2d5414d1bd69729c2d2ad3d9d51d52ace
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 7 15:18:14 2010 -0800
Update to 2.3.16 for release
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index f8c715f..e1a432a 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.3.15 © 2010 Contributors</string>
+ <string>Gnucash version 2.3.16 © 2010 Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.3.15 © 2010 Contributors</string>
+ <string>2.3.16 © 2010 Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.3.15</string>
+ <string>2.3.16</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.3.15</string>
+ <string>2.3.16</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index f3350aa..a61b971 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -253,7 +253,7 @@
<autotools id="gnucash-unstable"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch branch="19437" module="gnucash" repo="svn.gnucash.org"/>
+ <branch branch="2.3.16" module="gnucash" repo="svn.gnucash.org"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit 06fb45b8a12c6bb899702e7517014c517d9f830f
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Oct 23 16:02:59 2010 -0700
Update version on is0-codes, add it as a dependency for all gnucash modules so that it gets installed, and add iso_4217 to the translations for unstable and svn so that they get added to the bundle. Corrects bug 118391.
diff --git a/gnucash-bundler/gnucash-svn.bundle b/gnucash-bundler/gnucash-svn.bundle
index 91a829c..4f01f01 100644
--- a/gnucash-bundler/gnucash-svn.bundle
+++ b/gnucash-bundler/gnucash-svn.bundle
@@ -269,7 +269,11 @@
${prefix}/share/gnome/help/gnucash/ja_JP/gnucash-guide/
</data>
- <translations name="gnucash">
+ <translations name="gnucash">
+ ${prefix}/share/locale
+ </translations>
+
+ <translations name="iso_4217">
${prefix}/share/locale
</translations>
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 2e926ae..81b4e91 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -269,7 +269,11 @@
${prefix}/share/gnome/help/gnucash/ja_JP/gnucash-guide/
</data>
- <translations name="gnucash">
+ <translations name="gnucash">
+ ${prefix}/share/locale
+ </translations>
+
+ <translations name="iso_4217">
${prefix}/share/locale
</translations>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 2b3ec00..f3350aa 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -31,7 +31,8 @@
href="http://www.cmake.org/files/"/>
<repository type="svn" name="aquamaniac"
href="http://devel.aqbanking.de/svn/"/>
-
+ <repository type="tarball" name="iso-codes"
+ href="ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/"/>
<include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/>
@@ -51,6 +52,10 @@
<branch repo="ftp.gnu.org" module="gmp/gmp-4.3.1.tar.bz2" version="4.3.1"/>
</autotools>
+ <autotools id="iso-codes" autogen-sh="configure">
+ <branch module="iso-codes-3.21.tar.bz2" version="3.21" repo="iso-codes"/>
+ </autotools>
+
<autotools id="gwenhywfar" autogen-sh="configure">
<branch module="gwenhywfar-3.11.1.tar.gz" version="3.11.1"
repo="github_gnucash"/>
@@ -60,7 +65,8 @@
</dependencies>
</autotools>
- <autotools id="gwenhywfar-svn" autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
+ <autotools id="gwenhywfar-svn" autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ autogenargs="--disable-qt4 --with-guis=gtk2">
<branch module="gwenhywfar" repo="aquamaniac"/>
<dependencies>
<dep package="libgcrypt"/>
@@ -99,8 +105,8 @@
</dependencies>
</autotools>
- <autotools id="aqbanking-qt-svn"
- autogenargs='--enable-ofx=yes --disable-kde --disable-chipcard-client --disable-python --with-frontends="cbanking g2banking q4banking" qt4_libs="-framework QtCore -framework QtGui -framework Qt3Support"qt4_includes="-framework QtCore -framework QtGui -framework Qt3Support"'
+ <autotools id="aqbanking-svn"
+ autogenargs='--enable-ofx=yes --disable-kde --disable-chipcard-client --disable-python --with-frontends="cbanking g2banking"'
autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" >
<branch module="aqbanking" repo="aquamaniac" >
</branch>
@@ -218,6 +224,7 @@
<dep package="aqbanking-qt"/>
<dep package="meta-gtkhtml"/>
<dep package="Slib"/>
+ <dep package="iso-codes"/>
</dependencies>
</autotools>
@@ -232,12 +239,13 @@
<dep package="meta-goffice"/>
<dep package="libofx"/>
<!--dep package="aqbanking"/ -->
- <dep package="aqbanking-qt"/>
+ <dep package="aqbanking-svn"/>
<!--dep package="meta-gtkhtml"/-->
<dep package="libgnomeui"/>
<dep package="WebKit"/>
<dep package="Slib"/>
<dep package="libdbi-drivers"/>
+ <dep package="iso-codes"/>
</dependencies>
</autotools>
@@ -258,6 +266,7 @@
<dep package="libgnomeui"/>
<dep package="Slib"/>
<dep package="libdbi-drivers"/>
+ <dep package="iso-codes"/>
</dependencies>
</autotools>
commit c718461c2478318b6ca1657469687b3dda44d0b2
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 7 17:14:52 2010 -0700
Tags don't work with SVN modules, so use the revision number instead.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 0668966..2b3ec00 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -245,7 +245,7 @@
<autotools id="gnucash-unstable"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch tag="2.3.15" module="gnucash" repo="svn.gnucash.org"/>
+ <branch branch="19437" module="gnucash" repo="svn.gnucash.org"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit df945e63c7fe465fa8e6d9910c7d3c5ca63a3600
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 7 17:14:16 2010 -0700
Change name of binary to reflect changes in 2.3.15
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index c3de519..2e926ae 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -45,7 +45,7 @@
-->
<plist>${project}/Info-unstable.plist</plist>
- <main-binary>${prefix}/bin/gnucash-bin</main-binary>
+ <main-binary>${prefix}/bin/gnucash</main-binary>
<!-- Copy in GTK+ and Pango modules. Note the use of the
"${pkg:module:variable}" macro, which evaluates to a pkg-config
commit eac9b5ed7a795ae0b758fb94f7a625581e808088
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 7 17:13:45 2010 -0700
Remove obsolete arguments from "extra args". (They also screwed up launching when the bundle was in a path with spaces.)
diff --git a/gnucash-bundler/gnucash-svn.launcher b/gnucash-bundler/gnucash-svn.launcher
index cb156ee..945ed89 100755
--- a/gnucash-bundler/gnucash-svn.launcher
+++ b/gnucash-bundler/gnucash-svn.launcher
@@ -43,7 +43,7 @@ if test -f "$bundle_lib/charset.alias"; then
fi
# Extra arguments can be added in environment.sh.
-EXTRA_ARGS="--config-path \"$bundle_etc/gnucash\" --share-path \"$bundle_data/gnucash\" --debug"
+EXTRA_ARGS=" --debug"
if test -f "$bundle_res/environment.sh"; then
source "$bundle_res/environment.sh"
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index cb156ee..945ed89 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -43,7 +43,7 @@ if test -f "$bundle_lib/charset.alias"; then
fi
# Extra arguments can be added in environment.sh.
-EXTRA_ARGS="--config-path \"$bundle_etc/gnucash\" --share-path \"$bundle_data/gnucash\" --debug"
+EXTRA_ARGS=" --debug"
if test -f "$bundle_res/environment.sh"; then
source "$bundle_res/environment.sh"
commit de0c564132dbd8bc1d244a58b808857c51098194
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Aug 27 13:33:47 2010 -0700
New launcher and bundle scripts needed to current svn trunk, which changes the name of gnucash-bin to gnucash, and will delete the configuration options config-path and share-path.
diff --git a/gnucash-bundler/gnucash-svn.bundle b/gnucash-bundler/gnucash-svn.bundle
new file mode 100644
index 0000000..91a829c
--- /dev/null
+++ b/gnucash-bundler/gnucash-svn.bundle
@@ -0,0 +1,300 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<app-bundle>
+
+ <meta>
+ <!-- Where to pick up the GTK+ installation, icon themes,
+ etc. Note that "${env:PREFIX}" is evaluated to the value of
+ the environment variable PREFIX, and likewise with HOME. You
+ can define additional prefixes and refer to them in paths
+ throughout this file on the form "${prefix:name}". This is
+ useful for installing certain libraries or even the
+ application itself separately.
+ -->
+ <prefix name="default">${env:PREFIX}</prefix>
+
+ <!-- The project directory is the default location of the created
+ app. If you leave out the path, the current directory is
+ used.
+ -->
+ <destination overwrite="yes">${env:HOME}</destination>
+
+ <image>
+ <!-- Not implemented yet (DMG image). -->
+ </image>
+ <!-- Comment this out to keep the install names in binaries -->
+ <run-install-name-tool/>
+
+
+ <!-- Optionally specify a launcher script to use. If the
+ application sets up everything needed itself, like
+ environment variable, linker paths, etc, a launcher script is
+ not needed. If the source path is left out, the default
+ script will be used.
+ -->
+ <launcher-script>${project}/gnucash-svn.launcher</launcher-script>
+
+ <!-- Not implemented: Optional runtime, could be python or mono
+ for example.
+ -->
+ <!--runtime copy="yes">/usr/bin/python</runtime-->
+ </meta>
+
+ <!-- The special macro "${project}" refers to the directory where
+ this bundle file is located. The application name and bundle
+ identifier are taken from the plist file.
+ -->
+ <plist>${project}/Info-unstable.plist</plist>
+
+ <main-binary>${prefix}/bin/gnucash</main-binary>
+
+ <!-- Copy in GTK+ and Pango modules. Note the use of the
+ "${pkg:module:variable}" macro, which evaluates to a pkg-config
+ variable in the specified module. Note that any libraries that
+ binaries link to are also copied in automatically.
+ -->
+ <binary>
+ ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/loaders/*.so
+ </binary>
+<!-- Copy in the theme engines. -->
+ <binary>
+ ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/engines/*.so
+ </binary>
+
+<!-- And the print backends -->
+ <binary>
+ ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/printbackends/*.so
+ </binary>
+
+ <binary>
+ ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-fc.so
+ </binary>
+
+ <binary>
+ ${prefix}/lib/GConf/2/*.so
+ </binary>
+
+ <!-- Seems to get missed by the dependency resolver -->
+ <binary>
+ ${prefix}/lib/libguile-srfi*
+ </binary>
+
+ <binary>
+ ${prefix}/lib/gnucash
+ </binary>
+
+ <binary>
+ ${prefix}/lib/aqbanking
+ </binary>
+
+ <binary>
+ ${prefix}/lib/gwenhywfar
+ </binary>
+
+ <binary>
+ ${prefix}/lib/libglade
+ </binary>
+
+ <binary>
+ ${prefix}/libexec
+ </binary>
+
+ <binary>
+ ${prefix}/bin/dbus-launch
+ </binary>
+
+ <binary>
+ ${prefix}/bin/dbus-daemon
+ </binary>
+
+ <binary>
+ ${prefix}/bin/gnc-*
+ </binary>
+
+ <binary dest="${bundle}/Contents/MacOS">
+ ${prefix}/bin/aqbanking-cli
+ </binary>
+
+ <binary>
+ ${prefix}/lib/goffice
+ </binary>
+
+ <binary>
+ ${prefix}/lib/dbd
+ </binary>
+
+ <framework>
+ /Library/Frameworks/QtCore.framework
+ </framework>
+
+ <framework>
+ /Library/Frameworks/QtGui.framework
+ </framework>
+
+ <framework>
+ /Library/Frameworks/Qt3Support.framework
+ </framework>
+
+ <framework>
+ /Library/Frameworks/QtSql.framework
+ </framework>
+
+ <framework>
+ /Library/Frameworks/QtXml.framework
+ </framework>
+
+ <framework>
+ /Library/Frameworks/QtNetwork.framework
+ </framework>
+
+<!-- Data to copy in, usually Glade/UI files, images, sounds files
+ etc. The destination inside the bundle can be specified if the
+ files should end up at a different location, by using the
+ "dest" property. The destination must then start with the macro
+ "${bundle}", which refers to the bundle root directory.
+ -->
+ <data>
+ ${prefix}/etc/gnucash
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/lib/">
+ ${prefix}/lib/libguile-srfi-srfi-*.la
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/lib/">
+ ${prefix}/lib/libgnc-*.la
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/lib/">
+ ${prefix}/lib/libofx.la
+ </data>
+
+ <data>
+ ${prefix}/etc/xdg
+ </data>
+
+ <data>
+ ${prefix}/etc/fonts
+ </data>
+
+ <data>
+ ${prefix}/etc/gconf
+ </data>
+
+ <data>
+ ${prefix}/share/gnucash
+ </data>
+
+ <data>
+ ${prefix}/share/guile
+ </data>
+
+ <data>
+ ${prefix}/share/GConf
+ </data>
+
+ <data>
+ ${prefix}/share/dbus-1/
+ </data>
+
+ <data>
+ ${prefix}/share/aqbanking
+ </data>
+
+ <data>
+ ${prefix}/share/libofx
+ </data>
+
+ <data>
+ ${prefix}/share/mime
+ </data>
+
+ <data>
+ ${prefix}/share/themes
+ </data>
+
+ <!--data dest="${bundle}/Contents/Resources/slib"-->
+ <data>
+ ${prefix}/lib/slib
+ </data>
+
+ <data dest="${bundle}/Contents/Resources">
+ ${project}/gnucash.icns
+ </data>
+
+ <data dest="${bundle}/Contents/Resources">
+ ${prefix}/share/strings
+ </data>
+
+ <data dest='${bundle}/Contents/Resources/var/lib/dbus/machine-id'>
+ ${prefix}/var/lib/dbus/machine-id
+ </data>
+
+ <data dest='${bundle}/Contents/Resources/etc/dbus-1/'>
+ ${prefix}/etc/dbus-1/
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/License">
+ ${prefix}/share/gnucash/doc/LICENSE
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/Sources">
+ ${project}/Sources
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/en.lproj/GnuCash Help/">
+ ${prefix}/share/gnome/help/gnucash/C/gnucash-help
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/en.lproj/GnuCash Guide/">
+ ${prefix}/share/gnome/help/gnucash/C/gnucash-guide/
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/de.lproj/GnuCash Help/">
+ ${prefix}/share/gnome/help/gnucash/de_DE/gnucash-help
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/de.lproj/GnuCash Guide/">
+ ${prefix}/share/gnome/help/gnucash/de_DE/gnucash-guide/
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Help/">
+ ${prefix}/share/gnome/help/gnucash/it_IT/gnucash-help
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Guide/">
+ ${prefix}/share/gnome/help/gnucash/it_IT/gnucash-guide/
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/ja.lproj/GnuCash Guide/">
+ ${prefix}/share/gnome/help/gnucash/ja_JP/gnucash-guide/
+ </data>
+
+ <translations name="gnucash">
+ ${prefix}/share/locale
+ </translations>
+
+ <translations name="aqbanking">
+ ${prefix}/share/locale
+ </translations>
+
+<!-- This takes the Quartz theme instructions from the package and puts them in the bundle gtkrc file. You may want to cusomize the source path if you want a different theme, or if you want other stuff in your gtkrc.
+
+ <data dest='${bundle}/Contents/Resources/etc/gtk-2.0/gtkrc'>
+ ${prefix}/share/themes/Quartz/gtk-2.0/gtkrc
+ </data>
+-->
+
+ <!-- Icon themes to copy. The "icons" property can be either of
+ "auto", "all", or "none". All or none should be
+ self-explanatory, while auto means that the script will try to
+ figure out which icons are needed. This is done by getting all
+ the strings from all copied binaries, and matching them against
+ icon names. To be safe, you should use "all". "none" is useful
+ if you want just the index.theme file but no icons, mostly
+ needed for the "hicolor" base theme.
+ -->
+ <!-- icon-theme icons="auto"/>
+ Tango
+ </icon-theme -->
+
+</app-bundle>
diff --git a/gnucash-bundler/gnucash-svn.launcher b/gnucash-bundler/gnucash-svn.launcher
new file mode 100755
index 0000000..cb156ee
--- /dev/null
+++ b/gnucash-bundler/gnucash-svn.launcher
@@ -0,0 +1,146 @@
+#!/bin/sh
+
+if test "x$IGE_DEBUG_LAUNCHER" != x; then
+ set -x
+fi
+
+if test "x$IGE_DEBUG_GDB" != x; then
+ EXEC="gdb --args"
+else
+ EXEC=exec
+fi
+
+export PREFIX=/Library/Gnucash-2.3.x
+export PREFIXDIR="`dirname $PREFIX`"
+
+name=`basename "$0"`
+tmp="$0"
+tmp=`dirname "$tmp"`
+tmp=`dirname "$tmp"`
+bundle=`dirname "$tmp"`
+bundle_contents="$bundle"/Contents
+bundle_res="$bundle_contents"/Resources
+bundle_fw="$bundle_contents"/Frameworks
+bundle_lib="$bundle_res"/lib
+bundle_bin="$bundle_res"/bin
+bundle_data="$bundle_res"/share
+bundle_etc="$bundle_res"/etc
+
+export DYLD_LIBRARY_PATH="$bundle_lib"
+export XDG_CONFIG_DIRS="$bundle_etc"/xdg
+export XDG_DATA_DIRS="$PREFIX/share"
+export GTK_DATA_PREFIX="$bundle_res"
+export GTK_EXE_PREFIX="$bundle_res"
+export GTK_PATH="$bundle_res"
+
+export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
+export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
+export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
+export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
+
+if test -f "$bundle_lib/charset.alias"; then
+ export CHARSETALIASDIR="$bundle_lib"
+fi
+
+# Extra arguments can be added in environment.sh.
+EXTRA_ARGS="--config-path \"$bundle_etc/gnucash\" --share-path \"$bundle_data/gnucash\" --debug"
+
+if test -f "$bundle_res/environment.sh"; then
+ source "$bundle_res/environment.sh"
+fi
+
+# Strip out the argument added by the OS.
+if [ x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ]; then
+ shift 1
+fi
+
+export RESPFX="${bundle_res}"
+PATH="${RESPFX}"/bin:"${PATH}"
+export PATH
+
+GUILE_WARN_DEPRECATED="no"
+export GUILE_WARN_DEPRECATED
+
+if [ -w "$PREFIXDIR" ]; then
+ if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
+ if [ ! -d "$PREFIX" ]; then
+ rm "$PREFIX"; else
+ mv "$PREFIX" "$PREFIX.Save";
+ fi
+ ln -s "$RESPFX" "$PREFIX"
+ elif [ ! -e "$PREFIX" ] ; then
+ echo "Linking $RESPFX to $PREFIX"
+ if [ ! -d "$PREFIXDIR" ]; then
+ mkdir -p "$PREFIXDIR";
+ fi
+ ln -s "$RESPFX" "$PREFIX"
+ fi
+else
+ echo "Don't have write access to $PREFIXDIR"
+ if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
+ echo "moving the $PREFIX directory to $PREFIX.save"
+ osascript <<EOF
+display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
+do shell script "echo foo; if [ ! -d \"$PREFIX\" ]; then rm \"$PREFIX\"; else mv \"$PREFIX\" \"$PREFIX.Save\"; fi; ln -s \"$RESPFX\" \"$PREFIX\" " with administrator privileges
+
+EOF
+
+ elif [ ! -e "$PREFIX" ] ;
+ then
+ echo "Linking $RESPFX to $PREFIX"
+ osascript <<EOF
+display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
+do shell script "if [ ! -d \"$PREFIXDIR\" ]; then mkdir -p \"$PREFIXDIR\"; fi; ln -s \"$RESPFX\" \"$PREFIX\"" with administrator privileges
+
+EOF
+
+
+ fi
+fi
+
+if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+ # If we get here without a way to connect to an instance of dbus-daemon,
+ # then we can kill any existing instances of dbus-daemon that originate
+ # in this copy of Gnucash.
+
+ DBUS_PIDS=`ps ux | grep dbus-daemon | grep "${PREFIX}" | awk '{print $2}'`
+
+ if /bin/test "$DBUS_PIDS"; then
+ for DBUS_PID in ${DBUS_PIDS}
+ do
+ /bin/kill "${DBUS_PID}"
+ done
+ fi
+
+ eval `"$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
+fi
+
+GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
+
+EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/guile-modules"
+EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/scm"
+GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
+
+EXTRA_LIBS="${GNC_MODULE_PATH}"
+EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
+EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib"
+EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib/gnucash"
+
+LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
+DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
+export DYLD_FRAMEWORK_PATH="${bundle_fw}"
+export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/guile-modules/gnucash/report/standard-reports"
+export GNC_DBD_DIR="${bundle_lib}/dbd"
+
+export GNC_MODULE_PATH
+export GUILE_LOAD_PATH
+export LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
+export GNC_DOT_DIR="$HOME/Library/Application Support/Gnucash"
+
+if test -f "$GNC_DOT_DIR/gnucashrc"; then
+ source "$GNC_DOT_DIR/gnucashrc"
+fi
+
+#Don't quote $EXTRA_ARGS or it will turn into a single arg and fail.
+$EXEC "$bundle_contents/MacOS/$name-bin" $* $EXTRA_ARGS
commit 3fb75ac274dce87e0d69ddc1f39870b1c2435a7f
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 27 13:18:28 2010 -0700
Bump gnucash version to 2.3.15
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 5c6d850..f8c715f 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.3.14 © 2010 Contributors</string>
+ <string>Gnucash version 2.3.15 © 2010 Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.3.14 © 2010 Contributors</string>
+ <string>2.3.15 © 2010 Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.3.14</string>
+ <string>2.3.15</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.3.14</string>
+ <string>2.3.15</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 43fdc7f..0668966 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -245,7 +245,7 @@
<autotools id="gnucash-unstable"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch revision="19260" module="gnucash" repo="svn.gnucash.org"/>
+ <branch tag="2.3.15" module="gnucash" repo="svn.gnucash.org"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit 19a971c20c23259ef7ad4a4a7f460b405706e21a
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 7 14:16:34 2010 -0700
Remove $prefix/share/gnome from bundle sources
This only copied the documentation, which we're copying separately into the l10n directories so that OSX can open the right translation in the browser.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 54ecadf..c3de519 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -189,10 +189,6 @@
</data>
<data>
- ${prefix}/share/gnome
- </data>
-
- <data>
${prefix}/share/GConf
</data>
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index a62e098..8868300 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -185,10 +185,6 @@
</data>
<data>
- ${prefix}/share/gnome
- </data>
-
- <data>
${prefix}/share/GConf
</data>
commit 453d36350013885082b1a096146d60c995b5c74b
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 7 13:48:53 2010 -0700
Change path for Qt frameworks to not include the "stripped" subdirectory.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 60e90ec..54ecadf 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -123,27 +123,27 @@
</binary>
<framework>
- /Library/Frameworks/Stripped/QtCore.framework
+ /Library/Frameworks/QtCore.framework
</framework>
<framework>
- /Library/Frameworks/Stripped/QtGui.framework
+ /Library/Frameworks/QtGui.framework
</framework>
<framework>
- /Library/Frameworks/Stripped/Qt3Support.framework
+ /Library/Frameworks/Qt3Support.framework
</framework>
<framework>
- /Library/Frameworks/Stripped/QtSql.framework
+ /Library/Frameworks/QtSql.framework
</framework>
<framework>
- /Library/Frameworks/Stripped/QtXml.framework
+ /Library/Frameworks/QtXml.framework
</framework>
<framework>
- /Library/Frameworks/Stripped/QtNetwork.framework
+ /Library/Frameworks/QtNetwork.framework
</framework>
<!-- Data to copy in, usually Glade/UI files, images, sounds files
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index c024f70..a62e098 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -114,27 +114,27 @@
</binary>
<framework>
- /Library/Frameworks/Stripped/QtCore.framework
+ /Library/Frameworks/QtCore.framework
</framework>
<framework>
- /Library/Frameworks/Stripped/QtGui.framework
+ /Library/Frameworks/QtGui.framework
</framework>
<framework>
- /Library/Frameworks/Stripped/Qt3Support.framework
+ /Library/Frameworks/Qt3Support.framework
</framework>
<framework>
- /Library/Frameworks/Stripped/QtSql.framework
+ /Library/Frameworks/QtSql.framework
</framework>
<framework>
- /Library/Frameworks/Stripped/QtXml.framework
+ /Library/Frameworks/QtXml.framework
</framework>
<framework>
- /Library/Frameworks/Stripped/QtNetwork.framework
+ /Library/Frameworks/QtNetwork.framework
</framework>
commit 78698d37799f59123f764f8ebe9be148bdf96dcf
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 7 13:48:06 2010 -0700
Q4banking and framework includes for aqbanking-qt-svn
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 3d932bb..43fdc7f 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -100,9 +100,8 @@
</autotools>
<autotools id="aqbanking-qt-svn"
- autogenargs='--enable-ofx=yes --disable-kde --disable-chipcard-client --disable-python --with-frontends="cbanking g2banking qbanking" qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers"'
-autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
- makeargs="qt4-all" >
+ autogenargs='--enable-ofx=yes --disable-kde --disable-chipcard-client --disable-python --with-frontends="cbanking g2banking q4banking" qt4_libs="-framework QtCore -framework QtGui -framework Qt3Support"qt4_includes="-framework QtCore -framework QtGui -framework Qt3Support"'
+ autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" >
<branch module="aqbanking" repo="aquamaniac" >
</branch>
<dependencies>
commit a25b11ea6100e058c164408bcba7ef6976843ab4
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Aug 3 17:31:15 2010 -0700
Add "without-gconf" to the goffice args; we don't need gconf for gnucash.
Also upgrade the regular goffice to the latest 0.8.8 stable release.
diff --git a/modulesets/goffice.modules b/modulesets/goffice.modules
index c24c3cd..648ec00 100644
--- a/modulesets/goffice.modules
+++ b/modulesets/goffice.modules
@@ -13,9 +13,9 @@
</dependencies>
</metamodule>
- <autotools id="goffice">
- <branch module="goffice/0.7/goffice-0.7.14.tar.bz2" version="0.7.14"
- hash="sha256:0fe2f4d7c39e85b5b577c6fa7a88c9a135ae5819cc521083af888e4c23deaacd"/>
+ <autotools id="goffice" autogenargs="--without-gconf">
+ <branch module="goffice/0.8/goffice-0.8.8.tar.bz2" version="0.8.8"
+ hash="sha256:7a2cd13997d74e3bad76939f7767bf4bae27a76210096c09854d80a0b8ec9cac"/>
<dependencies>
<dep package="gtk+"/>
<dep package="libgsf"/>
@@ -26,7 +26,7 @@
</dependencies>
</autotools>
- <autotools id="goffice-0.7.4">
+ <autotools id="goffice-0.7.4" autogenargs="--without-gconf">
<!-- gnucash 2.2.9 won't build against newer GOffice. -->
<branch module="goffice/0.7/goffice-0.7.4.tar.bz2" version="0.7.4"
md5sum="8fe65cb6a60e6064025fa465da99d31e"/>
commit dbfe2d0d980d2aa763f837478270d84a8d79e990
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Aug 3 17:29:50 2010 -0700
Use q4banking for aqbanking Qt interface.
It requires a massive patch to use with the Qt Frameworks; the version of this patch for SVN was passed back to Christian Stimming, and he has checked it in, so it will not be required on the next stable release.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index f004ba3..3d932bb 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -86,11 +86,10 @@
</autotools>
<autotools id="aqbanking-qt" autogen-sh="configure"
- autogenargs='--enable-ofx=yes --disable-kde --disable-chipcard-client --disable-python --with-frontends="cbanking g2banking qbanking"'
- makeargs="qt4-all" >
+ autogenargs="--enable-ofx=yes --disable-kde --disable-chipcard-client --disable-python --with-frontends='cbanking g2banking q4banking' qt4_libs='-framework QtCore -framework QtGui -framework Qt3Support' qt4_includes='-framework QtCore -framework QtGui -framework Qt3Support'">
<branch module="aqbanking-4.2.4.tar.gz" version="4.2.4"
repo="github_gnucash" >
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/aqbanking_accountgen.patch" strip="1"/>
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/aqbankingOSX.patch" strip="0"/>
</branch>
<dependencies>
<dep package="libofx"/>
@@ -247,7 +246,7 @@ autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %
<autotools id="gnucash-unstable"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch tag="2.3.14" module="gnucash" repo="svn.gnucash.org"/>
+ <branch revision="19260" module="gnucash" repo="svn.gnucash.org"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
diff --git a/patches/aqbankingOSX.patch b/patches/aqbankingOSX.patch
index adeaa36..277286b 100644
--- a/patches/aqbankingOSX.patch
+++ b/patches/aqbankingOSX.patch
@@ -103,3 +103,1537 @@ Index: src/frontends/q4banking/lib/qbflagstaff.h
class Q4BANKING_API QBFlagStaff: public QObject {
+Index: src/plugins/backends/aqofxconnect/ui/qt4/libs/cfgtabpageuserofx.cpp
+--- src/plugins/backends/aqofxconnect/ui/qt4/libs/cfgtabpageuserofx.cpp 2010-01-15
++++ src/plugins/backends/aqofxconnect/ui/qt4/libs/cfgtabpageuserofx.cpp 2010-08-03
+@@ -27,13 +27,13 @@
+ #include <gwenhywfar/debug.h>
+ #include <gwenhywfar/url.h>
+
+-#include <qmessagebox.h>
+-#include <qtimer.h>
+-#include <qcheckbox.h>
+-#include <qspinbox.h>
+-#include <qpushbutton.h>
+-#include <qlineedit.h>
+-#include <qcombobox.h>
++#include <QtGui/qmessagebox.h>
++#include <QtCore/qtimer.h>
++#include <QtGui/qcheckbox.h>
++#include <QtGui/qspinbox.h>
++#include <QtGui/qpushbutton.h>
++#include <QtGui/qlineedit.h>
++#include <QtGui/qcombobox.h>
+
+
+
+Index: src/plugins/backends/aqofxconnect/ui/qt4/libs/cfgtabpageaccountofx.cpp
+--- src/plugins/backends/aqofxconnect/ui/qt4/libs/cfgtabpageaccountofx.cpp 2010-01-15
++++ src/plugins/backends/aqofxconnect/ui/qt4/libs/cfgtabpageaccountofx.cpp 2010-08-03
+@@ -22,11 +22,11 @@
+
+ #include <q4banking/qbanking.h>
+
+-#include <qmessagebox.h>
+-#include <qtimer.h>
+-#include <qcheckbox.h>
+-#include <qspinbox.h>
+-#include <q3filedialog.h>
++#include <QtGui/qmessagebox.h>
++#include <QtCore/qtimer.h>
++#include <QtGui/qcheckbox.h>
++#include <QtGui/qspinbox.h>
++#include <Qt3Support/q3filedialog.h>
+
+
+
+Index: src/plugins/backends/aqhbci/ui/qt4/qt4_debug/qt4_debug.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/qt4_debug/qt4_debug.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/qt4_debug/qt4_debug.cpp 2010-08-03
+@@ -15,10 +15,10 @@
+ #endif
+
+
+-#include <qapplication.h>
+-#include <qtranslator.h>
+-#include <qtextcodec.h>
+-#include <qdir.h>
++#include <QtGui/qapplication.h>
++#include <QtCore/qtranslator.h>
++#include <QtCore/qtextcodec.h>
++#include <QtCore/qdir.h>
+
+ #include <gwenhywfar/logger.h>
+ #include <gwenhywfar/debug.h>
+Index:src/plugins/backends/aqhbci/ui/qt4/qt4_debug/Makefile.in
+--- src/plugins/backends/aqhbci/ui/qt4/qt4_debug/Makefile.in 2010-02-06
++++ src/plugins/backends/aqhbci/ui/qt4/qt4_debug/Makefile.in 2010-08-03
+@@ -409,7 +409,7 @@
+ $(aqbanking_internal_libs) \
+ $(q4banking_internal_libs) \
+ $(aqhbci_internal_libs) \
+- $(gwenhywfar_libs) $(qt3_libs) -lQtCore
++ $(gwenhywfar_libs) $(qt3_libs)
+
+ CLEANFILES = qt4_debug.xml
+ all: all-am
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/Makefile.in
+--- src/plugins/backends/aqhbci/ui/qt4/libs/Makefile.in 2010-02-06
++++ src/plugins/backends/aqhbci/ui/qt4/libs/Makefile.in 2010-08-03
+@@ -452,7 +452,7 @@
+ $(aqhbci_internal_libs) \
+ $(aqbanking_internal_libs) \
+ $(q4banking_internal_libs) \
+- $(gwenhywfar_libs) $(qt4_libs) -lQt3Support
++ $(gwenhywfar_libs) $(qt4_libs)
+
+ BUILT_SOURCES = $(nodist_aqhbci_la_SOURCES)
+ CLEANFILES = $(nodist_aqhbci_la_SOURCES)
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/logmanager/logmanager.h
+--- src/plugins/backends/aqhbci/ui/qt4/libs/logmanager/logmanager.h 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/logmanager/logmanager.h 2010-08-03
+@@ -18,7 +18,7 @@
+ #include "logmanager.ui.h"
+ #include <gwenhywfar/msgengine.h>
+
+-#include <QDialog>
++#include <QtGui/QDialog>
+
+ #include <string>
+ #include <list>
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/logmanager/logmanager.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/logmanager/logmanager.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/logmanager/logmanager.cpp 2010-08-03
+@@ -36,13 +36,13 @@
+ #include <string.h>
+ #include <errno.h>
+
+-#include <qmessagebox.h>
+-#include <qcombobox.h>
+-#include <q3listview.h>
+-#include <q3textbrowser.h>
+-#include <qpushbutton.h>
+-#include <q3filedialog.h>
+-#include <qdir.h>
++#include <QtGui/qmessagebox.h>
++#include <QtGui/qcombobox.h>
++#include <Qt3Support/q3listview.h>
++#include <Qt3Support/q3textbrowser.h>
++#include <QtGui/qpushbutton.h>
++#include <Qt3Support/q3filedialog.h>
++#include <QtCore/qdir.h>
+
+ #include <q4banking/qbanking.h>
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/userwizard.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/userwizard.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/userwizard.cpp 2010-08-03
+@@ -30,7 +30,7 @@
+ #include <gwenhywfar/debug.h>
+ #include <gwenhywfar/gui.h>
+
+-#include <qmessagebox.h>
++#include <QtGui/qmessagebox.h>
+
+
+ UserWizard::UserWizard(QBanking *qb, AB_PROVIDER *pro, QWidget *parent)
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/selectmode.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/selectmode.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/selectmode.cpp 2010-08-03
+@@ -17,9 +17,9 @@
+
+ #include "selectmode.h"
+
+-#include <qradiobutton.h>
+-#include <qtimer.h>
+-#include <qlabel.h> // for qt4 setWordWrap(true)
++#include <QtGui/qradiobutton.h>
++#include <QtCore/qtimer.h>
++#include <QtGui/qlabel.h> // for qt4 setWordWrap(true)
+ #include <gwenhywfar/debug.h>
+
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/cfgtabpageuserhbci.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/cfgtabpageuserhbci.cpp 2010-01-18
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/cfgtabpageuserhbci.cpp 2010-08-03
+@@ -21,14 +21,14 @@
+ #include <q4banking/qbanking.h>
+ #include <q4banking/qbcfgtab.h>
+
+-#include <qpushbutton.h>
+-#include <qcombobox.h>
+-#include <qlineedit.h>
+-#include <qmessagebox.h>
+-#include <q3listview.h>
+-#include <qtimer.h>
+-#include <q3groupbox.h>
+-#include <qcheckbox.h>
++#include <QtGui/qpushbutton.h>
++#include <QtGui/qcombobox.h>
++#include <QtGui/qlineedit.h>
++#include <QtGui/qmessagebox.h>
++#include <Qt3Support/q3listview.h>
++#include <QtCore/qtimer.h>
++#include <Qt3Support/q3groupbox.h>
++#include <QtGui/qcheckbox.h>
+
+ #include <aqhbci/user.h>
+ #include <aqhbci/provider.h>
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/cfgtabpageaccounthbci.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/cfgtabpageaccounthbci.cpp 2010-01-18
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/cfgtabpageaccounthbci.cpp 2010-08-03
+@@ -22,16 +22,16 @@
+
+ #include <q4banking/qbanking.h>
+
+-#include <qpushbutton.h>
+-#include <qcombobox.h>
+-#include <qlineedit.h>
+-#include <qmessagebox.h>
+-#include <q3listview.h>
+-#include <qtimer.h>
+-#include <q3groupbox.h>
+-#include <qcheckbox.h>
+-#include <qspinbox.h>
+-#include <q3filedialog.h>
++#include <QtGui/qpushbutton.h>
++#include <QtGui/qcombobox.h>
++#include <QtGui/qlineedit.h>
++#include <QtGui/qmessagebox.h>
++#include <Qt3Support/q3listview.h>
++#include <QtCore/qtimer.h>
++#include <Qt3Support/q3groupbox.h>
++#include <QtGui/qcheckbox.h>
++#include <QtGui/qspinbox.h>
++#include <Qt3Support/q3filedialog.h>
+
+
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_new2.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_new2.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_new2.cpp 2010-08-03
+@@ -21,7 +21,7 @@
+
+ #include <aqhbci/user.h>
+
+-#include <qtimer.h>
++#include <QtCore/qtimer.h>
+
+
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_new.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_new.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_new.cpp 2010-08-03
+@@ -26,7 +26,7 @@
+
+ #include <aqhbci/user.h>
+
+-#include <qtimer.h>
++#include <QtCore/qtimer.h>
+
+
+ WizardRdhNew::WizardRdhNew(QBanking *qb,
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_import.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_import.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_rdh_import.cpp 2010-08-03
+@@ -26,7 +26,7 @@
+
+ #include <aqhbci/user.h>
+
+-#include <qtimer.h>
++#include <QtCore/qtimer.h>
+
+
+ WizardRdhImport::WizardRdhImport(QBanking *qb,
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_ddv_import.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_ddv_import.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_ddv_import.cpp 2010-08-03
+@@ -23,7 +23,7 @@
+
+ #include <aqhbci/user.h>
+
+-#include <qtimer.h>
++#include <QtCore/qtimer.h>
+
+
+ WizardDdvImport::WizardDdvImport(QBanking *qb,
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_pintan_new.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_pintan_new.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/w_pintan_new.cpp 2010-08-03
+@@ -23,7 +23,7 @@
+
+ #include <aqhbci/user.h>
+
+-#include <qtimer.h>
++#include <QtCore/qtimer.h>
+
+
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getaccounts.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getaccounts.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getaccounts.cpp 2010-08-03
+@@ -19,8 +19,8 @@
+ #include "wizard.h"
+ #include "actionwidget.h"
+
+-#include <qpushbutton.h>
+-#include <qmessagebox.h>
++#include <QtGui/qpushbutton.h>
++#include <QtGui/qmessagebox.h>
+
+ #include <q4banking/qbanking.h>
+ #include <aqhbci/provider.h>
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_finished.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_finished.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_finished.cpp 2010-08-03
+@@ -23,7 +23,7 @@
+
+ #include <assert.h>
+
+-#include <qlabel.h>
++#include <QtGui/qlabel.h>
+
+
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_wait.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_wait.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_wait.cpp 2010-08-03
+@@ -23,7 +23,7 @@
+
+ #include <assert.h>
+
+-#include <qlabel.h>
++#include <QtGui/qlabel.h>
+
+
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getsysid.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getsysid.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getsysid.cpp 2010-08-03
+@@ -24,8 +24,8 @@
+ #include <gwenhywfar/debug.h>
+ #include <gwenhywfar/gui.h>
+
+-#include <qpushbutton.h>
+-#include <qmessagebox.h>
++#include <QtGui/qpushbutton.h>
++#include <QtGui/qmessagebox.h>
+
+ #include <assert.h>
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_useriniletter.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_useriniletter.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_useriniletter.cpp 2010-08-03
+@@ -24,8 +24,8 @@
+
+ #include <q4banking/qbanking.h>
+
+-#include <qpushbutton.h>
+-#include <q3textview.h>
++#include <QtGui/qpushbutton.h>
++#include <Qt3Support/q3textview.h>
+
+ #include <gwenhywfar/debug.h>
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_sendkeys.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_sendkeys.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_sendkeys.cpp 2010-08-03
+@@ -19,7 +19,7 @@
+ #include "wizard.h"
+ #include "actionwidget.h"
+
+-#include <qpushbutton.h>
++#include <QtGui/qpushbutton.h>
+
+ #include <q4banking/qbanking.h>
+ #include <aqhbci/provider.h>
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_mkkeys.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_mkkeys.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_mkkeys.cpp 2010-08-03
+@@ -19,7 +19,7 @@
+ #include "wizard.h"
+ #include "actionwidget.h"
+
+-#include <qpushbutton.h>
++#include <QtGui/qpushbutton.h>
+
+ #include <q4banking/qbanking.h>
+ #include <aqhbci/provider.h>
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_bankiniletter.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_bankiniletter.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_bankiniletter.cpp 2010-08-03
+@@ -23,8 +23,8 @@
+
+ #include <q4banking/qbanking.h>
+
+-#include <qpushbutton.h>
+-#include <q3textview.h>
++#include <QtGui/qpushbutton.h>
++#include <Qt3Support/q3textview.h>
+
+ #include <gwenhywfar/debug.h>
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getkeys.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getkeys.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getkeys.cpp 2010-08-03
+@@ -19,7 +19,7 @@
+ #include "wizard.h"
+ #include "actionwidget.h"
+
+-#include <qpushbutton.h>
++#include <QtGui/qpushbutton.h>
+
+ #include <q4banking/qbanking.h>
+ #include <aqhbci/provider.h>
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getcert.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getcert.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_getcert.cpp 2010-08-03
+@@ -25,7 +25,7 @@
+
+ #include <assert.h>
+
+-#include <qlabel.h>
++#include <QtGui/qlabel.h>
+
+
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_edituser.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_edituser.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_edituser.cpp 2010-08-03
+@@ -19,7 +19,7 @@
+ #include "wizard.h"
+ #include "editctuser.h"
+
+-#include <qlayout.h>
++#include <QtGui/qlayout.h>
+
+
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_checkfile.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_checkfile.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_checkfile.cpp 2010-08-03
+@@ -19,7 +19,7 @@
+ #include "wizard.h"
+ #include "actionwidget.h"
+
+-#include <qpushbutton.h>
++#include <QtGui/qpushbutton.h>
+
+ #include <q4banking/qbanking.h>
+ #include <aqhbci/provider.h>
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_createfile.H
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_createfile.H 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_createfile.H 2010-08-02
+@@ -21,7 +21,7 @@
+ #include "winfo.h"
+ #include "a_selectfile.h"
+
+-#include <qstring.h>
++#include <QtCore/qstring.h>
+
+
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_selectfile.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_selectfile.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_selectfile.cpp 2010-08-02
+@@ -21,11 +21,11 @@
+ #include <aqhbci/provider.h>
+ #include <gwenhywfar/debug.h>
+
+-#include <qpushbutton.h>
+-#include <qlineedit.h>
+-#include <qfile.h>
+-#include <q3filedialog.h>
+-#include <qlabel.h>
++#include <QtGui/qpushbutton.h>
++#include <QtGui/qlineedit.h>
++#include <QtCore/qfile.h>
++#include <Qt3Support/q3filedialog.h>
++#include <QtGui/qlabel.h>
+
+
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_selectfile.h
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_selectfile.h 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/a_selectfile.h 2010-08-02
+@@ -18,7 +18,7 @@
+ #include "winfo.h"
+ #include "selectfile.ui.h"
+
+-#include <qstring.h>
++#include <QtCore/qstring.h>
+
+
+ class ActionSelectFile: public WizardAction {
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/iniletter.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/iniletter.cpp 2010-01-15 15:07:28.000000000 -0800
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/iniletter.cpp 2010-08-02 16:39:22.000000000 -0700
+@@ -22,14 +22,11 @@
+
+ #include <gwenhywfar/debug.h>
+
+-#include <qmessagebox.h>
+-#include <qstring.h>
+-#include <qlabel.h>
+-#include <qpushbutton.h>
+-#include <q3textview.h>
+-#include <qlabel.h> // for qt4 setWordWrap(true)
+-
+-
++#include <QtGui/qmessagebox.h>
++#include <QtCore/qstring.h>
++#include <QtGui/qlabel.h>
++#include <QtGui/qpushbutton.h>
++#include <Qt3Support/q3textview.h>
+
+ IniLetter::IniLetter(bool useUserKey,
+ AB_PROVIDER *pro,
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/iniletter.h
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/iniletter.h 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/iniletter.h 2010-08-02
+@@ -19,7 +19,7 @@
+ #include <aqbanking/provider.h>
+ #include <aqbanking/user.h>
+
+-#include <qstring.h>
++#include <QtCore/qstring.h>
+ #include <string>
+
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/editctuser.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/editctuser.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/editctuser.cpp 2010-08-02
+@@ -21,25 +21,25 @@
+ #include <q4banking/qbanking.h>
+ #include <q4banking/qbselectbank.h>
+ //#include "selectcontext.h"
+-#include <qradiobutton.h>
+-#include <qpushbutton.h>
+-#include <q3wizard.h>
+-#include <qcombobox.h>
+-#include <q3textbrowser.h>
+-#include <qlabel.h>
+-#include <q3groupbox.h>
+-#include <qcheckbox.h>
+-
+-#include <qlineedit.h>
+-#include <qmessagebox.h>
+-#include <q3filedialog.h>
+-#include <qpalette.h>
+-#include <qbrush.h>
+-#include <qpainter.h>
+-#include <q3paintdevicemetrics.h>
+-#include <qprinter.h>
+-#include <q3simplerichtext.h>
+-#include <q3textview.h>
++#include <QtGui/qradiobutton.h>
++#include <QtGui/qpushbutton.h>
++#include <Qt3Support/q3wizard.h>
++#include <QtGui/qcombobox.h>
++#include <Qt3Support/q3textbrowser.h>
++#include <QtGui/qlabel.h>
++#include <Qt3Support/q3groupbox.h>
++#include <QtGui/qcheckbox.h>
++
++#include <QtGui/qlineedit.h>
++#include <QtGui/qmessagebox.h>
++#include <Qt3Support/q3filedialog.h>
++#include <QtGui/qpalette.h>
++#include <QtGui/qbrush.h>
++#include <QtGui/qpainter.h>
++#include <Qt3Support/q3paintdevicemetrics.h>
++#include <QtGui/qprinter.h>
++#include <Qt3Support/q3simplerichtext.h>
++#include <Qt3Support/q3textview.h>
+
+ #include <gwenhywfar/debug.h>
+ #include <gwenhywfar/gui.h>
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/actionwidget.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/actionwidget.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/actionwidget.cpp 2010-08-02
+@@ -18,11 +18,11 @@
+
+ #include <gwenhywfar/debug.h>
+
+-#include <qmessagebox.h>
+-#include <qstring.h>
+-#include <qlabel.h>
+-#include <q3textview.h>
+-#include <qpushbutton.h>
++#include <QtGui/qmessagebox.h>
++#include <QtCore/qstring.h>
++#include <QtGui/qlabel.h>
++#include <Qt3Support/q3textview.h>
++#include <QtGui/qpushbutton.h>
+
+
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/wizard.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/wizard.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/wizard.cpp 2010-08-02
+@@ -17,12 +17,12 @@
+
+ #include "wizard.h"
+
+-#include <qlabel.h>
+-#include <qpushbutton.h>
+-#include <q3listview.h>
+-#include <qdatetime.h>
+-#include <q3textbrowser.h>
+-#include <qapplication.h>
++#include <QtGui/qlabel.h>
++#include <QtGui/qpushbutton.h>
++#include <Qt3Support/q3listview.h>
++#include <QtCore/qdatetime.h>
++#include <Qt3Support/q3textbrowser.h>
++#include <QtGui/qapplication.h>
+
+ #include <gwenhywfar/debug.h>
+
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/wizard.h
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/wizard.h 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/wizard.h 2010-08-02
+@@ -25,8 +25,8 @@
+ #include "waction.h"
+ #include "winfo.h"
+
+-#include <qstring.h>
+-#include <q3wizard.h>
++#include <QtCore/qstring.h>
++#include <Qt3Support/q3wizard.h>
+ #include <aqbanking/banking.h>
+
+ #include <list>
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/waction.h
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/waction.h 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/waction.h 2010-08-02
+@@ -1,5 +1,5 @@
+ //Added by qt3to4:
+-#include <Q3VBoxLayout>
++#include <Qt3Support/Q3VBoxLayout>
+ /***************************************************************************
+ $RCSfile$
+ -------------------
+@@ -22,8 +22,8 @@
+
+ class Q3VBoxLayout;
+
+-#include <qstring.h>
+-#include <qwidget.h>
++#include <QtCore/qstring.h>
++#include <QtGui/qwidget.h>
+
+
+ class WizardAction: public QWidget {
+Index: src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/waction.cpp
+--- src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/waction.cpp 2010-01-15
++++ src/plugins/backends/aqhbci/ui/qt4/libs/dialogs/wizard/waction.cpp 2010-08-02
+@@ -17,10 +17,10 @@
+ #include "waction.h"
+ #include "wizard.h"
+
+-#include <qwidget.h>
+-#include <qlayout.h>
++#include <QtGui/qwidget.h>
++#include <QtGui/qlayout.h>
+ //Added by qt3to4:
+-#include <Q3VBoxLayout>
++#include <Qt3Support/Q3VBoxLayout>
+
+
+ WizardAction::WizardAction(Wizard *w,
+Index: src/aqbanking-4.2.4/src/frontends/q4banking/bin/helpbrowser/Makefile.in
+--- src/frontends/q4banking/bin/helpbrowser/Makefile.in 2010-02-06
++++ src/frontends/q4banking/bin/helpbrowser/Makefile.in 2010-08-02
+@@ -392,7 +392,7 @@
+
+ q4b_help at Q4BANKING_SO_EFFECTIVE@_SOURCES = qb_help.cpp qbhelpbrowser.cpp
+ q4b_help at Q4BANKING_SO_EFFECTIVE@_LDADD = \
+- $(qt4_libs) -lQtCore -lQt3Support \
++ $(qt4_libs) \
+ $(gwenhywfar_libs)
+
+ BUILT_SOURCES = $(MOC_FILES) $(nodist_libqbhelp_la_SOURCES) $(nodist_noinst_HEADERS)
+Index: src/frontends/q4banking/bin/helpbrowser/qbhelpbrowser.cpp
+--- src/frontends/q4banking/bin/helpbrowser/qbhelpbrowser.cpp 2010-01-15
++++ src/frontends/q4banking/bin/helpbrowser/qbhelpbrowser.cpp 2010-08-02
+@@ -15,34 +15,34 @@
+ #endif
+
+ #include "qbhelpbrowser.h"
+-#include <qstatusbar.h>
+-#include <qpixmap.h>
+-#include <q3popupmenu.h>
+-#include <qmenubar.h>
+-#include <q3toolbar.h>
+-#include <qtoolbutton.h>
+-#include <qicon.h>
+-#include <qfile.h>
+-#include <q3textstream.h>
+-#include <q3stylesheet.h>
+-#include <qmessagebox.h>
+-#include <q3filedialog.h>
+-#include <qapplication.h>
+-#include <qcombobox.h>
+-#include <qevent.h>
+-#include <qlineedit.h>
+-#include <qobject.h>
+-#include <qfileinfo.h>
+-#include <qfile.h>
+-#include <qdatastream.h>
+-#include <qprinter.h>
+-#include <q3simplerichtext.h>
+-#include <qpainter.h>
+-#include <q3paintdevicemetrics.h>
++#include <QtGui/qstatusbar.h>
++#include <QtGui/qpixmap.h>
++#include <Qt3Support/q3popupmenu.h>
++#include <QtGui/qmenubar.h>
++#include <Qt3Support/q3toolbar.h>
++#include <QtGui/qtoolbutton.h>
++#include <QtGui/qicon.h>
++#include <QtCore/qfile.h>
++#include <Qt3Support/q3textstream.h>
++#include <Qt3Support/q3stylesheet.h>
++#include <QtGui/qmessagebox.h>
++#include <Qt3Support/q3filedialog.h>
++#include <QtGui/qapplication.h>
++#include <QtGui/qcombobox.h>
++#include <QtGui/qevent.h>
++#include <QtGui/qlineedit.h>
++#include <QtCore/qobject.h>
++#include <QtCore/qfileinfo.h>
++#include <QtCore/qfile.h>
++#include <QtCore/qdatastream.h>
++#include <QtGui/qprinter.h>
++#include <Qt3Support/q3simplerichtext.h>
++#include <QtGui/qpainter.h>
++#include <Qt3Support/q3paintdevicemetrics.h>
+
+-#include <q3textbrowser.h>
++#include <Qt3Support/q3textbrowser.h>
+ //Added by qt3to4:
+-#include <Q3Frame>
++#include <Qt3Support/Q3Frame>
+
+ #include <ctype.h>
+
+Index: src/frontends/q4banking/bin/helpbrowser/qbhelpbrowser.h
+--- src/frontends/q4banking/bin/helpbrowser/qbhelpbrowser.h 2010-01-15
++++ src/frontends/q4banking/bin/helpbrowser/qbhelpbrowser.h 2010-08-02
+@@ -13,17 +13,17 @@
+ #ifndef QBHELPWINDOW_H
+ #define QBHELPWINDOW_H
+
+-#include <q3mainwindow.h>
+-#include <q3textbrowser.h>
+-#include <qstringlist.h>
+-#include <qmap.h>
+-#include <qdir.h>
+-#include <qstringlist.h>
++#include <Qt3Support/q3mainwindow.h>
++#include <Qt3Support/q3textbrowser.h>
++#include <QtCore/qstringlist.h>
++#include <QtCore/qmap.h>
++#include <QtCore/qdir.h>
++#include <QtCore/qstringlist.h>
+
+ #include "qbhelpbrowser.ui.h"
+ #include <q4banking/qbanking.h>
+ //Added by qt3to4:
+-#include <Q3PopupMenu>
++#include <Qt3Support/Q3PopupMenu>
+
+
+ class QComboBox;
+Index: src/frontends/q4banking/bin/helpbrowser/qb_help.cpp
+--- src/frontends/q4banking/bin/helpbrowser/qb_help.cpp 2010-01-15
++++ src/frontends/q4banking/bin/helpbrowser/qb_help.cpp 2010-08-02
+@@ -15,9 +15,11 @@
+ #endif
+
+
+-#include <qapplication.h>
+-#include <qtranslator.h>
+-#include <qtextcodec.h>
++#include <QtGui/qapplication.h>
++#include <QtCore/qtranslator.h>
++#include <QtCore/qtextcodec.h>
++#include <QtCore/qstringlist.h>
++#include <QtGui/qmessagebox.h>
+
+ #include <gwenhywfar/logger.h>
+ #include <gwenhywfar/debug.h>
+@@ -26,11 +28,6 @@
+
+ #include "qbhelpbrowser.h"
+
+-#include <qapplication.h>
+-#include <qstringlist.h>
+-#include <qtextcodec.h>
+-#include <qtranslator.h>
+-#include <qmessagebox.h>
+
+
+ #ifdef OS_WIN32
+Index: src/frontends/q4banking/bin/wizard/qt4_wizard.cpp
+--- src/frontends/q4banking/bin/wizard/qt4_wizard.cpp 2010-01-15
++++ src/frontends/q4banking/bin/wizard/qt4_wizard.cpp 2010-08-02
+@@ -15,7 +15,7 @@
+ #endif
+
+
+-#include <qapplication.h>
++#include <QtGui/qapplication.h>
+
+ #include <gwenhywfar/logger.h>
+ #include <gwenhywfar/debug.h>
+Index: src/frontends/q4banking/lib/checklib.cpp
+--- src/frontends/q4banking/lib/checklib.cpp 2010-01-15
++++ src/frontends/q4banking/lib/checklib.cpp 2010-08-02
+@@ -1,15 +1,15 @@
+ #include <q4banking/qbanking.h>
+
+-#include <qapplication.h>
+-#include <qmessagebox.h>
+-#include <qtranslator.h>
+-#include <qtextcodec.h>
+-#include <qregexp.h>
++#include <QtGui/qapplication.h>
++#include <QtGui/qmessagebox.h>
++#include <QtCore/qtranslator.h>
++#include <Qtcore/qtextcodec.h>
++#include <QtCore/qregexp.h>
+
+ #include <gwenhywfar/debug.h>
+ #include <gwenhywfar/gwenhywfar.h>
+
+-#include <qdir.h>
++#include <QtCore/qdir.h>
+
+
+ int main(int argc, char *argv[]){
+Index: src/frontends/q4banking/lib/testlib.cpp
+--- src/frontends/q4banking/lib/testlib.cpp 2010-01-15
++++ src/frontends/q4banking/lib/testlib.cpp 2010-08-02
+@@ -1,7 +1,7 @@
+ #include <q4banking/qbanking.h>
+
+-#include <qapplication.h>
+-#include <qmessagebox.h>
++#include <QtGui/qapplication.h>
++#include <QtGui/qmessagebox.h>
+
+ #include <gwenhywfar/debug.h>
+ #include <gwenhywfar/gwenhywfar.h>
+Index: src/frontends/q4banking/lib/Makefile.in
+--- src/frontends/q4banking/lib/Makefile.in 2010-02-06
++++ src/frontends/q4banking/lib/Makefile.in 2010-08-03
+@@ -493,7 +493,7 @@
+ dialogs/libdialogs.la \
+ views/libviews.la \
+ gui/libqgui.la \
+- $(i18n_libs) $(aqbanking_internal_libs) $(gwenhywfar_libs) $(qt4_libs) -lQt3Support
++ $(i18n_libs) $(aqbanking_internal_libs) $(gwenhywfar_libs) $(qt4_libs)
+
+ libq4banking_la_LDFLAGS = -no-undefined -version-info \
+ @Q4BANKING_SO_CURRENT@:@Q4BANKING_SO_REVISION@:@Q4BANKING_SO_AGE@ \
+@@ -504,9 +504,9 @@
+ dialogs/libdialogs.la views/libviews.la gui/libqgui.la \
+ $(aqbanking_internal_libs) $(am__append_1)
+ testlib_SOURCES = testlib.cpp
+-testlib_LDADD = libq4banking.la $(aqbanking_internal_libs) $(gwenhywfar_libs) $(qt4_libs) -lQtCore -lQt3Support
++testlib_LDADD = libq4banking.la $(aqbanking_internal_libs) $(gwenhywfar_libs) $(qt4_libs)
+ checklib_SOURCES = checklib.cpp
+-checklib_LDADD = libq4banking.la $(aqbanking_internal_libs) $(gwenhywfar_libs) $(qt4_libs) -lQtCore -lQt3Support
++checklib_LDADD = libq4banking.la $(aqbanking_internal_libs) $(gwenhywfar_libs) $(qt4_libs)
+ all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+Index: src/frontends/q4banking/bin/wizard/Makefile.in
+--- src/frontends/q4banking/bin/wizard/Makefile.in 2010-02-06
++++ src/frontends/q4banking/bin/wizard/Makefile.in 2010-08-03
+@@ -410,7 +410,7 @@
+ qt4_wizard_LDADD = \
+ $(q4banking_internal_libs) \
+ $(aqbanking_internal_libs) \
+- $(gwenhywfar_libs) $(qt4_libs) -lQtCore
++ $(gwenhywfar_libs) $(qt4_libs)
+
+ CLEANFILES = qt4_wizard.xml
+ all: all-am
+Index: src/frontends/q4banking/lib/qbgui.cpp
+--- src/frontends/q4banking/lib/qbgui.cpp 2010-01-15
++++ src/frontends/q4banking/lib/qbgui.cpp 2010-08-02
+@@ -20,7 +20,7 @@
+ #include "qbprintdialog.h"
+
+
+-#include <qwidget.h>
++#include <QtGui/qwidget.h>
+
+ #include <aqbanking/abgui.h>
+
+Index: src/frontends/q4banking/lib/qbanking.cpp
+--- src/frontends/q4banking/lib/qbanking.cpp 2010-01-15
++++ src/frontends/q4banking/lib/qbanking.cpp 2010-08-02
+@@ -26,22 +26,22 @@
+ #include "qbcfgmodule.h"
+ #include "qbcfgtabsettings.h"
+ //Added by qt3to4:
+-#include <Q3CString>
++#include <Qt3Support/Q3CString>
+
+ #include <aqbanking/jobgetbalance.h>
+ #include <aqbanking/jobgettransactions.h>
+
+ #include <assert.h>
+-#include <qstring.h>
+-#include <qmessagebox.h>
+-#include <qinputdialog.h>
+-#include <qapplication.h>
+-#include <qdatetime.h>
+-#include <qwidget.h>
+-#include <qtranslator.h>
+-#include <qtextcodec.h>
+-#include <q3process.h>
+-#include <qdir.h>
++#include <QtCore/qstring.h>
++#include <QtGui/qmessagebox.h>
++#include <QtGui/qinputdialog.h>
++#include <QtGui/qapplication.h>
++#include <QtCore/qdatetime.h>
++#include <QtGui/qwidget.h>
++#include <QtCore/qtranslator.h>
++#include <QtCore/qtextcodec.h>
++#include <Qt3Support/q3process.h>
++#include <QtCore/qdir.h>
+
+ #include <gwenhywfar/debug.h>
+ #include <gwenhywfar/libloader.h>
+Index: src/frontends/q4banking/lib/gui/qguisimplebox.cpp
+--- src/frontends/q4banking/lib/gui/qguisimplebox.cpp 2010-01-15
++++ src/frontends/q4banking/lib/gui/qguisimplebox.cpp 2010-08-02
+@@ -15,8 +15,8 @@
+ #endif
+
+
+-#include <qlabel.h>
+-#include <qtimer.h>
++#include <QtGui/qlabel.h>
++#include <QtCore/qtimer.h>
+
+ #include "qguisimplebox.h"
+
+Index: src/frontends/q4banking/lib/gui/qguiprogresswidget.cpp
+--- src/frontends/q4banking/lib/gui/qguiprogresswidget.cpp 2010-01-15
++++ src/frontends/q4banking/lib/gui/qguiprogresswidget.cpp 2010-08-02
+@@ -17,16 +17,16 @@
+ #include "qguiprogresswidget.h"
+ #include "qguiprogress.h"
+
+-#include <qlabel.h>
+-#include <q3progressbar.h>
+-#include <qapplication.h>
+-#include <qpushbutton.h>
+-#include <qdatetime.h>
+-#include <q3textbrowser.h>
+-#include <q3progressbar.h>
+-#include <q3groupbox.h>
++#include <QtGui/qlabel.h>
++#include <Qt3Support/q3progressbar.h>
++#include <QtGui/qapplication.h>
++#include <QtGui/qpushbutton.h>
++#include <QtCore/qdatetime.h>
++#include <Qt3Support/q3textbrowser.h>
++#include <Qt3Support/q3progressbar.h>
++#include <Qt3Support/q3groupbox.h>
+ //Added by qt3to4:
+-#include <QCloseEvent>
++#include <QtGui/QCloseEvent>
+
+ #include <gwenhywfar/debug.h>
+
+Index:src/frontends/q4banking/lib/gui/qguiinputbox.cpp
+--- src/frontends/q4banking/lib/gui/qguiinputbox.cpp 2010-01-15
++++ src/frontends/q4banking/lib/gui/qguiinputbox.cpp 2010-08-02
+@@ -15,21 +15,21 @@
+ #endif
+
+
+-#include <qlabel.h>
+-#include <qapplication.h>
+-#include <qpushbutton.h>
+-#include <q3textbrowser.h>
+-#include <qlineedit.h>
+-#include <q3simplerichtext.h>
+-#include <qvalidator.h>
+-#include <qlayout.h>
+-#include <qtimer.h>
++#include <QtGui/qlabel.h>
++#include <QtGui/qapplication.h>
++#include <QtGui/qpushbutton.h>
++#include <Qt3Support/q3textbrowser.h>
++#include <QtGui/qlineedit.h>
++#include <Qt3Support/q3simplerichtext.h>
++#include <QtGui/qvalidator.h>
++#include <QtGui/qlayout.h>
++#include <QtCore/qtimer.h>
+ //Added by qt3to4:
+-#include <Q3GridLayout>
+-#include <Q3BoxLayout>
+-#include <Q3HBoxLayout>
+-#include <Q3VBoxLayout>
+-#include <Q3Frame>
++#include <Qt3Support/Q3GridLayout>
++#include <Qt3Support/Q3BoxLayout>
++#include <Qt3Support/Q3HBoxLayout>
++#include <Qt3Support/Q3VBoxLayout>
++#include <Qt3Support/Q3Frame>
+
+ #include <gwenhywfar/debug.h>
+ #include <gwenhywfar/gui.h>
+Index: src/frontends/q4banking/lib/gui/qgui.cpp
+--- src/frontends/q4banking/lib/gui/qgui.cpp 2010-01-15
++++ src/frontends/q4banking/lib/gui/qgui.cpp 2010-08-02
+@@ -21,12 +21,12 @@
+ #include "qguiinputbox.h"
+ #include "qguisimplebox.h"
+ //Added by qt3to4:
+-#include <Q3CString>
++#include <Qt3Support/Q3CString>
+
+ #include <gwenhywfar/debug.h>
+
+-#include <qmessagebox.h>
+-#include <qapplication.h>
++#include <QtGui/qmessagebox.h>
++#include <QtGui/qapplication.h>
+
+ #include <assert.h>
+
+Index: src/frontends/q4banking/lib/dialogs/qbmapaccount.cpp
+--- src/frontends/q4banking/lib/dialogs/qbmapaccount.cpp 2010-01-15
++++ src/frontends/q4banking/lib/dialogs/qbmapaccount.cpp 2010-08-02
+@@ -21,13 +21,13 @@
+ #include "qbaccountlist.h"
+
+ // QT includes
+-#include <qlabel.h>
+-#include <qpushbutton.h>
+-#include <qmessagebox.h>
+-#include <qlayout.h>
+-#include <qpushbutton.h>
+-#include <q3groupbox.h>
+-#include <qlineedit.h>
++#include <QtGui/qlabel.h>
++#include <QtGui/qpushbutton.h>
++#include <QtGui/qmessagebox.h>
++#include <QtGui/qlayout.h>
++#include <QtGui/qpushbutton.h>
++#include <Qt3Support/q3groupbox.h>
++#include <QtGui/qlineedit.h>
+
+
+
+Index: src/frontends/q4banking/lib/gui/qguiinputbox.h
+--- src/frontends/q4banking/lib/gui/qguiinputbox.h 2010-01-15
++++ src/frontends/q4banking/lib/gui/qguiinputbox.h 2010-08-02
+@@ -16,8 +16,8 @@
+
+ #include <gwenhywfar/types.h>
+
+-#include <qdialog.h>
+-#include <qvalidator.h>
++#include <QtGui/qdialog.h>
++#include <QtGui/qvalidator.h>
+
+
+ class QLineEdit;
+Index: src/frontends/q4banking/lib/gui/qguiprogresswidget.h
+--- src/frontends/q4banking/lib/gui/qguiprogresswidget.h 2010-01-15
++++ src/frontends/q4banking/lib/gui/qguiprogresswidget.h 2010-08-02
+@@ -16,7 +16,7 @@
+
+ #include "qguiprogresswidget.ui.h"
+ //Added by qt3to4:
+-#include <QCloseEvent>
++#include <QtGui/QCloseEvent>
+ #include <gwenhywfar/types.h>
+ #include <gwenhywfar/gui.h>
+
+Index: src/aqbanking-4.2.4/src/frontends/q4banking/lib/gui/qguiprogress.h
+--- src/frontends/q4banking/lib/gui/qguiprogress.h 2010-01-15
++++ src/frontends/q4banking/lib/gui/qguiprogress.h 2010-08-02
+@@ -18,7 +18,7 @@
+
+ #include <time.h>
+
+-#include <qstring.h>
++#include <QtCore/qstring.h>
+
+
+ class QGuiProgressWidget;
+Index: src/frontends/q4banking/lib/widgets/qbcfgtab.h
+--- src/frontends/q4banking/lib/widgets/qbcfgtab.h 2010-01-15
++++ src/frontends/q4banking/lib/widgets/qbcfgtab.h 2010-08-02
+@@ -20,7 +20,7 @@
+ #include <q4banking/qbanking.h>
+
+ #include "qbcfgtab.ui.h"
+-#include <qstring.h>
++#include <QtCore/qstring.h>
+
+
+ class QBanking;
+Index: src/frontends/q4banking/lib/views/qbbankselector.cpp
+--- src/frontends/q4banking/lib/views/qbbankselector.cpp 2010-01-15
++++ src/frontends/q4banking/lib/views/qbbankselector.cpp 2010-08-02
+@@ -17,7 +17,7 @@
+
+ #include "qbbankselector.h"
+ #include "qbselectbank.h"
+-#include <qlineedit.h>
++#include <QtGui/qlineedit.h>
+
+
+
+Index: src/frontends/q4banking/lib/dialogs/qbselectbackend.cpp
+--- src/frontends/q4banking/lib/dialogs/qbselectbackend.cpp 2010-01-15
++++ src/frontends/q4banking/lib/dialogs/qbselectbackend.cpp 2010-08-02
+@@ -22,10 +22,10 @@
+ #include <gwenhywfar/debug.h>
+
+ // QT includes
+-#include <qcombobox.h>
+-#include <qpushbutton.h>
+-#include <q3textbrowser.h>
+-#include <qlabel.h> // for qt4 setWordWrap(true)
++#include <QtGui/qcombobox.h>
++#include <QtGui/qpushbutton.h>
++#include <Qt3Support/q3textbrowser.h>
++#include <QtGui/qlabel.h> // for qt4 setWordWrap(true)
+
+
+
+Index: src/frontends/q4banking/lib/dialogs/qbeditaccount.cpp
+--- src/frontends/q4banking/lib/dialogs/qbeditaccount.cpp 2010-01-24
++++ src/frontends/q4banking/lib/dialogs/qbeditaccount.cpp 2010-08-02
+@@ -21,7 +21,7 @@
+ #include "qbanking.h"
+
+ // QT includes
+-#include <qmessagebox.h>
++#include <QtGui/qmessagebox.h>
+
+ // Gwenhywfar includes
+ #include <gwenhywfar/debug.h>
+Index: src/frontends/q4banking/lib/dialogs/qbedituser.cpp
+--- src/frontends/q4banking/lib/dialogs/qbedituser.cpp 2010-01-24
++++ src/frontends/q4banking/lib/dialogs/qbedituser.cpp 2010-08-02
+@@ -21,7 +21,7 @@
+ #include "qbanking.h"
+
+ // QT includes
+-#include <qmessagebox.h>
++#include <QtGui/qmessagebox.h>
+
+ // Gwenhywfar includes
+ #include <gwenhywfar/debug.h>
+Index: src/frontends/q4banking/lib/dialogs/qbcfgtabpagebackends.cpp
+--- src/frontends/q4banking/lib/dialogs/qbcfgtabpagebackends.cpp 2010-01-15
++++ src/frontends/q4banking/lib/dialogs/qbcfgtabpagebackends.cpp 2010-08-02
+@@ -24,11 +24,11 @@
+ #include <gwenhywfar/debug.h>
+
+ // QT includes
+-#include <qlineedit.h>
+-#include <qcombobox.h>
+-#include <qpushbutton.h>
+-#include <qmessagebox.h>
+-#include <qlayout.h>
++#include <QtGui/qlineedit.h>
++#include <QtGui/qcombobox.h>
++#include <QtGui/qpushbutton.h>
++#include <QtGui/qmessagebox.h>
++#include <QtGui/qlayout.h>
+
+
+
+Index: src/frontends/q4banking/lib/dialogs/qbcfgtabpageusers.cpp
+--- src/frontends/q4banking/lib/dialogs/qbcfgtabpageusers.cpp 2010-01-15
++++ src/frontends/q4banking/lib/dialogs/qbcfgtabpageusers.cpp 2010-08-02
+@@ -27,12 +27,12 @@
+ #include <gwenhywfar/debug.h>
+
+ // QT includes
+-#include <qlineedit.h>
+-#include <qcombobox.h>
+-#include <qpushbutton.h>
+-#include <qmessagebox.h>
+-#include <qlayout.h>
+-#include <qtextcodec.h>
++#include <QtGui/qlineedit.h>
++#include <QtGui/qcombobox.h>
++#include <QtGui/qpushbutton.h>
++#include <QtGui/qmessagebox.h>
++#include <QtGui/qlayout.h>
++#include <QtCore/qtextcodec.h>
+
+
+
+Index: src/frontends/q4banking/lib/dialogs/qbimporter.cpp
+--- src/frontends/q4banking/lib/dialogs/qbimporter.cpp 2010-01-15
++++ src/frontends/q4banking/lib/dialogs/qbimporter.cpp 2010-08-02
+@@ -27,17 +27,17 @@
+ #include <gwenhywfar/iomanager.h>
+
+ // QT includes
+-#include <q3listview.h>
+-#include <qpushbutton.h>
+-#include <q3textbrowser.h>
+-#include <qmessagebox.h>
+-#include <qapplication.h>
+-#include <q3progressbar.h>
+-#include <qfile.h>
+-#include <q3filedialog.h>
+-#include <qcombobox.h>
+-#include <qlabel.h>
+-#include <qlineedit.h>
++#include <Qt3Support/q3listview.h>
++#include <QtGui/qpushbutton.h>
++#include <Qt3Support/q3textbrowser.h>
++#include <QtGui/qmessagebox.h>
++#include <QtGui/qapplication.h>
++#include <Qt3Support/q3progressbar.h>
++#include <QtCore/qfile.h>
++#include <Qt3Support/q3filedialog.h>
++#include <QtGui/qcombobox.h>
++#include <QtGui/qlabel.h>
++#include <QtGui/qlineedit.h>
+
+ // C includes
+ #include <sys/types.h>
+Index: src/frontends/q4banking/lib/dialogs/qbedituser.h
+--- src/frontends/q4banking/lib/dialogs/qbedituser.h 2010-01-15
++++ src/frontends/q4banking/lib/dialogs/qbedituser.h 2010-08-02
+@@ -16,7 +16,7 @@
+
+ #include <q4banking/qbcfgtab.h>
+
+-#include <qstring.h>
++#include <QtCore/qstring.h>
+
+
+ class QBanking;
+Index: src/frontends/q4banking/lib/dialogs/qbcfgtabpageaccounts.cpp
+--- src/frontends/q4banking/lib/dialogs/qbcfgtabpageaccounts.cpp 2010-01-15
++++ src/frontends/q4banking/lib/dialogs/qbcfgtabpageaccounts.cpp 2010-08-02
+@@ -27,12 +27,12 @@
+ #include <gwenhywfar/debug.h>
+
+ // QT includes
+-#include <qlineedit.h>
+-#include <qcombobox.h>
+-#include <qpushbutton.h>
+-#include <qmessagebox.h>
+-#include <qlayout.h>
+-#include <qtextcodec.h>
++#include <QtGui/qlineedit.h>
++#include <QtGui/qcombobox.h>
++#include <QtGui/qpushbutton.h>
++#include <QtGui/qmessagebox.h>
++#include <QtGui/qlayout.h>
++#include <QtCore/qtextcodec.h>
+
+
+
+Index: src/frontends/q4banking/lib/qbcfgmodule.h
+--- src/frontends/q4banking/lib/qbcfgmodule.h 2010-01-15 15:07:21.000000000 -0800
++++ src/frontends/q4banking/lib/qbcfgmodule.h 2010-08-02 15:46:29.000000000 -0700
+@@ -17,7 +17,7 @@
+ #include <aqbanking/banking.h>
+ #include <gwenhywfar/plugin.h>
+
+-#include <qstring.h>
++#include <QtCore/qstring.h>
+
+
+ #define Q4BCFGMODULE_FLAGS_CAN_CREATE_USER 0x00000001
+Index: src/frontends/q4banking/lib/dialogs/qbcfgtabpageaccountgen.cpp
+--- src/frontends/q4banking/lib/dialogs/qbcfgtabpageaccountgen.cpp 2010-01-18
++++ src/frontends/q4banking/lib/dialogs/qbcfgtabpageaccountgen.cpp 2010-08-02
+@@ -22,12 +22,12 @@
+ #include <gwenhywfar/debug.h>
+
+ // QT includes
+-#include <qlineedit.h>
+-#include <qcombobox.h>
+-#include <qpushbutton.h>
+-#include <qmessagebox.h>
+-#include <qlayout.h>
+-#include <qcheckbox.h>
++#include <QtGui/qlineedit.h>
++#include <QtGui/qcombobox.h>
++#include <QtGui/qpushbutton.h>
++#include <QtGui/qmessagebox.h>
++#include <QtGui/qlayout.h>
++#include <QtGui/qcheckbox.h>
+
+
+
+Index: src/frontends/q4banking/lib/dialogs/qbcfgtabpageusergen.cpp
+--- src/frontends/q4banking/lib/dialogs/qbcfgtabpageusergen.cpp 2010-01-18
++++ src/frontends/q4banking/lib/dialogs/qbcfgtabpageusergen.cpp 2010-08-02
+@@ -22,12 +22,12 @@
+ #include <gwenhywfar/debug.h>
+
+ // QT includes
+-#include <qlineedit.h>
+-#include <qcombobox.h>
+-#include <qpushbutton.h>
+-#include <qmessagebox.h>
+-#include <qlabel.h>
+-#include <qlocale.h>
++#include <QtGui/qlineedit.h>
++#include <QtGui/qcombobox.h>
++#include <QtGui/qpushbutton.h>
++#include <QtGui/qmessagebox.h>
++#include <QtGui/qlabel.h>
++#include <QtCore/qlocale.h>
+
+
+
+Index: src/frontends/q4banking/lib/dialogs/qbprintdialog.h
+--- src/frontends/q4banking/lib/dialogs/qbprintdialog.h 2010-01-15
++++ src/frontends/q4banking/lib/dialogs/qbprintdialog.h 2010-08-02
+@@ -17,7 +17,7 @@
+
+ #include "qbprintdialog.ui.h"
+
+-#include <qstring.h>
++#include <QtCore/qstring.h>
+
+ class QPrinter;
+
+Index: src/frontends/q4banking/lib/dialogs/qbprintdialog.cpp
+--- src/frontends/q4banking/lib/dialogs/qbprintdialog.cpp 2010-01-15
++++ src/frontends/q4banking/lib/dialogs/qbprintdialog.cpp 2010-08-02
+@@ -25,15 +25,15 @@
+ #include <gwenhywfar/gui.h>
+
+ // QT includes
+-#include <qlabel.h>
+-#include <q3textbrowser.h>
+-#include <qpushbutton.h>
+-#include <qprinter.h>
+-#include <qpainter.h>
+-#include <q3paintdevicemetrics.h>
+-#include <q3simplerichtext.h>
+-#include <qmessagebox.h>
+-#include <qfontdialog.h>
++#include <QtGui/qlabel.h>
++#include <Qt3Support/q3textbrowser.h>
++#include <QtGui/qpushbutton.h>
++#include <QtGui/qprinter.h>
++#include <QtGui/qpainter.h>
++#include <Qt3Support/q3paintdevicemetrics.h>
++#include <Qt3Support/q3simplerichtext.h>
++#include <QtGui/qmessagebox.h>
++#include <QtGui/qfontdialog.h>
+
+
+
+Index: src/frontends/q4banking/lib/dialogs/qbselectfromlist.cpp
+--- src/frontends/q4banking/lib/dialogs/qbselectfromlist.cpp 2010-01-15
++++ src/frontends/q4banking/lib/dialogs/qbselectfromlist.cpp 2010-08-02
+@@ -22,10 +22,10 @@
+ #include <gwenhywfar/debug.h>
+
+ // QT includes
+-#include <qlabel.h>
+-#include <qpushbutton.h>
+-#include <q3groupbox.h>
+-#include <q3listview.h>
++#include <QtGui/qlabel.h>
++#include <QtGui/qpushbutton.h>
++#include <Qt3Support/q3groupbox.h>
++#include <Qt3Support/q3listview.h>
+
+
+
+Index: src/frontends/q4banking/lib/dialogs/qbselectbank.cpp
+--- src/frontends/q4banking/lib/dialogs/qbselectbank.cpp 2010-01-15
++++ src/frontends/q4banking/lib/dialogs/qbselectbank.cpp 2010-08-02
+@@ -27,12 +27,12 @@
+ #include <gwenhywfar/debug.h>
+
+ // QT includes
+-#include <q3listview.h>
+-#include <qlineedit.h>
+-#include <qlabel.h>
+-#include <qmessagebox.h>
+-#include <qcheckbox.h>
+-#include <qpushbutton.h>
++#include <Qt3Support/q3listview.h>
++#include <QtGui/qlineedit.h>
++#include <QtGui/qlabel.h>
++#include <QtGui/qmessagebox.h>
++#include <QtGui/qcheckbox.h>
++#include <QtGui/qpushbutton.h>
+
+ // C++ includes
+ #include <string>
+Index: src/frontends/q4banking/lib/dialogs/qbpickstartdate.cpp
+--- src/frontends/q4banking/lib/dialogs/qbpickstartdate.cpp 2010-01-15
++++ src/frontends/q4banking/lib/dialogs/qbpickstartdate.cpp 2010-08-02
+@@ -21,11 +21,11 @@
+ #include <gwenhywfar/debug.h>
+
+ // QT includes
+-#include <q3datetimeedit.h>
+-#include <qradiobutton.h>
+-#include <qlabel.h>
+-#include <qpushbutton.h>
+-#include <q3buttongroup.h>
++#include <Qt3Support/q3datetimeedit.h>
++#include <QtGui/qradiobutton.h>
++#include <QtGui/qlabel.h>
++#include <QtGui/qpushbutton.h>
++#include <Qt3Support/q3buttongroup.h>
+
+
+
+Index: src/frontends/q4banking/lib/dialogs/qbpickstartdate.h
+--- src/frontends/q4banking/lib/dialogs/qbpickstartdate.h 2010-01-15
++++ src/frontends/q4banking/lib/dialogs/qbpickstartdate.h 2010-08-02
+@@ -15,7 +15,7 @@
+
+ #include <q4banking/qbpickstartdate.ui.h>
+ #include <q4banking/qbanking.h>
+-#include <qdatetime.h>
++#include <QtCore/qdatetime.h>
+
+
+ class QBanking;
+Index: src/frontends/q4banking/lib/dialogs/qbselectfromlist.h
+--- src/frontends/q4banking/lib/dialogs/qbselectfromlist.h 2010-01-15
++++ src/frontends/q4banking/lib/dialogs/qbselectfromlist.h 2010-08-02
+@@ -16,7 +16,7 @@
+ class QBanking;
+
+
+-#include <qstringlist.h>
++#include <QtCore/qstringlist.h>
+
+ #include <q4banking/qbselectfromlist.ui.h>
+ #include <q4banking/qbanking.h>
+Index: src/frontends/q4banking/lib/dialogs/qbprocesswatcher.cpp
+--- src/frontends/q4banking/lib/dialogs/qbprocesswatcher.cpp 2010-01-15
++++ src/frontends/q4banking/lib/dialogs/qbprocesswatcher.cpp 2010-08-02
+@@ -22,11 +22,11 @@
+ #include <gwenhywfar/debug.h>
+
+ // QT includes
+-#include <q3process.h>
+-#include <qapplication.h>
+-#include <qlabel.h>
+-#include <qpushbutton.h>
+-#include <qmessagebox.h>
++#include <Qt3Support/q3process.h>
++#include <QtGui/qapplication.h>
++#include <QtGui/qlabel.h>
++#include <QtGui/qpushbutton.h>
++#include <QtGui/qmessagebox.h>
+
+
+
+Index: src/frontends/q4banking/lib/widgets/qbcfgtabpage.cpp
+--- src/frontends/q4banking/lib/widgets/qbcfgtabpage.cpp 2010-01-18
++++ src/frontends/q4banking/lib/widgets/qbcfgtabpage.cpp 2010-08-02
+@@ -17,17 +17,17 @@
+
+ #include "qbcfgtabpage.h"
+ //Added by qt3to4:
+-#include <Q3VBoxLayout>
++#include <Qt3Support/Q3VBoxLayout>
+
+ #include <gwenhywfar/debug.h>
+
+
+-#include <qlayout.h>
++#include <QtGui/qlayout.h>
+ #if (QT_VERSION >= 0x040100)
+ // qt-4.1.0 errorneously forgets to add this include
+-# include <QComboBox>
++# include <QtGui/QComboBox>
+ #endif
+-#include <qcombobox.h>
++#include <QtGui/qcombobox.h>
+
+
+ QBCfgTabPage::QBCfgTabPage(QBanking *qb,
+Index: src/frontends/q4banking/lib/dialogs/qbprocesswatcher.h
+--- src/frontends/q4banking/lib/dialogs/qbprocesswatcher.h 2010-01-15
++++ src/frontends/q4banking/lib/dialogs/qbprocesswatcher.h 2010-08-02
+@@ -17,7 +17,7 @@
+ #include <q4banking/qbprocesswatcher.ui.h>
+ #include <q4banking/qbanking.h>
+
+-#include <qstring.h>
++#include <QtCore/qstring.h>
+ #include <time.h>
+
+ class Q3Process;
+Index: src/frontends/q4banking/lib/widgets/qbuserlist.cpp
+--- src/frontends/q4banking/lib/widgets/qbuserlist.cpp 2010-01-15
++++ src/frontends/q4banking/lib/widgets/qbuserlist.cpp 2010-08-02
+@@ -17,7 +17,7 @@
+
+ #include "qbuserlist.h"
+ #include <assert.h>
+-#include <qstring.h>
++#include <QtCore/qstring.h>
+
+ #include <gwenhywfar/debug.h>
+
+Index: src/frontends/q4banking/lib/widgets/qbcfgtab.cpp
+--- src/frontends/q4banking/lib/widgets/qbcfgtab.cpp 2010-01-15
++++ src/frontends/q4banking/lib/widgets/qbcfgtab.cpp 2010-08-02
+@@ -18,9 +18,9 @@
+ #include "qbcfgtab.h"
+ #include "qbcfgtabpage.h"
+
+-#include <qtabwidget.h>
+-#include <q3textbrowser.h>
+-#include <qpushbutton.h>
++#include <QtGui/qtabwidget.h>
++#include <Qt3Support/q3textbrowser.h>
++#include <QtGui/qpushbutton.h>
+
+ #include <gwenhywfar/debug.h>
+
+Index: src/frontends/q4banking/lib/widgets/qbcfgtabpage.h
+--- src/frontends/q4banking/lib/widgets/qbcfgtabpage.h 2010-08-02
++++ src/frontends/q4banking/lib/widgets/qbcfgtabpage.h 2010-08-02
+@@ -21,7 +21,7 @@
+ #include <QtGui/qwidget.h>
+ #include <QtCore/qstring.h>
+ //Added by qt3to4:
+-#include <Q3VBoxLayout>
++#include <Qt3Support/Q3VBoxLayout>
+
+
+
+Index: src/frontends/q4banking/lib/gui/qgui.h
+--- src/frontends/q4banking/lib/gui/qgui.h 2010-01-15
++++ src/frontends/q4banking/lib/gui/qgui.h 2010-08-02
+@@ -10,7 +10,7 @@
+
+ #include <q4banking/cppgui.h>
+
+-#include <Qt/qstring.h>
++#include <QtCore/qstring.h>
+ #include <string>
+
+ class QBanking;
commit 916476b33c2c0709aaf44d837a6080ad7c3a0f7b
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Aug 2 15:04:24 2010 -0700
Patch to correct the Qt4 includes.
diff --git a/patches/aqbankingOSX.patch b/patches/aqbankingOSX.patch
new file mode 100644
index 0000000..adeaa36
--- /dev/null
+++ b/patches/aqbankingOSX.patch
@@ -0,0 +1,105 @@
+Index: src/frontends/q4banking/lib/qbanking.h
+===================================================================
+--- src/frontends/q4banking/lib/qbanking.h (revision 1972)
++++ src/frontends/q4banking/lib/qbanking.h (working copy)
+@@ -35,12 +35,12 @@
+ #include <aqbanking/banking.h>
+ #include <aqbanking/accstatus.h>
+
+-#include <Qt/qobject.h>
+-#include <Qt/qdatetime.h>
+-#include <Qt/qstring.h>
+-#include <Qt/qstringlist.h>
+-#include <Qt/qwidget.h> // needed for QPointer<QWidget>
+-#include <Qt/qpointer.h>
++#include <QtCore/qobject.h>
++#include <QtCore/qdatetime.h>
++#include <QtCore/qstring.h>
++#include <QtCore/qstringlist.h>
++#include <QtGui/qwidget.h> // needed for QPointer<QWidget>
++#include <QtCore/qpointer.h>
+
+ #include <list>
+
+Index: src/frontends/q4banking/lib/dialogs/qbimporter.h
+===================================================================
+--- src/frontends/q4banking/lib/dialogs/qbimporter.h (revision 1972)
++++ src/frontends/q4banking/lib/dialogs/qbimporter.h (working copy)
+@@ -24,7 +24,7 @@
+ #include <list>
+ #include <string>
+
+-#include <Qt/qstring.h>
++#include <QtCore/qstring.h>
+
+ #include <gwenhywfar/logger.h>
+
+Index: src/frontends/q4banking/lib/widgets/qbplugindescrlist.cpp
+===================================================================
+--- src/frontends/q4banking/lib/widgets/qbplugindescrlist.cpp (revision 1972)
++++ src/frontends/q4banking/lib/widgets/qbplugindescrlist.cpp (working copy)
+@@ -17,7 +17,7 @@
+
+ #include "qbplugindescrlist.h"
+ #include <assert.h>
+-#include <Qt/qstring.h>
++#include <QtCore/qstring.h>
+
+
+
+Index: src/frontends/q4banking/lib/widgets/qbaccountlist.cpp
+===================================================================
+--- src/frontends/q4banking/lib/widgets/qbaccountlist.cpp (revision 1972)
++++ src/frontends/q4banking/lib/widgets/qbaccountlist.cpp (working copy)
+@@ -17,7 +17,7 @@
+
+ #include "qbaccountlist.h"
+ #include <assert.h>
+-#include <Qt/qstring.h>
++#include <QtCore/qstring.h>
+
+
+
+Index: src/frontends/q4banking/lib/widgets/qbcfgtabpage.h
+===================================================================
+--- src/frontends/q4banking/lib/widgets/qbcfgtabpage.h (revision 1972)
++++ src/frontends/q4banking/lib/widgets/qbcfgtabpage.h (working copy)
+@@ -18,8 +18,8 @@
+ #include <aqbanking/banking.h>
+ #include <q4banking/qbanking.h>
+
+-#include <Qt/qwidget.h>
+-#include <Qt/qstring.h>
++#include <QtGui/qwidget.h>
++#include <QtCore/qstring.h>
+ //Added by qt3to4:
+ #include <Q3VBoxLayout>
+
+Index: src/frontends/q4banking/lib/widgets/qbjoblist.cpp
+===================================================================
+--- src/frontends/q4banking/lib/widgets/qbjoblist.cpp (revision 1972)
++++ src/frontends/q4banking/lib/widgets/qbjoblist.cpp (working copy)
+@@ -17,8 +17,8 @@
+
+ #include "qbjoblist.h"
+ #include <assert.h>
+-#include <Qt/qstring.h>
+-#include <Qt/qwidget.h>
++#include <QtCore/qstring.h>
++#include <QtGui/qwidget.h>
+ #include <gwenhywfar/debug.h>
+
+
+Index: src/frontends/q4banking/lib/qbflagstaff.h
+===================================================================
+--- src/frontends/q4banking/lib/qbflagstaff.h (revision 1972)
++++ src/frontends/q4banking/lib/qbflagstaff.h (working copy)
+@@ -16,7 +16,7 @@
+ class QBFlagStaff;
+
+ #include <q4banking/qbanking.h>
+-#include <Qt/qobject.h>
++#include <QtCore/qobject.h>
+
+
+ class Q4BANKING_API QBFlagStaff: public QObject {
commit 817eb097e54096d1d3f19e58dd5261a709fde283
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 20 18:24:18 2010 -0700
Fixed incorrect GTK_DATA_PREFIX, which prevented Gtk from finding themes.
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index 6258b81..028111d 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -29,7 +29,7 @@ bundle_etc="$bundle_res"/etc
export DYLD_LIBRARY_PATH="$bundle_lib"
export XDG_CONFIG_DIRS="$bundle_etc"/xdg
export XDG_DATA_DIRS="$PREFIX"/share
-export GTK_DATA_PREFIX="$bundle_data"
+export GTK_DATA_PREFIX="$bundle_res"
export GTK_EXE_PREFIX="$bundle_res"
export GTK_PATH="$bundle_res"
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index a2dde67..cb156ee 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -29,7 +29,7 @@ bundle_etc="$bundle_res"/etc
export DYLD_LIBRARY_PATH="$bundle_lib"
export XDG_CONFIG_DIRS="$bundle_etc"/xdg
export XDG_DATA_DIRS="$PREFIX/share"
-export GTK_DATA_PREFIX="$bundle_data"
+export GTK_DATA_PREFIX="$bundle_res"
export GTK_EXE_PREFIX="$bundle_res"
export GTK_PATH="$bundle_res"
commit c8bf32fd747d3cc48f9691f4fce9eb3159736461
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jun 15 15:55:08 2010 -0700
Remove the locale setup script: This is now done inside Gnucash.
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 144bdae..a2dde67 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -38,83 +38,6 @@ export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
-# Set the locale-related variables appropriately for GnuCash.
-unset LANG LC_MESSAGES LC_MONETARY
-
-# Start by trying the Collation preference, in case it's the only setting that exists.
-APPLECOLLATION=`defaults read .GlobalPreferences AppleCollationOrder`
-if test "${APPLECOLLATION}"; then
- COLL=`ls -d /usr/share/locale/${APPLECOLLATION}*.UTF-8 2>> /dev/null`
- if test "${COLL}"; then
- # $COLL is potentially multi-line; concatenate lines by not using quotes.
- export LANG=`echo ${COLL} | awk '{print $1}' | awk -F/ '{print $5}'`
- fi
-fi
-unset APPLECOLLATION COLL
-
-# Continue by attempting to find the Locale preference.
-APPLELOCALE=`defaults read .GlobalPreferences AppleLocale`
-if test "${APPLELOCALE}"; then
- LOCALELANG=`echo "${APPLELOCALE}" | awk -F@ '{print $1".UTF-8"}'`
- if test -d "/usr/share/locale/${LOCALELANG}"; then
- export LANG="${LOCALELANG}"
- fi
-fi
-unset LOCALELANG
-
-# If there is still no locale value, then set US English as a default.
-if test -z "${LANG}"; then
- export LANG=en_US.UTF-8
-fi
-
-# The AppleLocale setting may contain a currency-related substring.
-# Attempt to act on it.
-# First strip the string to just the currency symbol and the language symbol
-APPLECURRENCY=`echo "${APPLELOCALE}" | awk -F= '{print $2}'`
-APPLELANG=`echo "${APPLELOCALE}" | awk -F_ '{print $1}'`
-if test "${APPLECURRENCY}"; then
- # The user has set a currency different from that of their locale.
- # Search for a locale that uses that currency, and set LC_MONETARY accordingly.
-
- # First try to find an LC_MONETARY file that combines the language with the currency.
- FILES=`find /usr/share/locale/${APPLELANG}*UTF-8 -name LC_MONETARY -exec grep -H $APPLECURRENCY {} \;`
- if test -z "$FILES"; then
- # Otherwise try to find any LC_MONETARY file that uses that currency.
- FILES=`find /usr/share/locale/*UTF-8 -name LC_MONETARY -exec grep -H $APPLECURRENCY {} \;`
- fi
-
- if test "$FILES"; then
- # We found a locale that matches; set LC_MONETARY.
- export LC_MONETARY=`echo ${FILES} | awk -F: '{print $1}' | awk -F/ '{print $5}'`
- fi
-fi
-unset APPLECURRENCY APPLELANG APPLELOCALE FILES
-
-# Has a language ordering been set?
-# If so, set LC_MESSAGES accordingly; otherwise skip it.
-APPLELANGUAGES=`defaults read .GlobalPreferences AppleLanguages | awk 'length > 2' | awk -F, '{print $1}' | sed s/\ //g | sed s/-/_/ | sed s/\"//g`
-if test "$APPLELANGUAGES"; then
- # A language ordering exists.
- # Test, item per item, to see whether there is an corresponding locale.
- for L in $APPLELANGUAGES
- do
- POS=`echo ${L} | awk '{print index(ENVIRON["LANG"], $0)}'`
- if test $POS -eq 1; then
- # The language symbol is a subset of the $LANG variable. We're done!
- break
- fi
- # NOTE: the following may fail for the alternate Chinese localizations.
- LC=`ls -d /usr/share/locale/${L}*.UTF-8 2>> /dev/null`
- # $LC is potentially multi-line; concatenate lines by not using quotes.
- if test $LC; then
- # There is a UTF-8 locale matching this language.
- export LC_MESSAGES=`echo ${LC} | awk '{print $1}' | awk -F/ '{print $5}'`
- break
- fi
- done
-fi
-unset APPLELANGUAGES POS LC L
-
if test -f "$bundle_lib/charset.alias"; then
export CHARSETALIASDIR="$bundle_lib"
fi
commit 4600f80949aa2dc3e67d674190bf4209c6755abd
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 13 17:17:47 2010 -0700
New, better patch (this one should work), correct strip argument.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 2d92cd5..f004ba3 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -90,7 +90,7 @@
makeargs="qt4-all" >
<branch module="aqbanking-4.2.4.tar.gz" version="4.2.4"
repo="github_gnucash" >
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/aqbanking_accountgen.patch"/>
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/aqbanking_accountgen.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libofx"/>
diff --git a/patches/aqbanking_accountgen.patch b/patches/aqbanking_accountgen.patch
index 2d7de40..ac99cbc 100644
--- a/patches/aqbanking_accountgen.patch
+++ b/patches/aqbanking_accountgen.patch
@@ -1,14 +1,91 @@
---- a/src/frontends/qbanking/lib/dialogs/qbcfgtabpageaccountgen.ui 2010-06-13 15:20:48.000000000 -0700
-+++ b/src/frontends/qbanking/lib/dialogs/qbcfgtabpageaccountgen.ui 2010-06-13 15:22:53.000000000 -0700
-@@ -187,6 +187,7 @@
+--- a/src/frontends/qbanking/lib/dialogs/qbcfgtabpageaccountgen.ui 2010-06-13 16:40:41.000000000 -0700
++++ b/src/frontends/qbanking/lib/dialogs/qbcfgtabpageaccountgen.ui 2010-06-13 16:50:05.000000000 -0700
+@@ -187,7 +187,11 @@
<property name="title">
<string>Bank Settings</string>
</property>
+- <widget class="QLineEdit">
+ <grid>
- <widget class="QLineEdit">
++ <property name="name">
++ <cstring>unnamed</cstring>
++ </property>
++ <widget class="QLineEdit" row="2" column="1">
<property name="name">
<cstring>bankNameEdit</cstring>
-@@ -319,6 +320,7 @@
+ </property>
+@@ -200,7 +204,7 @@
+ </rect>
+ </property>
+ </widget>
+- <widget class="QLineEdit">
++ <widget class="QLineEdit" row="1" column="1">
+ <property name="name">
+ <cstring>bankIdEdit</cstring>
+ </property>
+@@ -213,7 +217,7 @@
+ </rect>
+ </property>
+ </widget>
+- <widget class="QComboBox">
++ <widget class="QComboBox" row="0" column="1">
+ <property name="name">
+ <cstring>countryCombo</cstring>
+ </property>
+@@ -226,7 +230,7 @@
+ </rect>
+ </property>
+ </widget>
+- <widget class="QLabel">
++ <widget class="QLabel" row="3" column="0">
+ <property name="name">
+ <cstring>textLabel1_4_3</cstring>
+ </property>
+@@ -242,7 +246,7 @@
+ <string>BIC</string>
+ </property>
+ </widget>
+- <widget class="QLabel">
++ <widget class="QLabel" row="2" column="0">
+ <property name="name">
+ <cstring>textLabel1_4_2</cstring>
+ </property>
+@@ -258,7 +262,7 @@
+ <string>Name</string>
+ </property>
+ </widget>
+- <widget class="QLineEdit">
++ <widget class="QLineEdit" row="3" column="1">
+ <property name="name">
+ <cstring>bicEdit</cstring>
+ </property>
+@@ -271,7 +275,7 @@
+ </rect>
+ </property>
+ </widget>
+- <widget class="QLabel">
++ <widget class="QLabel" row="1" column="0">
+ <property name="name">
+ <cstring>textLabel1_4</cstring>
+ </property>
+@@ -287,7 +291,7 @@
+ <string>Code</string>
+ </property>
+ </widget>
+- <widget class="QLabel">
++ <widget class="QLabel" row="0" column="0">
+ <property name="name">
+ <cstring>textLabel2_2</cstring>
+ </property>
+@@ -303,7 +307,7 @@
+ <string>Country</string>
+ </property>
+ </widget>
+- <widget class="QPushButton">
++ <widget class="QPushButton" row="1" column="2">
+ <property name="name">
+ <cstring>bankIdButton</cstring>
+ </property>
+@@ -319,6 +323,7 @@
<string>...</string>
</property>
</widget>
commit a41f9c18a043378a6cfec0d67cacc232072c6677
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 13 15:34:01 2010 -0700
Patch Edit Account dialog account panel layout error.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 3bd5a90..2d92cd5 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -90,7 +90,8 @@
makeargs="qt4-all" >
<branch module="aqbanking-4.2.4.tar.gz" version="4.2.4"
repo="github_gnucash" >
- </branch>
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/aqbanking_accountgen.patch"/>
+ </branch>
<dependencies>
<dep package="libofx"/>
<dep package="gwenhywfar"/>
diff --git a/patches/aqbanking_accountgen.patch b/patches/aqbanking_accountgen.patch
new file mode 100644
index 0000000..2d7de40
--- /dev/null
+++ b/patches/aqbanking_accountgen.patch
@@ -0,0 +1,18 @@
+--- a/src/frontends/qbanking/lib/dialogs/qbcfgtabpageaccountgen.ui 2010-06-13 15:20:48.000000000 -0700
++++ b/src/frontends/qbanking/lib/dialogs/qbcfgtabpageaccountgen.ui 2010-06-13 15:22:53.000000000 -0700
+@@ -187,6 +187,7 @@
+ <property name="title">
+ <string>Bank Settings</string>
+ </property>
++ <grid>
+ <widget class="QLineEdit">
+ <property name="name">
+ <cstring>bankNameEdit</cstring>
+@@ -319,6 +320,7 @@
+ <string>...</string>
+ </property>
+ </widget>
++ </grid>
+ </widget>
+ <spacer>
+ <property name="name">
commit df8b0260f4f0ffdc9216beb572f2cdc2529fab8d
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 13 15:32:09 2010 -0700
Fix (harmless) typo
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 679fbfc..3bd5a90 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -122,7 +122,7 @@ autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %
<autotools id="OpenSP" autogen-template="%(srcdir)s/autoinit.sh && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs="--disable-static --enable-shared --disable-doc-build --disable-nls">
<branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
- version='1.5.2'/>>
+ version='1.5.2'/>
</autotools>
<autotools id="libofx" autogen-sh='configure'>
commit a3db82ebfbb323053806178ee9c076300b7f3c46
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 13 15:31:44 2010 -0700
Update non-Qt version of aqbanking to match the Qt version.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 34268b2..679fbfc 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -75,7 +75,7 @@
<autotools id="aqbanking" autogen-sh="configure"
autogenargs='--enable-ofx=yes --disable-qt3 --disable-kde --disable-chipcard-client --disable-python --with-frontends="cbanking g2banking"' >
- <branch module="aqbanking-4.2.0.tar.gz" version="4.2.0"
+ <branch module="aqbanking-4.2.4.tar.gz" version="4.2.4"
repo="github_gnucash"/>
<dependencies>
<dep package="libofx"/>
commit 74203d62beb6c0b13914b508a83d36302b5734c4
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 13 15:31:11 2010 -0700
Fix merge conflict.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 9db43dd..34268b2 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -27,14 +27,11 @@
href="http://github.com/downloads/jralls/gnucash-on-osx/"/>
<repository type="tarball" name="gmplib.org"
href="ftp://ftp.gmplib.org/pub/"/>
-<<<<<<< HEAD:modulesets/gnucash.modules
<repository type="tarball" name="cmake"
href="http://www.cmake.org/files/"/>
-
-=======
<repository type="svn" name="aquamaniac"
href="http://devel.aqbanking.de/svn/"/>
->>>>>>> Add modules for building SVN versions of gwenhywfar and aqbanking.:modulesets/gnucash.modules
+
<include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/>
commit bf580e15d1506dc164c6a51d66b9db8d7f37e571
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 12 14:08:46 2010 -0700
Add modules for building SVN versions of gwenhywfar and aqbanking.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index d008b08..9db43dd 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -27,9 +27,14 @@
href="http://github.com/downloads/jralls/gnucash-on-osx/"/>
<repository type="tarball" name="gmplib.org"
href="ftp://ftp.gmplib.org/pub/"/>
+<<<<<<< HEAD:modulesets/gnucash.modules
<repository type="tarball" name="cmake"
href="http://www.cmake.org/files/"/>
+=======
+ <repository type="svn" name="aquamaniac"
+ href="http://devel.aqbanking.de/svn/"/>
+>>>>>>> Add modules for building SVN versions of gwenhywfar and aqbanking.:modulesets/gnucash.modules
<include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/>
@@ -58,6 +63,14 @@
</dependencies>
</autotools>
+ <autotools id="gwenhywfar-svn" autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
+ <branch module="gwenhywfar" repo="aquamaniac"/>
+ <dependencies>
+ <dep package="libgcrypt"/>
+ <dep package="gnutls"/>
+ </dependencies>
+ </autotools>
+
<autotools id="ktoblzcheck" autogen-sh="configure">
<branch module="ktoblzcheck/ktoblzcheck-1.24.tar.gz" version="1.24"
repo="sourceforge"/>
@@ -89,6 +102,20 @@
</dependencies>
</autotools>
+ <autotools id="aqbanking-qt-svn"
+ autogenargs='--enable-ofx=yes --disable-kde --disable-chipcard-client --disable-python --with-frontends="cbanking g2banking qbanking" qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers"'
+autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ makeargs="qt4-all" >
+ <branch module="aqbanking" repo="aquamaniac" >
+ </branch>
+ <dependencies>
+ <dep package="libofx"/>
+ <dep package="gwenhywfar-svn"/>
+ <dep package="gmp"/>
+ <dep package="ktoblzcheck"/>
+ </dependencies>
+ </autotools>
+
<!-- Note for cross-compilation: libtool, for reasons known only to
itself, ignores the CFLAGS and links libosp.5.0.0.la with the
native architecture. When jhbuild stops, start a shell and go
commit a822cc4312a39ccbb2b840b892870b93dee83ed6
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 12 14:06:24 2010 -0700
Update versions to 2.3.14
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 8516dae..5c6d850 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.3.12 © 2010 Contributors</string>
+ <string>Gnucash version 2.3.14 © 2010 Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.3.12 © 2010 Contributors</string>
+ <string>2.3.14 © 2010 Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.3.12</string>
+ <string>2.3.14</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.3.12</string>
+ <string>2.3.14</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 9ae6b9f..d008b08 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -222,7 +222,7 @@
<autotools id="gnucash-unstable"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch tag="2.3.12" module="gnucash" repo="svn.gnucash.org"/>
+ <branch tag="2.3.14" module="gnucash" repo="svn.gnucash.org"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit 7dbef12a9d0dd141c1de286866da5d38875314d0
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 12 14:06:00 2010 -0700
Install all translations of the manual and the translations for GtkOSXApplication.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 60534ef..60e90ec 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -225,6 +225,9 @@
${project}/gnucash.icns
</data>
+ <data dest="${bundle}/Contents/Resources">
+ ${prefix}/share/strings
+ </data>
<data dest='${bundle}/Contents/Resources/var/lib/dbus/machine-id'>
${prefix}/var/lib/dbus/machine-id
@@ -242,15 +245,35 @@
${project}/Sources
</data>
- <data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Help/">
+ <data dest="${bundle}/Contents/Resources/en.lproj/GnuCash Help/">
${prefix}/share/gnome/help/gnucash/C/gnucash-help
</data>
- <data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Guide/">
+ <data dest="${bundle}/Contents/Resources/en.lproj/GnuCash Guide/">
${prefix}/share/gnome/help/gnucash/C/gnucash-guide/
</data>
- <translations name="gnucash">
+ <data dest="${bundle}/Contents/Resources/de.lproj/GnuCash Help/">
+ ${prefix}/share/gnome/help/gnucash/de_DE/gnucash-help
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/de.lproj/GnuCash Guide/">
+ ${prefix}/share/gnome/help/gnucash/de_DE/gnucash-guide/
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Help/">
+ ${prefix}/share/gnome/help/gnucash/it_IT/gnucash-help
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Guide/">
+ ${prefix}/share/gnome/help/gnucash/it_IT/gnucash-guide/
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/ja.lproj/GnuCash Guide/">
+ ${prefix}/share/gnome/help/gnucash/ja_JP/gnucash-guide/
+ </data>
+
+ <translations name="gnucash">
${prefix}/share/locale
</translations>
commit 9ba14074c9e1ccd94105e5a6cf36bba3b8f3fd79
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Jun 12 14:00:36 2010 -0700
Fix quoting around EXTRA_ARGS to correctly define the variable.
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index 77b88ad..6258b81 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -38,7 +38,7 @@ export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
-# Set the locale-related variables appropriaty for GnuCash.
+# Set the locale-related variables appropriately for GnuCash.
unset LANG LC_MESSAGES LC_MONETARY
# Start by trying the Collation preference, in case it's the only setting that exists.
@@ -120,7 +120,7 @@ if test -f "$bundle_lib/charset.alias"; then
fi
# Extra arguments can be added in environment.sh.
-EXTRA_ARGS=--config-path "$bundle_etc/gnucash" --share-path "$bundle_data/gnucash" --debug
+EXTRA_ARGS="--config-path \"$bundle_etc/gnucash\" --share-path \"$bundle_data/gnucash\" --debug"
if test -f "$bundle_res/environment.sh"; then
source "$bundle_res/environment.sh"
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index e4d164e..144bdae 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -38,7 +38,7 @@ export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
-# Set the locale-related variables appropriaty for GnuCash.
+# Set the locale-related variables appropriately for GnuCash.
unset LANG LC_MESSAGES LC_MONETARY
# Start by trying the Collation preference, in case it's the only setting that exists.
@@ -120,7 +120,7 @@ if test -f "$bundle_lib/charset.alias"; then
fi
# Extra arguments can be added in environment.sh.
-EXTRA_ARGS=--config-path "$bundle_etc/gnucash" --share-path "$bundle_data/gnucash" --debug
+EXTRA_ARGS="--config-path \"$bundle_etc/gnucash\" --share-path \"$bundle_data/gnucash\" --debug"
if test -f "$bundle_res/environment.sh"; then
source "$bundle_res/environment.sh"
commit c781ca0b1c46eb7f1a13a1b22fe20d8487354069
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Apr 28 21:43:50 2010 -0600
Added cmake module so that users needn't worry about installing it.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 239e36a..939bbea 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -26,8 +26,12 @@ setup_sdk("10.4", "10.4u")
moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
#If you wish to enable the mysql backend, uncomment the lines below.
-#This only works for gnucash-unstable and gnucash-svn at present and
-#requires cmake to be installed on your machine to build the mysql libraries.
+#This only works for gnucash-unstable and gnucash-svn at present.
+#MySQL requires CMake 2.6.0 or later to build, so the libmysql module
+#has a dependency on cmake which will be built by default. If you
+#already have CMake installed on the path, add "skip.append("cmake")
+#somewhere in this file.
+
#_gc_module=modules[-1]
#modules[-1]="mysql"
#modules.append(_gc_module)
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 3875ddb..9ae6b9f 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -27,6 +27,8 @@
href="http://github.com/downloads/jralls/gnucash-on-osx/"/>
<repository type="tarball" name="gmplib.org"
href="ftp://ftp.gmplib.org/pub/"/>
+ <repository type="tarball" name="cmake"
+ href="http://www.cmake.org/files/"/>
@@ -140,11 +142,20 @@
</dependencies>
</autotools>
+ <autotools id="cmake"
+ autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --libdir=%(libdir)s %(autogenargs)s">
+ <branch module="v2.8/cmake-2.8.1.tar.gz"
+ repo="cmake" version="2.8.1"/>
+ </autotools>
+
<cmake id="mysql">
<branch repo="csclub" module="Connector-C/mysql-connector-c-6.0.2.tar.gz"
version="6.0.2" >
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/libmysql.patch"/>
</branch>
+ <dependencies>
+ <dep package="cmake"/>
+ </dependencies>
</cmake>
<autotools id="libdbi" autogen-template="%(srcdir)s/autogen.sh && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
commit 771f0dbe3d56b6f463f11b3392849d5e5a24207f
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Apr 28 21:40:12 2010 -0600
Fixed typo in url for libmysql.patch
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a708d74..3875ddb 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -143,7 +143,7 @@
<cmake id="mysql">
<branch repo="csclub" module="Connector-C/mysql-connector-c-6.0.2.tar.gz"
version="6.0.2" >
- <patch file="http://github.com/jralls/gnucash-on-osx/patches/libmysql.patch"/>
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/libmysql.patch"/>
</branch>
</cmake>
commit a88b3afcdc9e57a308d313b99c7e5bd7dd77bca4
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Apr 28 21:39:27 2010 -0600
Change gc_module to _gc_module to stop jhbuild whining about an unknown parameter.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 4ebdc26..239e36a 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -28,9 +28,9 @@ moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnuca
#If you wish to enable the mysql backend, uncomment the lines below.
#This only works for gnucash-unstable and gnucash-svn at present and
#requires cmake to be installed on your machine to build the mysql libraries.
-#gc_module=modules[-1]
+#_gc_module=modules[-1]
#modules[-1]="mysql"
-#modules.append(gc_module)
+#modules.append(_gc_module)
#module_extra_env["mysql"] = { "CMAKE_INSTALL_PREFIX": prefix }
#append_autogenargs("libdbi-drivers", "--with-mysql --with-mysql-incdir=" + prefix + "/include --with-mysql-libdir=" + prefix + "/lib")
commit 0e815acb4cebec00b0ea02a4d4f9fa922201517e
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Apr 28 18:18:24 2010 -0600
Add optional build of MySql and MySql support in libdbi-drivers.
Note that MySql requires CMake.
This is made optional by manipulating the stored modules list in .jhbuildrc.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 7c08993..4ebdc26 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -25,6 +25,14 @@ setup_sdk("10.4", "10.4u")
moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
+#If you wish to enable the mysql backend, uncomment the lines below.
+#This only works for gnucash-unstable and gnucash-svn at present and
+#requires cmake to be installed on your machine to build the mysql libraries.
+#gc_module=modules[-1]
+#modules[-1]="mysql"
+#modules.append(gc_module)
+#module_extra_env["mysql"] = { "CMAKE_INSTALL_PREFIX": prefix }
+#append_autogenargs("libdbi-drivers", "--with-mysql --with-mysql-incdir=" + prefix + "/include --with-mysql-libdir=" + prefix + "/lib")
skip.remove("gmp")
skip.remove("guile")
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index e6d4cf2..a708d74 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -17,6 +17,8 @@
password=""/> -->
<repository type="tarball" name="csail"
href="http://groups.csail.mit.edu/mac/ftpdir/"/>
+ <repository type="tarball" name="csclub"
+ href="http://mirror.csclub.uwaterloo.ca/mysql/Downloads/"/>
<repository type="tarball" name="gnucash.org"
href="http://www.gnucash.org/pub/gnucash/sources/"/>
<repository type="svn" name="svn.gnucash.org"
@@ -138,6 +140,13 @@
</dependencies>
</autotools>
+ <cmake id="mysql">
+ <branch repo="csclub" module="Connector-C/mysql-connector-c-6.0.2.tar.gz"
+ version="6.0.2" >
+ <patch file="http://github.com/jralls/gnucash-on-osx/patches/libmysql.patch"/>
+ </branch>
+ </cmake>
+
<autotools id="libdbi" autogen-template="%(srcdir)s/autogen.sh && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs="--disable-docs">
<branch repo="sourceforge" module="libdbi/libdbi-0.8.3.tar.gz"
diff --git a/patches/libmysql.patch b/patches/libmysql.patch
new file mode 100644
index 0000000..2fa969a
--- /dev/null
+++ b/patches/libmysql.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt-org 2010-04-23 23:46:39.000000000 +0200
++++ CMakeLists.txt 2010-04-23 23:47:06.000000000 +0200
+@@ -318,7 +318,7 @@
+ ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+
+ INSTALL(DIRECTORY "include/"
+- DESTINATION "include"
++ DESTINATION "include/mysql"
+ FILES_MATCHING PATTERN "*.h")
+
+ # ----------------------------------------------------------------------
commit 031fc4cf3616051176a2f0a3d94778cdf075462a
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Apr 28 18:15:19 2010 -0600
Add gconf to dependencies for GConf (Thanks to Geert Janssens)
diff --git a/modulesets/goffice.modules b/modulesets/goffice.modules
index 6e70217..c24c3cd 100644
--- a/modulesets/goffice.modules
+++ b/modulesets/goffice.modules
@@ -22,6 +22,7 @@
<dep package="libxml2"/>
<dep package="libglade"/>
<dep package="libart_lgpl"/>
+ <dep package="gconf"/>
</dependencies>
</autotools>
commit 23a3778aba036f908451e23cb6236fe344d029fa
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Apr 28 18:14:36 2010 -0600
Fix typo in setup_sdk() for Leopard (Thanks to Geert Janssens)
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 636eb25..7c08993 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -21,7 +21,7 @@ modules = ["gettext-fw", "meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash
#building unstable or svn, comment out the first one and uncomment the
#second. PPC users should change i386 to ppc when using SDK 10.5.
setup_sdk("10.4", "10.4u")
-#setup_sdk("10.5", "10.5",[i386])
+#setup_sdk("10.5", "10.5",["i386"])
moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
commit f82c7e10c145c830992f9ad3962d828cbf4e3bf6
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 25 07:11:19 2010 -0700
Add gconf as a dependency of goffice. Thanks to Geert Janssens for catching this.
diff --git a/modulesets/goffice.modules b/modulesets/goffice.modules
index 658ae21..6e70217 100644
--- a/modulesets/goffice.modules
+++ b/modulesets/goffice.modules
@@ -35,6 +35,7 @@
<dep package="libxml2"/>
<dep package="libglade"/>
<dep package="libart_lgpl"/>
+ <dep package="gconf"/>
</dependencies>
</autotools>
commit 74deebed70e7b29a69f6379d001d4f74d80b9814
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 23 11:15:57 2010 -0700
Update unstable to 2.3.12. Change the unstable build source from tarball to svn so that we don't have to wait for the release maintainer to upload the source tarballs to sourceforge before building the release.
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 238dc93..8516dae 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.3.11 © 2010 Contributors</string>
+ <string>Gnucash version 2.3.12 © 2010 Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.3.11 © 2010 Contributors</string>
+ <string>2.3.12 © 2010 Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.3.11</string>
+ <string>2.3.12</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.3.11</string>
+ <string>2.3.12</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 085d481..e6d4cf2 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -200,10 +200,10 @@
</autotools>
<autotools id="gnucash-unstable"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash/gnucash-2.3.11.tar.gz" version="2.3.11"
- repo="sourceforge"/>
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/dot_gnucash.patch" strip="0"/>
+ <branch tag="2.3.12" module="gnucash" repo="svn.gnucash.org"/>
+
<dependencies>
<dep package="meta-gtk-osx-core"/>
<dep package="meta-goffice"/>
commit 0e74d91d28c7dd7192137a5f3e3d8fafc3bfc876
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 23 11:14:07 2010 -0700
Add printbackends plugins to bundles.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 389ce43..60534ef 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -60,6 +60,11 @@
${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/engines/*.so
</binary>
+<!-- And the print backends -->
+ <binary>
+ ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/printbackends/*.so
+ </binary>
+
<binary>
${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-fc.so
</binary>
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 74f56f8..c024f70 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -59,6 +59,10 @@
<binary>
${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/engines/*.so
</binary>
+<!-- And the print backends -->
+ <binary>
+ ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/printbackends/*.so
+ </binary>
<binary>
${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-fc.so
commit 3084f643b28f1126bae6e6e8d2fae1e32bb4d70e
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 23 11:13:38 2010 -0700
Move document source directories to their new build location on the maintainer's system.
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index bafc59c..74f56f8 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -239,11 +239,11 @@
</data>
<!-- These can be pointed to ${prefix} like in unstable for the 2.4 release -->
<data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Help/">
- ${env:HOME}/gtk/source/gnucash-docs-2.2.0/help/C/gnucash-help/
+ /usr/local/src/gnucash-stable/gnucash-docs-2.2.0/help/C/gnucash-help/
</data>
<data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Guide/">
- ${env:HOME}/gtk/source/gnucash-docs-2.2.0/guide/C/gnucash-guide/
+ /usr/local/src/gnucash-stable/gnucash-docs-2.2.0/guide/C/gnucash-guide/
</data>
<translations name="gnucash">
commit 7d200311670d0d41f8d4b657712d242524a7f9fa
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 10 11:48:29 2010 -0700
Removed libart_lgpl and libgsf
They're fairly widely used, and so are now provided in gtk-osx-build/modulesets-stable/gtk-osx-random.modules
diff --git a/modulesets/goffice.modules b/modulesets/goffice.modules
index 4f7b4e8..658ae21 100644
--- a/modulesets/goffice.modules
+++ b/modulesets/goffice.modules
@@ -38,24 +38,6 @@
</dependencies>
</autotools>
- <autotools id="libgsf" autogenargs="--without-python">
- <branch module="libgsf/1.14/libgsf-1.14.16.tar.bz2" version="1.14.16"
- hash="sha256:11fd8fca1bdbcfa426276a124ad083cca9632f03cf766523bcdfb2fca0b08908"/>
- <dependencies>
- <dep package="glib"/>
- <dep package="gnome-vfs"/>
- <dep package="libbonobo"/>
- </dependencies>
- </autotools>
-
- <autotools id="libart_lgpl">
- <branch module="libart_lgpl/2.3/libart_lgpl-2.3.20.tar.bz2"
- version="2.3.20" md5sum="d0ce67f2ebcef1e51a83136c69242a73"/>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="meta-gtk-osx-core"/>
- </after>
- </autotools>
commit 08d4646ab075bc0ef67c43ac745767b1bacb9571
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 9 12:16:13 2010 -0700
Remove guile from the skipped modules so that building with guile-1.8 will succeed.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index e8547f6..636eb25 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -27,6 +27,7 @@ moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnuca
skip.remove("gmp")
+skip.remove("guile")
append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
append_autogenargs("libgnomeui", "--disable-static --enable-shared --disable-scrollkeeper --disable-xlib --without-x")
append_autogenargs("scrollkeeper", "--with-xml-catalog=" + os.path.join(prefix, "etc/xml/catalog"))
commit 59e76b88f99437f6133ef65bef997b192c2fca74
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 9 12:15:21 2010 -0700
Force i386 build on 10.5 so as not to trip up naive Snow Leopard users with a 64-bit build.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 66ce315..e8547f6 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -19,9 +19,9 @@ modules = ["gettext-fw", "meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash
#Setup the build for Tiger. If you don't care about Tiger or are
#building unstable or svn, comment out the first one and uncomment the
-#second.
+#second. PPC users should change i386 to ppc when using SDK 10.5.
setup_sdk("10.4", "10.4u")
-#setup_sdk("10.5", "10.5")
+#setup_sdk("10.5", "10.5",[i386])
moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
commit 88ca1811aada8a04ab5f6964835582082a9f576f
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Apr 6 15:21:12 2010 -0700
Change note at the end to say "prefix directory" instead of "installation directory"; more consistent with discussion at the beginning.
diff --git a/README.markdown b/README.markdown
index 30fb5dc..cd2cca4 100644
--- a/README.markdown
+++ b/README.markdown
@@ -61,7 +61,7 @@ Once all of the preliminaries are complete, run:
$> jhbuild build
You also need to
- $> mkdir $PREFIX/tmp
+ $> mkdir $PREFIX/tmp
##Running from the commandline##
@@ -94,5 +94,5 @@ the Dock) to click on when you run GnuCash. Here's how to do this:
* exit the shell
And your bundle should be ready to go.
-Try <tt>GnuCash.app/Contents/MacOSX/GnuCash</tt> from the command-line so that you can see any error messages. If that works, try <tt>open GnuCash.app</tt>. If that works, then you can move GnuCash.app to your Applications folder and it's ready to use. <em>Don't move or remove the installation directory (~/gtk/inst by default): Both dbus and GnuCash have links pointing into it which can't at present be changed.</em>
+Try <tt>GnuCash.app/Contents/MacOSX/GnuCash</tt> from the command-line so that you can see any error messages. If that works, try <tt>open GnuCash.app</tt>. If that works, then you can move GnuCash.app to your Applications folder and it's ready to use. <em>Don't move or remove the prefix directory: Both dbus and GnuCash have links pointing into it which can't at present be changed.</em>
commit 26178d86e2fb2990e5d6632728bf68ebaf7de832
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Apr 6 15:17:54 2010 -0700
Fix typo.
diff --git a/README.markdown b/README.markdown
index f148632..30fb5dc 100644
--- a/README.markdown
+++ b/README.markdown
@@ -53,7 +53,7 @@ The AQbanking library requires [QT](http://qt.nokia.com/downloads/mac-os-cpp) fo
to your .jhbuildrc-custom and add "aqbanking" to your modules list just before gnucash.
Edit gnucash-on-osx/gnucash-bundler/gnucash.bundle and comment out the 4
-Qt framework elements. (You comment out XML by wrapping the elements with <!-- and --$gt;.)
+Qt framework elements. (You comment out XML by wrapping the elements with <!-- and -->.)
##Building##
commit c0a6be642d0dcd32881dea5f3802f4d36cd97ea4
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Apr 6 15:15:34 2010 -0700
Update the instructions.
diff --git a/README.markdown b/README.markdown
index 1e38b93..f148632 100644
--- a/README.markdown
+++ b/README.markdown
@@ -10,10 +10,13 @@ binaries.
##Binaries available for download##
-Precompiled app bundles are available from
-http://gnucash.sourceforge.net, and users who are simply interested in
-running Gnucash on their Macs should obtain the latest stable release
-from there.
+Precompiled app bundles are available from [Gnucash at
+Sourceforge](http://gnucash.sourceforge.net), and users who are simply
+interested in running Gnucash on their Macs should obtain the latest
+stable release from there.
+
+More up-to-date and frequently maintained instruction can be found in
+the [Gnucash Wiki](http://wiki.gnucash.org/wiki/MacOSX/Quartz).
##Preliminaries##
Tiger or newer is <em>required</em> for gtk-osx.
@@ -21,24 +24,23 @@ Tiger or newer is <em>required</em> for gtk-osx.
You need Python 2.5 to run jhbuild. This is already part of Leopard
(OSX 10.5), but Tiger (10.4) provided Python 2.3, so the gtk-osx
maintainer has included logic to make a new python for Tiger users.
-You will also need Git (http://metastatic.org/source/git-osx.html) and Tiger users will need Subversion (http://www.open.collab.net/downloads/community/)
+You will also need [Git](http://metastatic.org/source/git-osx.html)
+and Tiger users will need
+[Subversion](http://www.open.collab.net/downloads/community/)
If you haven't already done so, retrieve this package:
git clone git://github.com/jralls/gnucash-on-osx.git
Copy the .jhbuildrc-custom into your home directory.
-Note that by default, jhbuild will put everything into your home
-directory. I prefer to build and install into /usr/local, so you'll
-find commented out settings to do it that way at the top of
-.jhbuildrc-custom. You can uncomment these and change them to whatever
-you like -- or leave them as they are.
+There are two "prefix" lines at the top of .jhbuildrc-custom, one for stable and one for unstable. You can use these or set it to anywhere else you like. It's a good idea if your going to build both stable and unstable to keep them in separate directories, as they have different dependencies.
-Go to http://sourceforge.net/apps/trac/gtk-osx/wiki//Build and follow
+Go to [Gtk-OSX's Build instructions](http://sourceforge.net/apps/trac/gtk-osx/wiki/Build) and follow
the instructions. <b><em>Don't run jhbuild build yet!</em></b>
Tiger users will need to retrieve and install
-http://downloads.sourceforge.net/cups/cups-1.2.12.dmg
+[CUPS 1.2.12](http://downloads.sourceforge.net/cups/cups-1.2.12.dmg)
+
##Alternate Versions##
@@ -46,18 +48,12 @@ There are modules provided for building the latest stable release (gnucash), the
##AQBanking and Qt##
-With an additional dependency, you can build in the setup wizard for
-AQBanking. This depends on Nokia's Qt library (the same one that KDE
-uses). First, you must download and install the latest MacOSX Qt4
-package from https://qt.nokia.com/downloads/downloads#lgpl
-
-Edit gnucash-on-osx/modulesets/gnucash-modules so that the dependency
-for aqbanking in the gnucash module that you want to build is
-aqbanking-qt. There's a commented out dependency; just uncomment it
-and comment out the plain aqbanking one.
+The AQbanking library requires [QT](http://qt.nokia.com/downloads/mac-os-cpp) for its online banking setup applet. If you don't want to use online banking, you can add a line
+ skip.add("aqbanking-qt")
+to your .jhbuildrc-custom and add "aqbanking" to your modules list just before gnucash.
-Edit gnucash-on-osx/gnucash-bundler/gnucash.bundle and uncomment the 4
-Qt framework elements.
+Edit gnucash-on-osx/gnucash-bundler/gnucash.bundle and comment out the 4
+Qt framework elements. (You comment out XML by wrapping the elements with <!-- and --$gt;.)
##Building##
commit eac13dcf6dc58c43ec6e737c055adb7c130f9a42
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Apr 6 15:15:21 2010 -0700
Make the prefix directories more reasonable.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 4e4e7b9..66ce315 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -8,8 +8,8 @@
#Select one of these, or use a different one: Do keep the directories
#separate for stable and unstable as they have different
#dependencies. You can use 2.3.x for svn builds.
-prefix = os.path.join(os.environ["HOME"], "Library/Gnucash-2.2.9")
-#prefix = os.path.join(os.environ["HOME"], "/Library/Gnucash-2.3.x")
+prefix = os.path.join(os.environ["HOME"], "gnucash-stable")
+#prefix = os.path.join(os.environ["HOME"], "gnucash-unstable")
#Select which modules to build. The only difference is which gnucash
#module (and all of the dependencies, see above) get built:
commit e46f2ad951ea4f3beed428f8a4e7487ea9c1b3ae
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Mar 18 12:10:36 2010 -0700
Fix a missing quote.
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 0032488..e4d164e 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -189,7 +189,7 @@ if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
done
fi
- eval `$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
+ eval `"$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
fi
GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
commit dec4f9c760020ab6fb0ea2b23730821b7c2bcba4
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Mar 18 12:10:16 2010 -0700
Upgrade gnucash-unstable to 2.3.11
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 6290ca3..238dc93 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.3.10 © 2010 Contributors</string>
+ <string>Gnucash version 2.3.11 © 2010 Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.3.10 © 2010 Contributors</string>
+ <string>2.3.11 © 2010 Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.3.10</string>
+ <string>2.3.11</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.3.10</string>
+ <string>2.3.11</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 4a24e8c..085d481 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -201,7 +201,7 @@
<autotools id="gnucash-unstable"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash/gnucash-2.3.10.tar.gz" version="2.3.10"
+ <branch module="gnucash/gnucash-2.3.11.tar.gz" version="2.3.11"
repo="sourceforge"/>
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/dot_gnucash.patch" strip="0"/>
<dependencies>
commit 9b0d274a02d9993624334107b922faa10fdeeb32
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Mar 12 13:05:00 2010 -0800
Update aqbanking to 4.2.4 (fixes a make qt4port-all problem, among other things).
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 7f4d2fd..4a24e8c 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -74,7 +74,7 @@
<autotools id="aqbanking-qt" autogen-sh="configure"
autogenargs='--enable-ofx=yes --disable-kde --disable-chipcard-client --disable-python --with-frontends="cbanking g2banking qbanking"'
makeargs="qt4-all" >
- <branch module="aqbanking-4.2.0.tar.gz" version="4.2.0"
+ <branch module="aqbanking-4.2.4.tar.gz" version="4.2.4"
repo="github_gnucash" >
</branch>
<dependencies>
commit f399d04742c86c94a679e75d9b74d5511ed5b7d6
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Mar 9 07:01:26 2010 -0800
Correct version for Guile 1.6.8
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index e02ccb8..7f4d2fd 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -110,7 +110,7 @@
autogenargs="--disable-static --enable-shared
--disable-scrollkeeper --disable-xlib">
<branch repo="ftp.gnu.org" module="guile/guile-1.6.8.tar.gz"
- version="1.6.7" size="3114052" />
+ version="1.6.8" size="3114052" />
<dependencies>
<dep package='readline'/>
</dependencies>
commit 60882a17867152768d191a2ee4b77d7313b6abc0
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Mar 9 06:57:36 2010 -0800
Fix error in module link for aqbanking-qw.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 4194a81..e02ccb8 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -74,7 +74,7 @@
<autotools id="aqbanking-qt" autogen-sh="configure"
autogenargs='--enable-ofx=yes --disable-kde --disable-chipcard-client --disable-python --with-frontends="cbanking g2banking qbanking"'
makeargs="qt4-all" >
- <branch module="aqbanking/aqbanking-4.2.0.tar.gz" version="4.2.0"
+ <branch module="aqbanking-4.2.0.tar.gz" version="4.2.0"
repo="github_gnucash" >
</branch>
<dependencies>
commit def6bfc144b861df9869589d1a30aa88c47fc815
Merge: bcbce62 dc30684
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Mar 9 06:47:50 2010 -0800
Merge branch 'master' of git at github.com:jralls/gnucash-on-osx
commit bcbce6227cb2914add3cb8336b4f2e2448a6b89e
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 7 17:06:46 2010 -0800
Quoting and explicit path for dbus-launcher line -- another paths-with-spaces fix.
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index f58c145..77b88ad 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -188,7 +188,7 @@ if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
/bin/kill "${DBUS_PID}"
done
fi
- eval `dbus-launch --sh-syntax --exit-with-session --config-file=$bundle_res/etc/dbus-1/session.conf`
+ eval `"$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
fi
GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 4c3f40b..0032488 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -189,7 +189,7 @@ if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
done
fi
- eval `dbus-launch --sh-syntax --exit-with-session --config-file=$bundle_res/etc/dbus-1/session.conf`
+ eval `$PREFIX/bin/dbus-launch" --sh-syntax --exit-with-session --config-file="$bundle_res/etc/dbus-1/session.conf"`
fi
GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
commit 2554e035ed340885539651af884fabe8a6e6aee7
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 7 17:05:33 2010 -0800
Create the prefix-link in an applescript with authentication if the user isn't an admin, and therefore doesn't have write privs in /Library.
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index 0156aeb..f58c145 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -138,18 +138,41 @@ export PATH="${RESPFX}/bin":"${PATH}"
GUILE_WARN_DEPRECATED="no"
export GUILE_WARN_DEPRECATED
-if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
- if [ ! -d "$PREFIX" ]; then
- rm "$PREFIX";
- else mv "$PREFIX" "$PREFIX.Save";
- fi
- ln -s "$RESPFX" "$PREFIX"
-elif [ ! -e "$PREFIX" ] ; then
- echo "Linking $RESPFX to $PREFIX"
- if [ ! -d "$PREFIXDIR" ]; then
- mkdir -p "$PREFIXDIR";
- fi
- ln -s "$RESPFX" "$PREFIX";
+if [ -w "$PREFIXDIR" ]; then
+ if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
+ if [ ! -d "$PREFIX" ]; then
+ rm "$PREFIX"; else
+ mv "$PREFIX" "$PREFIX.Save";
+ fi
+ ln -s "$RESPFX" "$PREFIX"
+ elif [ ! -e "$PREFIX" ] ; then
+ echo "Linking $RESPFX to $PREFIX"
+ if [ ! -d "$PREFIXDIR" ]; then
+ mkdir -p "$PREFIXDIR";
+ fi
+ ln -s "$RESPFX" "$PREFIX"
+ fi
+else
+ echo "Don't have write access to $PREFIXDIR"
+ if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
+ echo "moving the $PREFIX directory to $PREFIX.save"
+ osascript <<EOF
+display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
+do shell script "echo foo; if [ ! -d \"$PREFIX\" ]; then rm \"$PREFIX\"; else mv \"$PREFIX\" \"$PREFIX.Save\"; fi; ln -s \"$RESPFX\" \"$PREFIX\" " with administrator privileges
+
+EOF
+
+ elif [ ! -e "$PREFIX" ] ;
+ then
+ echo "Linking $RESPFX to $PREFIX"
+ osascript <<EOF
+display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
+do shell script "if [ ! -d \"$PREFIXDIR\" ]; then mkdir -p \"$PREFIXDIR\"; fi; ln -s \"$RESPFX\" \"$PREFIX\"" with administrator privileges
+
+EOF
+
+
+ fi
fi
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index e5aba4a..4c3f40b 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -138,18 +138,41 @@ export PATH
GUILE_WARN_DEPRECATED="no"
export GUILE_WARN_DEPRECATED
-if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
+if [ -w "$PREFIXDIR" ]; then
+ if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
if [ ! -d "$PREFIX" ]; then
rm "$PREFIX"; else
mv "$PREFIX" "$PREFIX.Save";
fi
ln -s "$RESPFX" "$PREFIX"
-elif [ ! -e "$PREFIX" ] ; then
- echo "Linking $RESPFX to $PREFIX"
- if [ ! -d "$PREFIXDIR" ]; then
- mkdir -p "$PREFIXDIR";
- fi
- ln -s "$RESPFX" "$PREFIX"
+ elif [ ! -e "$PREFIX" ] ; then
+ echo "Linking $RESPFX to $PREFIX"
+ if [ ! -d "$PREFIXDIR" ]; then
+ mkdir -p "$PREFIXDIR";
+ fi
+ ln -s "$RESPFX" "$PREFIX"
+ fi
+else
+ echo "Don't have write access to $PREFIXDIR"
+ if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
+ echo "moving the $PREFIX directory to $PREFIX.save"
+ osascript <<EOF
+display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
+do shell script "echo foo; if [ ! -d \"$PREFIX\" ]; then rm \"$PREFIX\"; else mv \"$PREFIX\" \"$PREFIX.Save\"; fi; ln -s \"$RESPFX\" \"$PREFIX\" " with administrator privileges
+
+EOF
+
+ elif [ ! -e "$PREFIX" ] ;
+ then
+ echo "Linking $RESPFX to $PREFIX"
+ osascript <<EOF
+display alert "Create Link" message "Gnucash requires authentication to create a link to the binary" as informational giving up after 3
+do shell script "if [ ! -d \"$PREFIXDIR\" ]; then mkdir -p \"$PREFIXDIR\"; fi; ln -s \"$RESPFX\" \"$PREFIX\"" with administrator privileges
+
+EOF
+
+
+ fi
fi
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
commit bc5069ff7c0b2588463765643845ab75cd28427e
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 7 17:01:26 2010 -0800
Use same args and deps for gnucash-svn as for gnucash-unstable
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 5ddc5bc..3a7fc3d 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -182,7 +182,7 @@
<autotools id="gnucash-svn"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
- autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc ">
+ autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
<branch repo="svn.gnucash.org" module="gnucash"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
@@ -191,8 +191,10 @@
<!--dep package="aqbanking"/ -->
<dep package="aqbanking-qt"/>
<!--dep package="meta-gtkhtml"/-->
+ <dep package="libgnomeui"/>
<dep package="WebKit"/>
<dep package="Slib"/>
+ <dep package="libdbi-drivers"/>
</dependencies>
</autotools>
commit 1e63de2b73189b38060068f030ca7977c9967394
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 7 16:59:47 2010 -0800
Update Guile to 1.8
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a21e5bc..5ddc5bc 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -101,7 +101,7 @@
<branch repo="sourceforge" module="libofx/libofx-0.9.1.tar.gz"
version='0.9.1'/>
<dependencies>
- <dep package='guile-1.6'/>
+ <dep package='guile'/>
<dep package="OpenSP"/>
</dependencies>
</autotools>
@@ -116,7 +116,16 @@
</dependencies>
</autotools>
- <autotools id="Slib" autogen-sh="install.sh" makeargs="-f Makefile.gnucash"
+ <autotools id="guile" autogen-sh="configure">
+ <branch repo="ftp.gnu.org" module="guile/guile-1.8.7.tar.gz"
+ version="1.8.7" />
+ <dependencies>
+ <dep package='readline'/>
+ <dep package="gmp"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="Slib" autogen-sh="install.sh" makeargs="-f Makefile.gnucash"
makeinstallargs="-f Makefile.gnucash">
<!-- <branch repo="slib.savannah.gnu.org"
module="slib"/> -->
@@ -125,7 +134,7 @@
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/slib-install.patch"/>
</branch>
<dependencies>
- <dep package="guile-1.6"/>
+ <dep package="guile"/>
</dependencies>
</autotools>
diff --git a/patches/slib-install.patch b/patches/slib-install.patch
index 2445031..c1e59f3 100644
--- a/patches/slib-install.patch
+++ b/patches/slib-install.patch
@@ -5,7 +5,7 @@
+mkdir $PREFIX/lib/slib
+cp *.scm $PREFIX/lib/slib/
+cp guile.init $PREFIX/lib/slib
-+cd $PREFIX/share/guile/1.6/
++cd $PREFIX/share/guile/1.8/
+mkdir ../site
+ln -s ../../../lib/slib .
+$PREFIX/bin/guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
commit 52b0f019e305e3be020a1c363fd453574a67bb96
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Feb 20 12:50:10 2010 -0800
Put aqbanking-cli into MacOS so that the relative rpath will point to the right path for libaqbanking.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 643d145..389ce43 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -105,7 +105,7 @@
${prefix}/bin/gnc-*
</binary>
- <binary>
+ <binary dest="${bundle}/Contents/MacOS">
${prefix}/bin/aqbanking-cli
</binary>
commit dc306847def725f8c1e50714223949f3957aa55f
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Feb 19 19:49:22 2010 -0800
Fix repo URI for github. Apparently they dropped cloud from the hostname for downloads.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a21e5bc..a04d30e 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -22,7 +22,7 @@
<repository type="svn" name="svn.gnucash.org"
href="http://svn.gnucash.org/repo/"/>
<repository type="tarball" name="github_gnucash"
- href="http://cloud.github.com/downloads/jralls/gnucash-on-osx/"/>
+ href="http://github.com/downloads/jralls/gnucash-on-osx/"/>
<repository type="tarball" name="gmplib.org"
href="ftp://ftp.gmplib.org/pub/"/>
commit ea246fb09f760082046e09dd23b01fa180486aea
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Feb 19 16:41:38 2010 -0800
Update version to 2.3.10; replace copyright holder from "Free Software Foundation" to "Contributers" (Gnucash's copyright hasn't been assigned, and probably can't be.)
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 12c617d..6290ca3 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.3.8 © 2009 Free Software Foundation</string>
+ <string>Gnucash version 2.3.10 © 2010 Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,22 +15,22 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.3.8 © 2009 Free Software Foundation</string>
+ <string>2.3.10 © 2010 Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.3.8</string>
+ <string>2.3.10</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.3.8</string>
+ <string>2.3.10</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
<true/>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2009 Free Software Foundation</string>
+ <string>Copyright 2010 Contributors</string>
</dict>
</plist>
commit 8dd9aacc6420e1889cf339f5c5a7137b6035ab95
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Feb 19 16:39:43 2010 -0800
Modify location of gnucash's setup files to someplace that Finder can see them.
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 75c6825..e5aba4a 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -190,9 +190,10 @@ export GNC_MODULE_PATH
export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
+export GNC_DOT_DIR="$HOME/Library/Application Support/Gnucash"
-if test -f "$HOME/.gnucashrc"; then
- source "$HOME/.gnucashrc"
+if test -f "$GNC_DOT_DIR/gnucashrc"; then
+ source "$GNC_DOT_DIR/gnucashrc"
fi
#Don't quote $EXTRA_ARGS or it will turn into a single arg and fail.
commit 279c109d79a6ad14f5bb998356cd613122919e20
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Feb 19 16:38:58 2010 -0800
Fix up changes from upgrading aqbanking and gwenhywfar; provide aqbanking-cli for upgrading the aqbanking setup data.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index f3f9083..643d145 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -106,6 +106,10 @@
</binary>
<binary>
+ ${prefix}/bin/aqbanking-cli
+ </binary>
+
+ <binary>
${prefix}/lib/goffice
</binary>
@@ -164,10 +168,6 @@
</data>
<data>
- ${prefix}/etc/gwen-public-ca.crt
- </data>
-
- <data>
${prefix}/etc/fonts
</data>
@@ -204,10 +204,6 @@
</data>
<data>
- ${prefix}/share/aqhbci
- </data>
-
- <data>
${prefix}/share/mime
</data>
commit c754840f949b5431224c4f64e8ac371c10da73eb
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Feb 19 16:34:22 2010 -0800
Fix quoting so that the correct basename is found
basename's argument needs to be correctly quoted or it will break on a space and find the wrong name.
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 4ae4cc6..75c6825 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -13,7 +13,7 @@ fi
export PREFIX=/Library/Gnucash-2.3.x
export PREFIXDIR="`dirname $PREFIX`"
-name="`basename $0`"
+name=`basename "$0"`
tmp="$0"
tmp=`dirname "$tmp"`
tmp=`dirname "$tmp"`
commit 806e5c1cac08ba6b020a19ad9273f4fa0911173e
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Feb 19 16:23:37 2010 -0800
Update gnucash-unstable to 2.3.10
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index d73544f..a21e5bc 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -190,7 +190,7 @@
<autotools id="gnucash-unstable"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash/gnucash-2.3.9.tar.gz" version="2.3.9"
+ <branch module="gnucash/gnucash-2.3.10.tar.gz" version="2.3.10"
repo="sourceforge"/>
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/dot_gnucash.patch" strip="0"/>
<dependencies>
commit 6caff04e1a157a47762a0ed0faefb7d7d9d97ec7
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Feb 15 12:36:52 2010 -0800
Update Gnucash unstable to 2.3.9
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index fce7141..d73544f 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -190,8 +190,9 @@
<autotools id="gnucash-unstable"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="gnucash/gnucash-2.3.8.tar.gz" version="2.3.8"
+ <branch module="gnucash/gnucash-2.3.9.tar.gz" version="2.3.9"
repo="sourceforge"/>
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/dot_gnucash.patch" strip="0"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
<dep package="meta-goffice"/>
commit 22a63cc08aed28039e854c9cc8fff5def47b07c3
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Feb 15 12:36:21 2010 -0800
Fix up gnucash configuration file location; patch temporary pending checkin of code into gnucash svn.
diff --git a/patches/dot_gnucash.patch b/patches/dot_gnucash.patch
new file mode 100644
index 0000000..5f17015
--- /dev/null
+++ b/patches/dot_gnucash.patch
@@ -0,0 +1,415 @@
+Index: AUTHORS
+===================================================================
+--- AUTHORS (revision 18612)
++++ AUTHORS (working copy)
+@@ -240,6 +240,7 @@
+ Gavin Porter <maufk at csv.warwick.ac.uk> for euro style dates
+ Tomas Pospisek <tpo at spin.ch> Debian patches
+ Paul Poulain <famille.p.poulain at free.fr> French translations
++John Ralls <jralls at ceridwen.fremont.ca.us> MacOSX integration
+ Ron Record <rr at sco.com> for SCO Unixware & OpenServer binaries
+ Keith Refson <Keith.Refson at earth.ox.ac.uk> Solaris fixes
+ Jerry Quinn <jlquinn at optonline.net> Bugfixes
+Index: src/bin/gnucash-setup-env-osx.in
+===================================================================
+--- src/bin/gnucash-setup-env-osx.in (revision 18612)
++++ src/bin/gnucash-setup-env-osx.in (working copy)
+@@ -33,6 +33,7 @@
+ export LD_LIBRARY_PATH
+ export DYLD_LIBRARY_PATH
+ export GNC_STANDARD_REPORTS_DIR
++export GNC_DOT_DIR="$HOME/Library/Application Support/Gnucash"
+
+ if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+ eval `dbus-launch --sh-syntax --exit-with-session --config-file=@-PREFIX-@/etc/dbus-1/session.conf`
+Index: src/engine/gnc-filepath-utils.c
+===================================================================
+--- src/engine/gnc-filepath-utils.c (revision 18612)
++++ src/engine/gnc-filepath-utils.c (working copy)
+@@ -46,133 +46,13 @@
+ #include <errno.h>
+
+ #include "gnc-engine.h"
++#include "gnc-path.h"
+ #include "gnc-filepath-utils.h"
+
++
+ static QofLogModule log_module = GNC_MOD_BACKEND;
+
+
+-/* ====================================================================== */
+-/*
+- * If $HOME/.gnucash/data directory doesn't exist, then create it.
+- */
+-
+-static void
+-MakeHomeDir (void)
+-{
+- const gchar *home;
+- char *path;
+- char *data;
+-
+- /* Punt. Can't figure out where home is. */
+- home = g_get_home_dir();
+- if (!home) return;
+-
+- path = g_build_filename(home, ".gnucash", (gchar *)NULL);
+-
+- if (!g_file_test(path, G_FILE_TEST_EXISTS))
+- {
+- /* Go ahead and make it. Don't bother much with checking mkdir
+- * for errors; seems pointless. */
+- g_mkdir (path, S_IRWXU); /* perms = S_IRWXU = 0700 */
+- }
+-
+- data = g_build_filename (path, "data", (gchar *)NULL);
+- if (!g_file_test(data, G_FILE_TEST_EXISTS))
+- g_mkdir (data, S_IRWXU);
+-
+- g_free (path);
+- g_free (data);
+-}
+-
+-/* ====================================================================== */
+-
+-/* XXX hack alert -- we should be yanking this out of some config file */
+-/* These are obviously meant to be hard-coded paths to the gnucash
+- data file. That is insane. These should be thrown out
+- altogether. On non-Unix systems (Windows) these paths would not
+- only have different directory separator characters but these
+- would certainly be completely different paths. I'd vote to
+- throw this out completely. -- cstim, 2006-07-19 */
+-static char * searchpaths[] =
+-{
+- "/usr/share/gnucash/data",
+- "/usr/local/share/gnucash/data",
+- "/usr/share/gnucash/accounts",
+- "/usr/local/share/gnucash/accounts",
+- NULL,
+-};
+-
+-typedef gboolean (*pathGenerator)(char *pathbuf, int which);
+-
+-static gboolean
+-xaccCwdPathGenerator(char *pathbuf, int which)
+-{
+- if(which != 0)
+- {
+- return FALSE;
+- }
+- else
+- {
+- /* try to find a file by this name in the cwd ... */
+- if (getcwd (pathbuf, PATH_MAX) == NULL)
+- return FALSE;
+-
+- return TRUE;
+- }
+-}
+-
+-static gboolean
+-xaccDataPathGenerator(char *pathbuf, int which)
+-{
+- if(which != 0)
+- {
+- return FALSE;
+- }
+- else
+- {
+- const gchar *home;
+- gchar *tmppath;
+-
+- home = g_get_home_dir ();
+- if (!home)
+- return FALSE;
+-
+- tmppath = g_build_filename (home, ".gnucash", "data", (gchar *)NULL);
+- if (strlen(tmppath) >= PATH_MAX)
+- {
+- g_free (tmppath);
+- return FALSE;
+- }
+-
+- g_strlcpy (pathbuf, tmppath, PATH_MAX);
+- g_free (tmppath);
+- return TRUE;
+- }
+-}
+-
+-static gboolean
+-xaccUserPathPathGenerator(char *pathbuf, int which)
+-{
+- char *path = NULL;
+-
+- if(searchpaths[which] == NULL)
+- {
+- return FALSE;
+- }
+- else
+- {
+- path = searchpaths[which];
+-
+- if (PATH_MAX <= strlen(path))
+- return FALSE;
+-
+- g_strlcpy (pathbuf, path, PATH_MAX);
+- return TRUE;
+- }
+-}
+-
+-/* ====================================================================== */
+-
+ /**
+ * Scrubs a filename by changing "strange" chars (e.g. those that are not
+ * valid in a win32 file name) to "_".
+@@ -192,14 +72,36 @@
+ }
+ }
+
+-char *
++/** \fn gchar * check_file_return_if_true (path)
++ * \brief Check if the path exists and is a regular file
++ *
++ * \param path -- freed if the path doesn't exist or isn't a regular file
++ *
++ * \return NULL or the path
++ */
++
++static gchar *
++check_path_return_if_valid(gchar *path)
++{
++ ENTER("Path: %s", path);
++ if (g_file_test(path, G_FILE_TEST_IS_REGULAR))
++ {
++ LEAVE("found %s", path);
++ return path;
++ }
++ g_free (path);
++ return NULL;
++}
++
++char *
+ xaccResolveFilePath (const char * filefrag)
+ {
+ char pathbuf[PATH_MAX];
+- pathGenerator gens[4];
++/* pathGenerator gens[4];*/
+ char *filefrag_dup;
+ int namelen;
+ int i;
++ gchar *fullpath = NULL, *tmp_path = NULL;
+
+ /* seriously invalid */
+ if (!filefrag)
+@@ -235,73 +137,61 @@
+ return g_strdup( filefrag + 4);
+ }
+
++
+ /* get conservative on the length so that sprintf(getpid()) works ... */
+ /* strlen ("/.LCK") + sprintf (%x%d) */
+- namelen = strlen (filefrag) + 25;
++ namelen = strlen (filefrag) + 25;
+
+- gens[0] = xaccCwdPathGenerator;
+- gens[1] = xaccDataPathGenerator;
+- gens[2] = xaccUserPathPathGenerator;
+- gens[3] = NULL;
+-
+- for (i = 0; gens[i] != NULL; i++)
++ /* Look in the current working directory */
++ tmp_path = g_get_current_dir();
++ fullpath = g_build_filename(tmp_path, filefrag, (gchar *)NULL);
++ g_free(tmp_path);
++ fullpath = check_path_return_if_valid(fullpath);
++ if (fullpath != NULL)
+ {
+- int j;
+- for(j = 0; gens[i](pathbuf, j) ; j++)
+- {
+- gchar *fullpath = g_build_filename(pathbuf, filefrag, (gchar *)NULL);
++ LEAVE("found %s", fullpath);
++ return fullpath;
++ }
+
+- if (g_file_test(fullpath, G_FILE_TEST_IS_REGULAR))
+- {
+- LEAVE("found %s", fullpath);
+- return fullpath;
+- }
+- g_free (fullpath);
+- }
++ /* Look in the data dir (e.g. $PREFIX/share/gnucash) */
++ tmp_path = gnc_path_get_pkgdatadir();
++ fullpath = g_build_filename(tmp_path, filefrag, (gchar *)NULL);
++ g_free(tmp_path);
++ fullpath = check_path_return_if_valid(fullpath);
++ if (fullpath != NULL)
++ {
++ LEAVE("found %s", fullpath);
++ return fullpath;
+ }
+- /* OK, we didn't find the file. */
+
+- /* make sure that the gnucash home dir exists. */
+- MakeHomeDir();
+-
+- filefrag_dup = g_strdup (filefrag);
+-
+- /* Replace "strange" chars with "_" for non-file backends. */
+- if (strstr (filefrag, "://"))
++ /* Look in the config dir (e.g. $PREFIX/etc/gnucash) */
++ tmp_path = gnc_path_get_accountsdir();
++ fullpath = g_build_filename(tmp_path, filefrag, (gchar *)NULL);
++ g_free(tmp_path);
++ fullpath = check_path_return_if_valid(fullpath);
++ if (fullpath != NULL)
+ {
+- scrub_filename(filefrag_dup);
++ LEAVE("found %s", fullpath);
++ return fullpath;
+ }
+
+- /* Lets try creating a new file in $HOME/.gnucash/data */
+- if (xaccDataPathGenerator(pathbuf, 0))
++ /* Look in the users config dir (e.g. $HOME/.gnucash/data) */
++ fullpath = gnc_build_data_path(filefrag);
++ if (g_file_test(fullpath, G_FILE_TEST_IS_REGULAR))
+ {
+- gchar *result;
+- result = g_build_filename(pathbuf, filefrag_dup, (gchar *)NULL);
+- g_free (filefrag_dup);
+- LEAVE("create new file %s", result);
+- return result;
+- }
+-
+- /* OK, we still didn't find the file */
+- /* Lets try creating a new file in the cwd */
+- if (xaccCwdPathGenerator(pathbuf, 0))
+- {
+- gchar *result;
+- result = g_build_filename(pathbuf, filefrag_dup, (gchar *)NULL);
+- g_free (filefrag_dup);
+- LEAVE("create new file %s", result);
+- return result;
++ LEAVE("found %s", fullpath);
++ return fullpath;
+ }
++ /* OK, it's not there. Note that it needs to be created and pass it
++ * back anyway */
++ LEAVE("create new file %s", fullpath);
++ return fullpath;
+
+- g_free (filefrag_dup);
+-
+- LEAVE("%s not found", filefrag);
+- return NULL;
+ }
+
+ /* ====================================================================== */
+
+-char *
++char *
+ xaccResolveURL (const char * pathfrag)
+ {
+ GList* list;
+@@ -317,7 +207,7 @@
+ * to make sure the uri is in good form.
+ */
+
+- if (!g_ascii_strncasecmp (pathfrag, "http://", 7) ||
++ if (!g_ascii_strncasecmp (pathfrag, "http://", 7) ||
+ !g_ascii_strncasecmp (pathfrag, "https://", 8))
+ {
+ return g_strdup(pathfrag);
+@@ -338,15 +228,6 @@
+ }
+ }
+ g_list_free(list);
+-
+- /* "file:" and "xml:" are handled specially */
+- if (!g_ascii_strncasecmp (pathfrag, "file:", 5)) {
+- return (xaccResolveFilePath (pathfrag));
+- }
+- if (!g_ascii_strncasecmp (pathfrag, "xml:", 4)) {
+- return (g_strdup_printf( "xml:%s", xaccResolveFilePath (pathfrag)) );
+- }
+-
+ return (xaccResolveFilePath (pathfrag));
+ }
+
+@@ -393,7 +274,7 @@
+ "the file and start GnuCash again.\n"),
+ dirname);
+ exit(1);
+-
++
+ default:
+ g_fprintf(stderr,
+ _("An unknown error occurred when validating that the\n"
+@@ -428,16 +309,19 @@
+ const gchar *
+ gnc_dotgnucash_dir (void)
+ {
+- static gchar *dotgnucash = NULL, *tmp_dir;
+- const gchar *home;
++ static gchar *dotgnucash = NULL;
++ gchar *tmp_dir;
+
+ if (dotgnucash)
+ return dotgnucash;
+
+ dotgnucash = g_strdup(g_getenv("GNC_DOT_DIR"));
+- if (!dotgnucash) {
+- home = g_get_home_dir();
+- if (!home) {
++
++ if (!dotgnucash)
++ {
++ const gchar *home = g_get_home_dir();
++ if (!home)
++ {
+ g_warning("Cannot find home directory. Using tmp directory instead.");
+ home = g_get_tmp_dir();
+ }
+@@ -467,13 +351,26 @@
+ gchar *
+ gnc_build_book_path (const gchar *filename)
+ {
+- char* filename_dup = g_strdup(filename);
+- char* result;
++ gchar* filename_dup = g_strdup(filename);
++ gchar* result = NULL;
+
+ scrub_filename(filename_dup);
+- result = g_build_filename(gnc_dotgnucash_dir(), "books", filename_dup, (gchar *)NULL);
++ result = g_build_filename(gnc_dotgnucash_dir(), "books",
++ filename_dup, (gchar *)NULL);
+ g_free(filename_dup);
+ return result;
+ }
+
++gchar *
++gnc_build_data_path (const gchar *filename)
++{
++ gchar* filename_dup = g_strdup(filename);
++ gchar* result;
++
++ scrub_filename(filename_dup);
++ result = g_build_filename(gnc_dotgnucash_dir(), "data", filename_dup, (gchar *)NULL);
++ g_free(filename_dup);
++ return result;
++}
++
+ /* =============================== END OF FILE ========================== */
+Index: src/engine/gnc-filepath-utils.h
+===================================================================
+--- src/engine/gnc-filepath-utils.h (revision 18612)
++++ src/engine/gnc-filepath-utils.h (working copy)
+@@ -49,5 +49,6 @@
+ const gchar *gnc_dotgnucash_dir (void);
+ gchar *gnc_build_dotgnucash_path (const gchar *filename);
+ gchar *gnc_build_book_path (const gchar *filename);
++gchar *gnc_build_data_path (const gchar *filename);
+
+ #endif /* GNC_FILEPATH_UTILS_H */
commit 7ef8493d2cc8d2e4ae95f12f8525dda87d3f5f0a
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Feb 5 14:58:45 2010 -0800
Additional dependencies for Gwenhywfar 3.11
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 024f01c..fce7141 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -48,6 +48,10 @@
<autotools id="gwenhywfar" autogen-sh="configure">
<branch module="gwenhywfar-3.11.1.tar.gz" version="3.11.1"
repo="github_gnucash"/>
+ <dependencies>
+ <dep package="libgcrypt"/>
+ <dep package="gnutls"/>
+ </dependencies>
</autotools>
<autotools id="ktoblzcheck" autogen-sh="configure">
commit cdff5d4f21858cd4cd832cc9dc2e1f2ee801a5f7
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Feb 5 14:57:59 2010 -0800
Gnucash-svn should be dependent upon WebKit for now.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index d5b5e95..024f01c 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -177,7 +177,8 @@
<dep package="libofx"/>
<!--dep package="aqbanking"/ -->
<dep package="aqbanking-qt"/>
- <dep package="meta-gtkhtml"/>
+ <!--dep package="meta-gtkhtml"/-->
+ <dep package="WebKit"/>
<dep package="Slib"/>
</dependencies>
commit 03bde780ef10bcb79527d83fc028c9f938021ace
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Jan 20 12:02:48 2010 -0800
Further quoting corrections to allow for spaces in the bundle path.
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index 54cf3eb..0156aeb 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -120,7 +120,7 @@ if test -f "$bundle_lib/charset.alias"; then
fi
# Extra arguments can be added in environment.sh.
-EXTRA_ARGS="--config-path $bundle_etc/gnucash --share-path $bundle_data/gnucash --debug"
+EXTRA_ARGS=--config-path "$bundle_etc/gnucash" --share-path "$bundle_data/gnucash" --debug
if test -f "$bundle_res/environment.sh"; then
source "$bundle_res/environment.sh"
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 231a899..4ae4cc6 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -120,7 +120,7 @@ if test -f "$bundle_lib/charset.alias"; then
fi
# Extra arguments can be added in environment.sh.
-EXTRA_ARGS="--config-path $bundle_etc/gnucash --share-path $bundle_data/gnucash --debug"
+EXTRA_ARGS=--config-path "$bundle_etc/gnucash" --share-path "$bundle_data/gnucash" --debug
if test -f "$bundle_res/environment.sh"; then
source "$bundle_res/environment.sh"
commit be5a9a900ad76753f3443dd6c18ae24372a42c5d
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jan 19 15:00:53 2010 -0800
New prefixes and better quoting
Changed the prefixes to /Library/Gnucash-2.2.9 and 2.3.x. This is both the mac standard place for this and is user-writable which gets rid of the need for Applescript to authenticate.
Fixed up all of the unquoted shell variables (or added a comment where the variable should stay unquoted).
Betwixt the two changes, the problem of paths-with-spaces should be resolved.
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index 36eafc1..54cf3eb 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -10,7 +10,7 @@ else
EXEC=exec
fi
-export PREFIX=/opt/gnucash-2.2.9
+export PREFIX=/Library/Gnucash-2.2.9
export PREFIXDIR="`dirname $PREFIX`"
name="`basename $0`"
@@ -28,7 +28,7 @@ bundle_etc="$bundle_res"/etc
export DYLD_LIBRARY_PATH="$bundle_lib"
export XDG_CONFIG_DIRS="$bundle_etc"/xdg
-export XDG_DATA_DIRS=$PREFIX/share
+export XDG_DATA_DIRS="$PREFIX"/share
export GTK_DATA_PREFIX="$bundle_data"
export GTK_EXE_PREFIX="$bundle_res"
export GTK_PATH="$bundle_res"
@@ -99,7 +99,7 @@ if test "$APPLELANGUAGES"; then
for L in $APPLELANGUAGES
do
POS=`echo ${L} | awk '{print index(ENVIRON["LANG"], $0)}'`
- if test $POS -eq 1; then
+ if test "$POS" -eq 1; then
# The language symbol is a subset of the $LANG variable. We're done!
break
fi
@@ -131,18 +131,25 @@ if [ x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ]; then
shift 1
fi
-export RESPFX=${bundle_res}
-PATH="${RESPFX}/bin:${PATH}"
-export PATH
+export RESPFX="${bundle_res}"
+export PATH="${RESPFX}/bin":"${PATH}"
+
GUILE_WARN_DEPRECATED="no"
export GUILE_WARN_DEPRECATED
if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
- osascript -e 'do shell script " if [ ! -d $PREFIX ]; then rm $PREFIX; else mv $PREFIX $PREFIX.Save; fi; ln -s $RESPFX $PREFIX" with administrator privileges '
+ if [ ! -d "$PREFIX" ]; then
+ rm "$PREFIX";
+ else mv "$PREFIX" "$PREFIX.Save";
+ fi
+ ln -s "$RESPFX" "$PREFIX"
elif [ ! -e "$PREFIX" ] ; then
echo "Linking $RESPFX to $PREFIX"
- osascript -e 'do shell script "if [ ! -d $PREFIXDIR ]; then mkdir -p $PREFIXDIR; fi; ln -s $RESPFX $PREFIX" with administrator privileges ';
+ if [ ! -d "$PREFIXDIR" ]; then
+ mkdir -p "$PREFIXDIR";
+ fi
+ ln -s "$RESPFX" "$PREFIX";
fi
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
@@ -153,7 +160,7 @@ if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
DBUS_PIDS=`ps ux | grep dbus-daemon | grep "${PREFIX}" | awk '{print $2}'`
if /bin/test "$DBUS_PIDS"; then
- for DBUS_PID in ${DBUS_PIDS}
+ for DBUS_PID in "${DBUS_PIDS}"
do
/bin/kill "${DBUS_PID}"
done
@@ -185,4 +192,5 @@ if test -f "$HOME/.gnucashrc"; then
source "$HOME/.gnucashrc"
fi
+#$EXTRA_ARGS not quoted because we don't want GC to treat it as a single arg.
$EXEC "$bundle_contents/MacOS/$name-bin" $* $EXTRA_ARGS
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index b088ec4..231a899 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -10,7 +10,7 @@ else
EXEC=exec
fi
-export PREFIX=/opt/gnucash-2.3.x
+export PREFIX=/Library/Gnucash-2.3.x
export PREFIXDIR="`dirname $PREFIX`"
name="`basename $0`"
@@ -28,7 +28,7 @@ bundle_etc="$bundle_res"/etc
export DYLD_LIBRARY_PATH="$bundle_lib"
export XDG_CONFIG_DIRS="$bundle_etc"/xdg
-export XDG_DATA_DIRS=$PREFIX/share
+export XDG_DATA_DIRS="$PREFIX/share"
export GTK_DATA_PREFIX="$bundle_data"
export GTK_EXE_PREFIX="$bundle_res"
export GTK_PATH="$bundle_res"
@@ -131,18 +131,25 @@ if [ x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ]; then
shift 1
fi
-export RESPFX=${bundle_res}
-PATH="${RESPFX}/bin:${PATH}"
+export RESPFX="${bundle_res}"
+PATH="${RESPFX}"/bin:"${PATH}"
export PATH
GUILE_WARN_DEPRECATED="no"
export GUILE_WARN_DEPRECATED
if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
- osascript -e 'do shell script " if [ ! -d $PREFIX ]; then rm $PREFIX; else mv $PREFIX $PREFIX.Save; fi; ln -s $RESPFX $PREFIX" with administrator privileges '
+ if [ ! -d "$PREFIX" ]; then
+ rm "$PREFIX"; else
+ mv "$PREFIX" "$PREFIX.Save";
+ fi
+ ln -s "$RESPFX" "$PREFIX"
elif [ ! -e "$PREFIX" ] ; then
echo "Linking $RESPFX to $PREFIX"
- osascript -e 'do shell script "if [ ! -d $PREFIXDIR ]; then mkdir -p $PREFIXDIR; fi; ln -s $RESPFX $PREFIX" with administrator privileges ';
+ if [ ! -d "$PREFIXDIR" ]; then
+ mkdir -p "$PREFIXDIR";
+ fi
+ ln -s "$RESPFX" "$PREFIX"
fi
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
@@ -188,4 +195,5 @@ if test -f "$HOME/.gnucashrc"; then
source "$HOME/.gnucashrc"
fi
+#Don't quote $EXTRA_ARGS or it will turn into a single arg and fail.
$EXEC "$bundle_contents/MacOS/$name-bin" $* $EXTRA_ARGS
commit 23a7e6f2cbcd674515a277af77a4471a163d8a81
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jan 19 14:51:48 2010 -0800
Add "gmp" module, enable gmp dependencies
It seems that although gmp is part of bootstrap, it doesn't always get built. This makes sure that it does, so that aqbanking will build successfully.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 67e384c..d5b5e95 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -39,6 +39,12 @@
version="6.0"/>
</autotools>
+ <!-- gmp is also provided in theory by bootstrap, but it seems not to always get built, so it's provided here as well. -->
+ <autotools id="gmp">
+ <!--branch repo="ftp.gnu.org" module="gmp/gmp-5.0.0.tar.bz2" version="5.0.0"/-->
+ <branch repo="ftp.gnu.org" module="gmp/gmp-4.3.1.tar.bz2" version="4.3.1"/>
+ </autotools>
+
<autotools id="gwenhywfar" autogen-sh="configure">
<branch module="gwenhywfar-3.11.1.tar.gz" version="3.11.1"
repo="github_gnucash"/>
@@ -56,7 +62,7 @@
<dependencies>
<dep package="libofx"/>
<dep package="gwenhywfar"/>
- <!-- dep package="gmp"/ -->
+ <dep package="gmp"/>
<dep package="ktoblzcheck"/>
</dependencies>
</autotools>
@@ -70,7 +76,7 @@
<dependencies>
<dep package="libofx"/>
<dep package="gwenhywfar"/>
- <!-- dep package="gmp"/ -->
+ <dep package="gmp"/>
<dep package="ktoblzcheck"/>
</dependencies>
</autotools>
commit 1e8ea7c12a184ea32401839e7ce256aafcc26d74
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jan 11 13:04:37 2010 -0800
Comment out gmp dependency for gwenhywfar.
I'm not really clear on whether this is required or not.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a1e895d..67e384c 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -56,7 +56,7 @@
<dependencies>
<dep package="libofx"/>
<dep package="gwenhywfar"/>
- <dep package="gmp"/>
+ <!-- dep package="gmp"/ -->
<dep package="ktoblzcheck"/>
</dependencies>
</autotools>
@@ -70,7 +70,7 @@
<dependencies>
<dep package="libofx"/>
<dep package="gwenhywfar"/>
- <dep package="gmp"/>
+ <!-- dep package="gmp"/ -->
<dep package="ktoblzcheck"/>
</dependencies>
</autotools>
commit a8f8b9a1d67a6817b2b63af2a09b3ca288188ee4
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jan 11 13:03:36 2010 -0800
Updated to match current jhbuildrc, simplify switching gnucash builds.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 3788f97..4e4e7b9 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -1,32 +1,49 @@
# -*- mode: python -*-
-#checkoutroot = '/usr/local/src/gnome'
-#prefix = '/usr/local/gtk'
-if _osx_version.startswith("8."):
- os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.4"
- module_makeargs["gtk+"]="LDFLAGS='-framework AppKit -framework Carbon -framework CoreFoundation -framework ApplicationServices -lobjc'"
- module_makeargs["ige-mac-integration"]="LDFLAGS='-framework AppKit -lobjc'"
- module_makeargs["aqbanking"]="LDFLAGS='-liconv'"
- # setup_sdk_10_4()
- pass
-else:
- os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.5"
- skip.append("bison")
-
-autogenargs=autogenargs + ' --disable-xlib'
-append_autogenargs("gconf", "--enable-static --enable-shared --disable-scrollkeeper --disable-xlib")
+#Uncomment this if you have a completed build and only want to rebuild
+#updated modules instead of everything:
+#
+#build_policy = "updated-deps"
+
+#Select one of these, or use a different one: Do keep the directories
+#separate for stable and unstable as they have different
+#dependencies. You can use 2.3.x for svn builds.
+prefix = os.path.join(os.environ["HOME"], "Library/Gnucash-2.2.9")
+#prefix = os.path.join(os.environ["HOME"], "/Library/Gnucash-2.3.x")
+
+#Select which modules to build. The only difference is which gnucash
+#module (and all of the dependencies, see above) get built:
+modules = ["gettext-fw", "meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash"]
+#modules = ["gettext-fw", "meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash-unstable"]
+#modules = ["gettext-fw", "meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash-svn"]
+
+#Setup the build for Tiger. If you don't care about Tiger or are
+#building unstable or svn, comment out the first one and uncomment the
+#second.
+setup_sdk("10.4", "10.4u")
+#setup_sdk("10.5", "10.5")
+
+moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
+
+
+skip.remove("gmp")
append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
append_autogenargs("libgnomeui", "--disable-static --enable-shared --disable-scrollkeeper --disable-xlib --without-x")
append_autogenargs("scrollkeeper", "--with-xml-catalog=" + os.path.join(prefix, "etc/xml/catalog"))
-append_autogenargs("gnucash-unstable", "--with-html-engine=webkit")
+append_autogenargs("OpenSP", "--enable-shared") #To override the global --disable-shared
append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
-append_autogenargs("aqbanking-qt", 'qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support -framework QtXml -framework QtSql -framework QtNetwork" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers" QT3TO4=/usr/bin/qt3to4')
+append_autogenargs("gnucash-unstable", "--with-dbi-dbd-dir=" + prefix +"/lib/dbd")
+append_autogenargs("gnucash-svn", "--with-dbi-dbd-dir=" + prefix +"/lib/dbd")
+append_autogenargs("aqbanking-qt", 'qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers" QT3TO4=/usr/bin/qt3to4')
-moduleset = os.environ["HOME"] + "/gnucash-on-osx/modulesets/gnucash.modules"
-modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
+append_autogenargs("gnucash-unstable", " --with-html-engine=webkit")
+append_autogenargs("gnucash-svn", " --with-html-engine=webkit")
-#build_policy = "updated-deps"
+append_autogenargs("python", "--with-universal-archs=32-bit --enable-universalsdk=/Developer/SDKs/MacOSX10.5.sdk")
+append_autogenargs("libiconv", "--with-libintl-prefix=" + prefix)
+branches["python"] = "http://www.python.org/ftp/python/2.6.4/Python-2.6.4.tar.bz2"
+module_makecheck["gmp"] = True
commit bdceba489dcd0bc7c60460711f5f1bf0f62e352d
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Dec 17 16:18:58 2009 -0800
Update aqbanking and gwenhywfar to latest revs from the ancient ones used previously
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index bf542eb..a1e895d 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -21,6 +21,10 @@
href="http://www.gnucash.org/pub/gnucash/sources/"/>
<repository type="svn" name="svn.gnucash.org"
href="http://svn.gnucash.org/repo/"/>
+ <repository type="tarball" name="github_gnucash"
+ href="http://cloud.github.com/downloads/jralls/gnucash-on-osx/"/>
+ <repository type="tarball" name="gmplib.org"
+ href="ftp://ftp.gmplib.org/pub/"/>
@@ -36,29 +40,38 @@
</autotools>
<autotools id="gwenhywfar" autogen-sh="configure">
- <branch module="gwenhywfar/gwenhywfar-2.6.2.tar.gz" version="2.6.2"
+ <branch module="gwenhywfar-3.11.1.tar.gz" version="3.11.1"
+ repo="github_gnucash"/>
+ </autotools>
+
+ <autotools id="ktoblzcheck" autogen-sh="configure">
+ <branch module="ktoblzcheck/ktoblzcheck-1.24.tar.gz" version="1.24"
repo="sourceforge"/>
</autotools>
<autotools id="aqbanking" autogen-sh="configure"
- autogenargs='--enable-ofx=yes --disable-qt3 --disable-kde --disable-chipcard-client --with-backends="aqhbci aqdtaus aqofxconnect" --with-frontends="cbanking g2banking"' >
- <branch module="aqbanking/aqbanking-2.3.3.tar.gz" version="2.3.3"
- repo="sourceforge"/>
+ autogenargs='--enable-ofx=yes --disable-qt3 --disable-kde --disable-chipcard-client --disable-python --with-frontends="cbanking g2banking"' >
+ <branch module="aqbanking-4.2.0.tar.gz" version="4.2.0"
+ repo="github_gnucash"/>
<dependencies>
<dep package="libofx"/>
<dep package="gwenhywfar"/>
+ <dep package="gmp"/>
+ <dep package="ktoblzcheck"/>
</dependencies>
</autotools>
<autotools id="aqbanking-qt" autogen-sh="configure"
- autogenargs='--enable-ofx=yes --disable-kde --disable-chipcard-client --with-backends="aqhbci aqdtaus aqofxconnect" --with-frontends="cbanking g2banking qbanking"' >
- <branch module="aqbanking/aqbanking-2.3.3.tar.gz" version="2.3.3"
- repo="sourceforge">
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/aqbanking.patch" strip="0"/>
+ autogenargs='--enable-ofx=yes --disable-kde --disable-chipcard-client --disable-python --with-frontends="cbanking g2banking qbanking"'
+ makeargs="qt4-all" >
+ <branch module="aqbanking/aqbanking-4.2.0.tar.gz" version="4.2.0"
+ repo="github_gnucash" >
</branch>
<dependencies>
<dep package="libofx"/>
<dep package="gwenhywfar"/>
+ <dep package="gmp"/>
+ <dep package="ktoblzcheck"/>
</dependencies>
</autotools>
commit 9f8c79bcc83700ed893a4d4df0caadd6a6aadad1
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Dec 17 16:18:23 2009 -0800
Update gnucash-unstable to 2.3.8
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 263edf5..bf542eb 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -166,8 +166,8 @@
<autotools id="gnucash-unstable"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="unstable/2.3.x/gnucash-2.3.7.tar.gz" version="2.3.7"
- repo="gnucash.org"/>
+ <branch module="gnucash/gnucash-2.3.8.tar.gz" version="2.3.8"
+ repo="sourceforge"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
<dep package="meta-goffice"/>
commit 8aeb22c8d299592c4f335c1ad06e53a45faf4404
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Dec 17 10:28:50 2009 -0800
Fix libdbi & libdbi-drivers to autogen instead of libtoolize
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 3654b1a..263edf5 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -106,14 +106,15 @@
</dependencies>
</autotools>
- <autotools id="libdbi" autogen-template="libtoolize & %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" autogenargs='--disable-docs GCC="gcc"'>
+ <autotools id="libdbi" autogen-template="%(srcdir)s/autogen.sh && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ autogenargs="--disable-docs">
<branch repo="sourceforge" module="libdbi/libdbi-0.8.3.tar.gz"
version="0.8.3">
<patch file="http://github.com/jralls/gtk-osx-build/raw/master/patches/dbi.patch" strip="1"/>
</branch>
</autotools>
- <autotools id="libdbi-drivers" autogen-template="libtoolize & %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ <autotools id="libdbi-drivers" autogen-template="%(srcdir)s/autogen.sh && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--with-sqlite3 --disable-docs --with-sqlite3-incdir="/usr/include" --with-sqlite3-libdir="/usr/lib" '>
<branch repo="sourceforge" version="0.8.3-1"
module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz">
commit 1394c5741b0a6f04918de2ebf66863fbc5faa481
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Dec 17 10:27:32 2009 -0800
Pull gnucash stable tarball from sourceforge
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 1c43a05..3654b1a 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -129,7 +129,7 @@
<autotools id="gnucash" autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc">
<branch module="stable/gnucash-2.2.9.tar.gz" version="2.2.9"
- repo="gnucash.org">
+ repo="sourceforge">
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-xlib.patch" strip="0"/>
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-in.patch" strip="0"/>
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-integration.patch" strip="1"/>
commit 9a96e0fde8fa640cbcc0bba204389f37ff0871d0
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Dec 17 10:25:46 2009 -0800
Update Libofx
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index ee52538..1c43a05 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -75,8 +75,8 @@
</autotools>
<autotools id="libofx" autogen-sh='configure'>
- <branch repo="sourceforge" module="libofx/libofx-0.8.3.tar.gz"
- version='0.8.3'/>
+ <branch repo="sourceforge" module="libofx/libofx-0.9.1.tar.gz"
+ version='0.9.1'/>
<dependencies>
<dep package='guile-1.6'/>
<dep package="OpenSP"/>
commit 0d09b918ae59122d129542b11510d5139f8f6e99
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Dec 17 10:25:02 2009 -0800
Add fonts config to stable bundle
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index be73a0f..bafc59c 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -165,6 +165,10 @@
</data>
<data>
+ ${prefix}/etc/fonts
+ </data>
+
+ <data>
${prefix}/etc/gconf
</data>
commit 8c4039956a49f68ab1af631f750edc5702e507a7
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Dec 17 10:24:04 2009 -0800
Match gwenhywfar changes to stable bundle
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 8b5c552..f3f9083 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -82,6 +82,10 @@
</binary>
<binary>
+ ${prefix}/lib/gwenhywfar
+ </binary>
+
+ <binary>
${prefix}/lib/libglade
</binary>
@@ -160,6 +164,10 @@
</data>
<data>
+ ${prefix}/etc/gwen-public-ca.crt
+ </data>
+
+ <data>
${prefix}/etc/fonts
</data>
@@ -191,10 +199,6 @@
${prefix}/share/aqbanking
</data>
- <binary>
- ${prefix}/lib/gwenhywfar
- </binary>
-
<data>
${prefix}/share/libofx
</data>
commit a62d268a55951589c5e282f0db233e00910ed025
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Dec 17 10:23:22 2009 -0800
Update unstable version to 2.3.8
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 65b35a1..12c617d 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.3.7 © 2009 Free Software Foundation</string>
+ <string>Gnucash version 2.3.8 © 2009 Free Software Foundation</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.3.7 © 2009 Free Software Foundation</string>
+ <string>2.3.8 © 2009 Free Software Foundation</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.3.7</string>
+ <string>2.3.8</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.3.7</string>
+ <string>2.3.8</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
commit 697fb64a5d38f568e24912eb9b87f03ac2ae8f19
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Dec 8 14:53:16 2009 -0800
Replace libtoolize with autoinit.sh; existing configure didn't like newer libtool. Add --disable-nls, po/Makefile.in.in doesn't work with newer automakes.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index b677818..ee52538 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -68,8 +68,8 @@
back and find the link step, copy and paste it, adding the
architecture flags, and fire away. Then you can exit the shell
and rerun build and it will work OK. -->
- <autotools id="OpenSP" autogen-template="libtoolize & %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
- autogenargs="--disable-static --enable-shared --disable-doc-build">
+ <autotools id="OpenSP" autogen-template="%(srcdir)s/autoinit.sh && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ autogenargs="--disable-static --enable-shared --disable-doc-build --disable-nls">
<branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
version='1.5.2'/>>
</autotools>
commit 4fe06252cce2282ea0305c4a084ddfc46bf7a9a8
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Dec 8 10:43:32 2009 -0800
Add gwenhywfar plugins to bundle.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index e84b687..8b5c552 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -191,6 +191,10 @@
${prefix}/share/aqbanking
</data>
+ <binary>
+ ${prefix}/lib/gwenhywfar
+ </binary>
+
<data>
${prefix}/share/libofx
</data>
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 37cee97..be73a0f 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -82,6 +82,10 @@
</binary>
<binary>
+ ${prefix}/lib/gwenhywfar
+ </binary>
+
+ <binary>
${prefix}/lib/libglade
</binary>
commit f3a1265555559cb9789448e8d993aa92c6c49128
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Nov 19 11:58:20 2009 -0800
Changed doc source in unstable to point to installation directory reflecting change in gnucash. Comment in gnucash.bundle to remind me to do the same at the next release. Module gnucash-docs-svn changed to install html.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index b30a488..e84b687 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -234,11 +234,11 @@
</data>
<data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Help/">
- /Users/john/gtk/source/gnucash-docs-svn/help/C/gnucash-help/
+ ${prefix}/share/gnome/help/gnucash/C/gnucash-help
</data>
<data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Guide/">
- /Users/john/gtk/source/gnucash-docs-svn/guide/C/gnucash-guide/
+ ${prefix}/share/gnome/help/gnucash/C/gnucash-guide/
</data>
<translations name="gnucash">
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 41b5e8a..37cee97 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -229,7 +229,7 @@
<data dest="${bundle}/Contents/Resources/Sources">
${project}/Sources
</data>
-
+<!-- These can be pointed to ${prefix} like in unstable for the 2.4 release -->
<data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Help/">
${env:HOME}/gtk/source/gnucash-docs-2.2.0/help/C/gnucash-help/
</data>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 873f995..b677818 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -184,7 +184,7 @@
<autotools id="gnucash-docs-svn" autogenargs="--disable-scrollkeeper"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
- makeargs=" html" >
+ makeargs=" html" makeinstallargs="install-html" >
<branch repo="svn.gnucash.org" module="gnucash-docs"/>
<dependencies>
<!-- dep package="scrollkeeper"/ -->
commit 23bd5b1125f8d29f82809aa3cbe388b7d57a69e7
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Nov 19 10:35:55 2009 -0800
Change documentation source to $HOME/gtk/source from /usr/local/gnome
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index ef54b16..41b5e8a 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -231,11 +231,11 @@
</data>
<data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Help/">
- /usr/local/src/gnome/gnucash-docs-2.2.0/help/C/gnucash-help/
+ ${env:HOME}/gtk/source/gnucash-docs-2.2.0/help/C/gnucash-help/
</data>
<data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Guide/">
- /usr/local/src/gnome/gnucash-docs-2.2.0/guide/C/gnucash-guide/
+ ${env:HOME}/gtk/source/gnucash-docs-2.2.0/guide/C/gnucash-guide/
</data>
<translations name="gnucash">
commit 3bbaa53d2724f39f9a7b163231c4496694ac8b37
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Nov 19 09:43:09 2009 -0800
Libtoolize OpenSP, libdbi, and libdbi-drivers; patch dbi & libdbi to leave CFLAGS alone for darwin.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 48e950a..873f995 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -25,6 +25,7 @@
<include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/>
+
<include href="gtkhtml.modules"/>
<include href="goffice.modules"/>
@@ -67,7 +68,7 @@
back and find the link step, copy and paste it, adding the
architecture flags, and fire away. Then you can exit the shell
and rerun build and it will work OK. -->
- <autotools id="OpenSP" autogen-sh='configure'
+ <autotools id="OpenSP" autogen-template="libtoolize & %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs="--disable-static --enable-shared --disable-doc-build">
<branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
version='1.5.2'/>>
@@ -105,15 +106,19 @@
</dependencies>
</autotools>
- <autotools id="libdbi" autogen-sh="configure" autogenargs='--disable-docs GCC="gcc"'>
+ <autotools id="libdbi" autogen-template="libtoolize & %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" autogenargs='--disable-docs GCC="gcc"'>
<branch repo="sourceforge" module="libdbi/libdbi-0.8.3.tar.gz"
- version="0.8.3"/>
+ version="0.8.3">
+ <patch file="http://github.com/jralls/gtk-osx-build/raw/master/patches/dbi.patch" strip="1"/>
+ </branch>
</autotools>
- <autotools id="libdbi-drivers" autogen-sh="configure"
+ <autotools id="libdbi-drivers" autogen-template="libtoolize & %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs='--with-sqlite3 --disable-docs --with-sqlite3-incdir="/usr/include" --with-sqlite3-libdir="/usr/lib" '>
<branch repo="sourceforge" version="0.8.3-1"
- module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz" />
+ module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz">
+ <patch file="http://github.com/jralls/gtk-osx-build/raw/master/patches/dbi-drv.patch" strip="1"/>
+ </branch>
<dependencies>
<dep package="libdbi"/>
</dependencies>
commit 9e5f59f48c8c8d527157c5c5bf045afb34a600c8
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Nov 19 09:40:00 2009 -0800
Updated version string
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 16e267b..65b35a1 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.3.5 © 2009 Free Software Foundation</string>
+ <string>Gnucash version 2.3.7 © 2009 Free Software Foundation</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.3.5 © 2009 Free Software Foundation</string>
+ <string>2.3.7 © 2009 Free Software Foundation</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.3.5</string>
+ <string>2.3.7</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.3.5</string>
+ <string>2.3.7</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
commit 33a4d5abb74918c7c2a516c5f3f1bf9727772a5d
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Oct 18 18:01:12 2009 -0700
Update module versions to latest stable releases.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 5340582..48e950a 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -61,6 +61,12 @@
</dependencies>
</autotools>
+<!-- Note for cross-compilation: libtool, for reasons known only to
+ itself, ignores the CFLAGS and links libosp.5.0.0.la with the
+ native architecture. When jhbuild stops, start a shell and go
+ back and find the link step, copy and paste it, adding the
+ architecture flags, and fire away. Then you can exit the shell
+ and rerun build and it will work OK. -->
<autotools id="OpenSP" autogen-sh='configure'
autogenargs="--disable-static --enable-shared --disable-doc-build">
<branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
@@ -124,7 +130,7 @@
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-integration.patch" strip="1"/>
</branch>
<dependencies>
- <dep package="meta-goffice"/>
+ <dep package="goffice-0.7.4"/>
<dep package="meta-gtk-osx-core"/>
<dep package="libofx"/>
<!--dep package="aqbanking"/-->
diff --git a/modulesets/goffice.modules b/modulesets/goffice.modules
index e6dc691..4f7b4e8 100644
--- a/modulesets/goffice.modules
+++ b/modulesets/goffice.modules
@@ -14,35 +14,33 @@
</metamodule>
<autotools id="goffice">
- <!--
-You need: Debian package name
- glib >= 2.8.0 libglib2.0-dev
- gtk+ >= 2.6.0 libgtk2.0-dev
- pango >= 1.8.1 libpango1.0-dev
- libgsf >= 1.13.3 libgsf-1-dev
- libglade >= 2.3.6 libglade2-dev
- gnome-xml >= 2.4.12 libxml2-dev
- NOTE: gnome-xml is also known as libxml
- libart >= 2.3.11 libart-2.0-dev
- -->
+ <branch module="goffice/0.7/goffice-0.7.14.tar.bz2" version="0.7.14"
+ hash="sha256:0fe2f4d7c39e85b5b577c6fa7a88c9a135ae5819cc521083af888e4c23deaacd"/>
+ <dependencies>
+ <dep package="gtk+"/>
+ <dep package="libgsf"/>
+ <dep package="libxml2"/>
+ <dep package="libglade"/>
+ <dep package="libart_lgpl"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="goffice-0.7.4">
<!-- gnucash 2.2.9 won't build against newer GOffice. -->
<branch module="goffice/0.7/goffice-0.7.4.tar.bz2" version="0.7.4"
md5sum="8fe65cb6a60e6064025fa465da99d31e"/>
<dependencies>
- <dep package="glib"/>
+ <dep package="gtk+"/>
<dep package="libgsf"/>
<dep package="libxml2"/>
- <dep package="pango"/>
<dep package="libglade"/>
<dep package="libart_lgpl"/>
-<!-- <dep package="gtk-doc"/> -->
- <dep package="libxml2"/>
</dependencies>
</autotools>
- <autotools id="libgsf">
- <branch module="libgsf/1.14/libgsf-1.14.15.tar.bz2" version="1.14.15"
- md5sum="5118e971b4257f50b6914404593f63cf"/>
+ <autotools id="libgsf" autogenargs="--without-python">
+ <branch module="libgsf/1.14/libgsf-1.14.16.tar.bz2" version="1.14.16"
+ hash="sha256:11fd8fca1bdbcfa426276a124ad083cca9632f03cf766523bcdfb2fca0b08908"/>
<dependencies>
<dep package="glib"/>
<dep package="gnome-vfs"/>
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index 4ec5857..92b9479 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -56,8 +56,8 @@ later).
Optionally you may want to install GConf 1.0.7 (or later).
-->
- <branch module="gtkhtml/3.26/gtkhtml-3.26.2.tar.bz2" version="3.26.2"
- md5sum="5b109d47aaa95898a169fa9ae572c763"/>
+ <branch module="gtkhtml/3.28/gtkhtml-3.28.0.tar.bz2" version="3.28.0"
+ hash="sha2556:6290424e51770fc09701ebaf89b7089214bbb9c81223430800160beee6f42288"/>
<dependencies>
<dep package="gtk+"/>
<dep package="libgnomeui"/>
@@ -140,8 +140,8 @@ Optionally you may want to install GConf 1.0.7 (or later).
but building them on OS-X proved problematic and gnome-vfs builds well
without them -->
<autotools id="gnome-vfs">
- <branch module="gnome-vfs/2.24/gnome-vfs-2.24.1.tar.bz2" version="2/24/1"
- md5sum="100f9af16dc659e375ee8da45175a28d"/>
+ <branch module="gnome-vfs/2.24/gnome-vfs-2.24.2.tar.bz2" version="2.24.2"
+ hash="sha256:50ecf5f37d377492e8943a3c359ffe64176d4e7f045e9980790eca999a1c6856"/>
<dependencies>
<dep package="gconf"/>
<dep package="shared-mime-info"/>
@@ -151,8 +151,8 @@ Optionally you may want to install GConf 1.0.7 (or later).
</autotools>
<autotools id="libgnomeui" >
- <branch module="libgnomeui/2.24/libgnomeui-2.24.1.tar.gz" version="2.24.1"
- repo="ftp.gnome.org" md5sum="4494a9e25eebd33fdf66ef30069179ee">
+ <branch module="libgnomeui/2.24/libgnomeui-2.24.2.tar.bz2" version="2.24.2"
+ repo="ftp.gnome.org" hash="sha256:ae7459b3ddee78258bb2d619fd199b0b24647f1df45fc397fee83d659c354910">
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/libgnomeui.patch" skip="0"/>
</branch>
<dependencies>
@@ -163,20 +163,11 @@ Optionally you may want to install GConf 1.0.7 (or later).
</dependencies>
</autotools>
- <autotools id="gnome-keyring">
- <branch module="gnome-keyring/2.26/gnome-keyring-2.26.1.tar.bz2"
- version="2.26.1" md5sum="060b349a0aae130fdd3cd0a9827258c6"/>
- <dependencies>
- <dep package="gtk+"/>
- <dep package="libgcrypt"/>
- <dep package="libtasn1"/>
- </dependencies>
- </autotools>
<autotools id="libbonobo">
<!-- DEPENDS says "ORBit" -->
- <branch module="libbonobo/2.24/libbonobo-2.24.1.tar.bz2" version="2.24.1"
- md5sum="8868b6083392964a6969547ceb8d7cd1"/>
+ <branch module="libbonobo/2.24/libbonobo-2.24.2.tar.bz2" version="2.24.2"
+ hash="sha256:95c0230a31a657e1873fc601318bbaa16722986699219317053f1cd1aa2a28bf"/>
<dependencies>
<dep package="popt"/>
<dep package="ORBit2"/>
@@ -188,8 +179,8 @@ Optionally you may want to install GConf 1.0.7 (or later).
</autotools>
<autotools id="libbonoboui" autogenargs="--without-x">
- <branch module="libbonoboui/2.24/libbonoboui-2.24.1.tar.bz2"
- version="2.24.1" md5sum="9ff3ec1c7aefd0b1a15a5b21ecc7b4e4"/>
+ <branch module="libbonoboui/2.24/libbonoboui-2.24.2.tar.bz2"
+ version="2.24.2" hash="sha256:aebcf9dc56a76f4ab1ae2134920d962e12c6f7397028052658dad5b1bebdbe00"/>
<dependencies>
<dep package="libgnome"/>
<dep package="libbonobo"/>
diff --git a/patches/dbus-install.patch b/patches/dbus-install.patch
index 924a1c2..c0d445b 100644
--- a/patches/dbus-install.patch
+++ b/patches/dbus-install.patch
@@ -1,6 +1,8 @@
+--- Makefile.in~ 2009-10-15 14:49:03.000000000 -0700
++++ Makefile.in 2009-10-15 16:39:10.000000000 -0700
--- Makefile.in 2009-01-06 16:30:43.000000000 -0800
+++ Makefile.in 2009-04-19 15:06:17.000000000 -0700
-@@ -762,6 +762,8 @@
+@@ -851,6 +851,8 @@
info-am:
install-data-am: install-pkgconfigDATA
@@ -9,45 +11,43 @@
install-dvi: install-dvi-recursive
-@@ -800,7 +802,7 @@
+@@ -899,7 +899,7 @@
uninstall-am: uninstall-pkgconfigDATA
- .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-- install-strip
-+ install-data-am install-strip
+ .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+- ctags-recursive install-am install-strip tags-recursive
++ ctags-recursive install-am install-data-am install-strip tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am all-local am--refresh check check-am clean \
-@@ -809,15 +811,16 @@
- dist-zip distcheck distclean distclean-generic distclean-hdr \
- distclean-libtool distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am install-dvi \
-- install-dvi-am install-exec install-exec-am install-html \
-- install-html-am install-info install-info-am install-man \
-- install-pdf install-pdf-am install-pkgconfigDATA install-ps \
-- install-ps-am install-strip installcheck installcheck-am \
-- installdirs installdirs-am maintainer-clean \
+@@ -911,14 +911,15 @@
+ distclean-hdr distclean-libtool distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-am install-data install-data-am \
+- install-dvi install-dvi-am install-exec install-exec-am \
+- install-html install-html-am install-info install-info-am \
+- install-man install-pdf install-pdf-am install-pkgconfigDATA \
+- install-ps install-ps-am install-strip installcheck \
+- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-pkgconfigDATA
-+ install install-am install-data install-data-am \
+ install-data-hook install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
++ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkgconfigDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+ tags tags-recursive uninstall uninstall-am \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps \
++ ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-pkgconfigDATA
all-local: Doxyfile
-@@ -854,6 +857,10 @@
-
+@@ -956,6 +957,10 @@
@DBUS_GCOV_ENABLED_FALSE at check-coverage:
@DBUS_GCOV_ENABLED_FALSE@ echo "Need to reconfigure with --enable-gcov"
+
+
+install-data-hook:
+ $(mkinstalldirs) $(DESTDIR)/tmp
commit ae4bf70fa64aab20e08005513f895166dd7713b1
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 8 15:33:56 2009 -0700
Move standard arguments (--disable-docs, --without-x, etc.) to individual modules so that they don't pollute modules that don't use them.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 2e14c4b..5340582 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -99,13 +99,13 @@
</dependencies>
</autotools>
- <autotools id="libdbi" autogen-sh="configure">
+ <autotools id="libdbi" autogen-sh="configure" autogenargs='--disable-docs GCC="gcc"'>
<branch repo="sourceforge" module="libdbi/libdbi-0.8.3.tar.gz"
version="0.8.3"/>
</autotools>
<autotools id="libdbi-drivers" autogen-sh="configure"
- autogenargs='--with-sqlite3 --with-sqlite3-incdir="/usr/include" --with-sqlite3-libdir="/usr/lib"'>
+ autogenargs='--with-sqlite3 --disable-docs --with-sqlite3-incdir="/usr/include" --with-sqlite3-libdir="/usr/lib" '>
<branch repo="sourceforge" version="0.8.3-1"
module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz" />
<dependencies>
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index a5259cd..4ec5857 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -80,7 +80,8 @@ Optionally you may want to install GConf 1.0.7 (or later).
</dependencies>
</autotools>
- <autotools id="libgnomeprint" autogen.sh="autoreconf">
+ <autotools id="libgnomeprint" autogen.sh="autoreconf"
+ autogenargs="--disable-gtk-doc" >
<branch module="libgnomeprint/2.18/libgnomeprint-2.18.6.tar.gz"
repo="ftp.gnome.org" version="2.18.6"
md5sum="10a9e58aabecf541bc6852f64b3a9294">
@@ -186,7 +187,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
</dependencies>
</autotools>
- <autotools id="libbonoboui">
+ <autotools id="libbonoboui" autogenargs="--without-x">
<branch module="libbonoboui/2.24/libbonoboui-2.24.1.tar.bz2"
version="2.24.1" md5sum="9ff3ec1c7aefd0b1a15a5b21ecc7b4e4"/>
<dependencies>
commit 5526d86b160b95ac9528871bf0b3f013665bf144
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 8 15:32:09 2009 -0700
Don't use scrollkeeper when building gnucash-docs
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index acc27fd..2e14c4b 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -171,22 +171,20 @@
</autotools>
- <autotools id="gnucash-docs-svn"
+ <autotools id="gnucash-docs-svn" autogenargs="--disable-scrollkeeper"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
makeargs=" html" >
<branch repo="svn.gnucash.org" module="gnucash-docs"/>
<dependencies>
- <dep package="scrollkeeper"/>
+ <!-- dep package="scrollkeeper"/ -->
</dependencies>
</autotools>
- <autotools id="gnucash-docs" makeargs=" html" >
+ <autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
+ makeargs=" html" >
<branch repo="gnucash.org" module="stable/gnucash-docs-2.2.0.tar.gz"
version="2.2.0"/>
- <dependencies>
- <dep package="scrollkeeper"/>
- </dependencies>
- </autotools>
+ </autotools>
<autotools id="scrollkeeper">
<branch repo="sourceforge" module="scrollkeeper/scrollkeeper-0.3.14.tar.gz"
commit a8611b463b7a772129073259c8ec6fb9cd44fa53
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 8 15:30:53 2009 -0700
Update gnucash-unstable to 2.3.7
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index f8967e8..acc27fd 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -154,7 +154,7 @@
<autotools id="gnucash-unstable"
autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
- <branch module="unstable/2.3.x/gnucash-2.3.5.tar.gz" version="2.3.5"
+ <branch module="unstable/2.3.x/gnucash-2.3.7.tar.gz" version="2.3.7"
repo="gnucash.org"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit 262e23ad504abec7027a24c48a0d8603ef90de64
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 8 15:23:46 2009 -0700
Copy Guillaume Lessard's dbus-killer code from gnucash-unstable.launcher
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index 8242bdf..36eafc1 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -146,6 +146,18 @@ elif [ ! -e "$PREFIX" ] ; then
fi
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+ # If we get here without a way to connect to an instance of dbus-daemon,
+ # then we can kill any existing instances of dbus-daemon that originate
+ # in this copy of Gnucash.
+
+ DBUS_PIDS=`ps ux | grep dbus-daemon | grep "${PREFIX}" | awk '{print $2}'`
+
+ if /bin/test "$DBUS_PIDS"; then
+ for DBUS_PID in ${DBUS_PIDS}
+ do
+ /bin/kill "${DBUS_PID}"
+ done
+fi
eval `dbus-launch --sh-syntax --exit-with-session --config-file=$bundle_res/etc/dbus-1/session.conf`
fi
commit 54f8d555b04a0e50c1371112f037efcf63b18b79
Merge: 3f638e2 aac603a
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 8 15:22:56 2009 -0700
Merge branch 'master' of git at github.com:jralls/gnucash-on-osx
commit aac603a0911bce68cf9f5ead35883b591fa7a1c2
Author: Guillaume Lessard <glessard at tffenterprises.com>
Date: Sat Oct 3 12:43:37 2009 +0800
Changes launcher to manage stray copies of dbus-daemon.
Terminate previous instances of dbus-daemon before launching a new one.
One instance of dbus-daemon will be left behind after Gnucash terminates,
but multiple Gnucash sessions won't result in multiple dbus-daemons.
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index be2bad8..b088ec4 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -146,6 +146,19 @@ elif [ ! -e "$PREFIX" ] ; then
fi
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+ # If we get here without a way to connect to an instance of dbus-daemon,
+ # then we can kill any existing instances of dbus-daemon that originate
+ # in this copy of Gnucash.
+
+ DBUS_PIDS=`ps ux | grep dbus-daemon | grep "${PREFIX}" | awk '{print $2}'`
+
+ if /bin/test "$DBUS_PIDS"; then
+ for DBUS_PID in ${DBUS_PIDS}
+ do
+ /bin/kill "${DBUS_PID}"
+ done
+ fi
+
eval `dbus-launch --sh-syntax --exit-with-session --config-file=$bundle_res/etc/dbus-1/session.conf`
fi
commit 3f638e23f7aaf08b65319542a0f42aafe05aa3d2
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 1 12:50:29 2009 -0700
New icns file graciously provided by rangerfx1 at yahoo.com
diff --git a/gnucash-bundler/gnucash.icns b/gnucash-bundler/gnucash.icns
index 28737f5..46c870a 100644
Binary files a/gnucash-bundler/gnucash.icns and b/gnucash-bundler/gnucash.icns differ
commit bd0e2aadb6a68d8f61025794a0244d9f28f35099
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 25 13:35:30 2009 -0700
Add font config directory
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index c6b82f1..b30a488 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -160,6 +160,10 @@
</data>
<data>
+ ${prefix}/etc/fonts
+ </data>
+
+ <data>
${prefix}/etc/gconf
</data>
commit 81d710a856d7485b0f86359ca55b74f47865a332
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 25 13:35:04 2009 -0700
Bundle unstable help docs.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index da96643..c6b82f1 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -230,11 +230,11 @@
</data>
<data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Help/">
- /usr/local/src/gnome/gnucash-docs-2.2.0/help/C/gnucash-help/
+ /Users/john/gtk/source/gnucash-docs-svn/help/C/gnucash-help/
</data>
<data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Guide/">
- /usr/local/src/gnome/gnucash-docs-2.2.0/guide/C/gnucash-guide/
+ /Users/john/gtk/source/gnucash-docs-svn/guide/C/gnucash-guide/
</data>
<translations name="gnucash">
commit 4ad66de14b2451ca1d0a3248f4e63df09f452852
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 25 13:34:39 2009 -0700
Fix typo
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index c22a72d..da96643 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -31,7 +31,7 @@
not needed. If the source path is left out, the default
script will be used.
-->
- <launcher-script>${project}/gnucash-unstable-launcher</launcher-script>
+ <launcher-script>${project}/gnucash-unstable.launcher</launcher-script>
<!-- Not implemented: Optional runtime, could be python or mono
for example.
commit 9a33e7f5497977f4c178013c95088dd6ba9d4248
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 25 13:33:55 2009 -0700
New environment variables.
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index fee5501..be2bad8 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -163,6 +163,8 @@ EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib/gnucash"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
export DYLD_FRAMEWORK_PATH="${bundle_fw}"
+export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/guile-modules/gnucash/report/standard-reports"
+export GNC_DBD_DIR="${bundle_lib}/dbd"
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
commit e64b239b1370f719bd0711dfd831574f40301cdc
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 25 13:33:18 2009 -0700
Create gnucash-docs-svn module to go with gnucash-unstable
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 1f16491..f8967e8 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -171,6 +171,15 @@
</autotools>
+ <autotools id="gnucash-docs-svn"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ makeargs=" html" >
+ <branch repo="svn.gnucash.org" module="gnucash-docs"/>
+ <dependencies>
+ <dep package="scrollkeeper"/>
+ </dependencies>
+ </autotools>
+
<autotools id="gnucash-docs" makeargs=" html" >
<branch repo="gnucash.org" module="stable/gnucash-docs-2.2.0.tar.gz"
version="2.2.0"/>
commit fc65c2d30a0f0bb9ef3680371cbbf388c528d1e5
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 25 13:32:25 2009 -0700
Use WebKit instead of GtkHTML for Gnucash-unstable
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 21f72f1..1f16491 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -153,7 +153,7 @@
</autotools>
<autotools id="gnucash-unstable"
- autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi ">
+ autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-html-engine="webkit"'>
<branch module="unstable/2.3.x/gnucash-2.3.5.tar.gz" version="2.3.5"
repo="gnucash.org"/>
<dependencies>
@@ -162,8 +162,11 @@
<dep package="libofx"/>
<!-- dep package="aqbanking"/ -->
<dep package="aqbanking-qt"/>
- <dep package="meta-gtkhtml"/>
+ <!-- dep package="meta-gtkhtml"/ -->
+ <dep package="WebKit"/>
+ <dep package="libgnomeui"/>
<dep package="Slib"/>
+ <dep package="libdbi-drivers"/>
</dependencies>
</autotools>
commit 69cd2d349fdca47fc005822ef2bc44384491d2d3
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 25 13:31:35 2009 -0700
Change rev to 2.3.5 for gnucash-unstable
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 7021b76..21f72f1 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -154,7 +154,7 @@
<autotools id="gnucash-unstable"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi ">
- <branch module="unstable/gnucash-2.3.4.tar.gz" version="2.3.4"
+ <branch module="unstable/2.3.x/gnucash-2.3.5.tar.gz" version="2.3.5"
repo="gnucash.org"/>
<dependencies>
<dep package="meta-gtk-osx-core"/>
commit a42d31cdad1498270c69ca09d501c12625f2c493
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 25 13:19:01 2009 -0700
Remove autogen-template from gnucash-unstable module
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 4bf44c2..7021b76 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -153,7 +153,6 @@
</autotools>
<autotools id="gnucash-unstable"
- autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi ">
<branch module="unstable/gnucash-2.3.4.tar.gz" version="2.3.4"
repo="gnucash.org"/>
commit 23a8e462d896e9ad44c567371e21658f52985c5b
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 25 13:18:01 2009 -0700
Fix aqbanking-qt patch and module args so that it works.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 00d212d..4bf44c2 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -50,7 +50,7 @@
</autotools>
<autotools id="aqbanking-qt" autogen-sh="configure"
- autogenargs='--enable-ofx=yes --disable-kde --disable-chipcard-client --with-backends="aqhbci aqdtaus aqofxconnect" --with-frontends="cbanking g2banking qbanking"' makeargs="qt4-all" >
+ autogenargs='--enable-ofx=yes --disable-kde --disable-chipcard-client --with-backends="aqhbci aqdtaus aqofxconnect" --with-frontends="cbanking g2banking qbanking"' >
<branch module="aqbanking/aqbanking-2.3.3.tar.gz" version="2.3.3"
repo="sourceforge">
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/aqbanking.patch" strip="0"/>
diff --git a/patches/aqbanking.patch b/patches/aqbanking.patch
index 127a6d4..39fbb10 100644
--- a/patches/aqbanking.patch
+++ b/patches/aqbanking.patch
@@ -25,15 +25,12 @@
.arg(fname)
--- Makefile.in 2007-10-15 12:48:21.000000000 -0700
+++ Makefile.in 2009-08-25 14:01:07.000000000 -0700
-@@ -551,6 +551,11 @@
+@@ -548,6 +548,7 @@
+ ilocaledir = $(datadir)/locale
+ qtlocaledir = $(pkgdatadir)/i18n
all: $(BUILT_SOURCES) config.h
++ $(MAKE) $(AM_MAKEFLAGS) qt4-port
$(MAKE) $(AM_MAKEFLAGS) all-recursive
-+qt4-all: config.h
-+ $(MAKE) $(AM_MAKEFLAGS) clean
-+ $(MAKE) $(AM_MAKEFLAGS) qt4-port
-+ $(MAKE) $(AM_MAKEFLAGS) all
-+
.SUFFIXES:
- am--refresh:
- @:
+
commit 5fd71a1a09d3b044ff7c3d8efb59100e961a4a46
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 8 12:51:33 2009 -0700
Added Gwenhywfr certificate to bundle
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index a4fae7b..ef54b16 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -157,6 +157,10 @@
</data>
<data>
+ ${prefix}/etc/gwen-public-ca.crt
+ </data>
+
+ <data>
${prefix}/etc/gconf
</data>
commit 89b963b7befc8166bb6e06e9d06446f03fde2b5f
Merge: 0ec5c52 1edf0bf
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Sep 7 12:40:31 2009 -0700
Merge branch 'self-contained'
diff --cc gnucash-bundler/gnucash.bundle
index 2c27dc9,454ca59..a4fae7b
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@@ -114,21 -114,21 +114,22 @@@
</framework>
<framework>
- /Library/Frameworks/Qt3Support.framework
- </framework>
+ /Library/Frameworks/Stripped/Qt3Support.framework
+ </framework>
<framework>
- /Library/Frameworks/QtSql.framework
- </framework >
+ /Library/Frameworks/Stripped/QtSql.framework
+ </framework>
<framework>
- /Library/Frameworks/QtXml.framework
- </framework>
+ /Library/Frameworks/Stripped/QtXml.framework
+ </framework>
+
+ <framework>
+ /Library/Frameworks/Stripped/QtNetwork.framework
+ </framework>
- <framework>
- /Library/Frameworks/QtNetwork.framework
- </framework -->
+
<!-- Data to copy in, usually Glade/UI files, images, sounds files
etc. The destination inside the bundle can be specified if the
files should end up at a different location, by using the
commit 0ec5c529bc73e8c5923202ef827f252c20d2d71a
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 30 12:45:54 2009 -0700
partially fix qt4-all target
diff --git a/patches/aqbanking.patch b/patches/aqbanking.patch
index 98db039..127a6d4 100644
--- a/patches/aqbanking.patch
+++ b/patches/aqbanking.patch
@@ -29,10 +29,10 @@
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
-+qt4-all: $(BUILT_SOURCES) config.h
++qt4-all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) clean
+ $(MAKE) $(AM_MAKEFLAGS) qt4-port
-+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
++ $(MAKE) $(AM_MAKEFLAGS) all
+
.SUFFIXES:
am--refresh:
commit 1edf0bfdc59298d8359adab16b6326cebda51ba0
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Sep 2 15:48:15 2009 -0700
Modified bundler stuff for building the unstable branch so a release bundle isn't spoiled by mistake
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
new file mode 100644
index 0000000..16e267b
--- /dev/null
+++ b/gnucash-bundler/Info-unstable.plist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>Gnucash</string>
+ <key>CFBundleGetInfoString</key>
+ <string>Gnucash version 2.3.5 © 2009 Free Software Foundation</string>
+ <key>CFBundleIconFile</key>
+ <string>gnucash.icns</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.gnucash.Gnucash</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleLongVersionString</key>
+ <string>2.3.5 © 2009 Free Software Foundation</string>
+ <key>CFBundleName</key>
+ <string>Gnucash</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>2.3.5</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>2.3.5</string>
+ <key>CSResourcesFileMapped</key>
+ <true/>
+ <key>LSRequiresCarbon</key>
+ <true/>
+ <key>NSHumanReadableCopyright</key>
+ <string>Copyright 2009 Free Software Foundation</string>
+</dict>
+</plist>
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
new file mode 100644
index 0000000..c22a72d
--- /dev/null
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -0,0 +1,268 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<app-bundle>
+
+ <meta>
+ <!-- Where to pick up the GTK+ installation, icon themes,
+ etc. Note that "${env:PREFIX}" is evaluated to the value of
+ the environment variable PREFIX, and likewise with HOME. You
+ can define additional prefixes and refer to them in paths
+ throughout this file on the form "${prefix:name}". This is
+ useful for installing certain libraries or even the
+ application itself separately.
+ -->
+ <prefix name="default">${env:PREFIX}</prefix>
+
+ <!-- The project directory is the default location of the created
+ app. If you leave out the path, the current directory is
+ used.
+ -->
+ <destination overwrite="yes">${env:HOME}</destination>
+
+ <image>
+ <!-- Not implemented yet (DMG image). -->
+ </image>
+ <!-- Comment this out to keep the install names in binaries -->
+ <run-install-name-tool/>
+
+
+ <!-- Optionally specify a launcher script to use. If the
+ application sets up everything needed itself, like
+ environment variable, linker paths, etc, a launcher script is
+ not needed. If the source path is left out, the default
+ script will be used.
+ -->
+ <launcher-script>${project}/gnucash-unstable-launcher</launcher-script>
+
+ <!-- Not implemented: Optional runtime, could be python or mono
+ for example.
+ -->
+ <!--runtime copy="yes">/usr/bin/python</runtime-->
+ </meta>
+
+ <!-- The special macro "${project}" refers to the directory where
+ this bundle file is located. The application name and bundle
+ identifier are taken from the plist file.
+ -->
+ <plist>${project}/Info-unstable.plist</plist>
+
+ <main-binary>${prefix}/bin/gnucash-bin</main-binary>
+
+ <!-- Copy in GTK+ and Pango modules. Note the use of the
+ "${pkg:module:variable}" macro, which evaluates to a pkg-config
+ variable in the specified module. Note that any libraries that
+ binaries link to are also copied in automatically.
+ -->
+ <binary>
+ ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/loaders/*.so
+ </binary>
+<!-- Copy in the theme engines. -->
+ <binary>
+ ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/engines/*.so
+ </binary>
+
+ <binary>
+ ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-fc.so
+ </binary>
+
+ <binary>
+ ${prefix}/lib/GConf/2/*.so
+ </binary>
+
+ <!-- Seems to get missed by the dependency resolver -->
+ <binary>
+ ${prefix}/lib/libguile-srfi*
+ </binary>
+
+ <binary>
+ ${prefix}/lib/gnucash
+ </binary>
+
+ <binary>
+ ${prefix}/lib/aqbanking
+ </binary>
+
+ <binary>
+ ${prefix}/lib/libglade
+ </binary>
+
+ <binary>
+ ${prefix}/libexec
+ </binary>
+
+ <binary>
+ ${prefix}/bin/dbus-launch
+ </binary>
+
+ <binary>
+ ${prefix}/bin/dbus-daemon
+ </binary>
+
+ <binary>
+ ${prefix}/bin/gnc-*
+ </binary>
+
+ <binary>
+ ${prefix}/lib/goffice
+ </binary>
+
+ <binary>
+ ${prefix}/lib/dbd
+ </binary>
+
+ <framework>
+ /Library/Frameworks/Stripped/QtCore.framework
+ </framework>
+
+ <framework>
+ /Library/Frameworks/Stripped/QtGui.framework
+ </framework>
+
+ <framework>
+ /Library/Frameworks/Stripped/Qt3Support.framework
+ </framework>
+
+ <framework>
+ /Library/Frameworks/Stripped/QtSql.framework
+ </framework>
+
+ <framework>
+ /Library/Frameworks/Stripped/QtXml.framework
+ </framework>
+
+ <framework>
+ /Library/Frameworks/Stripped/QtNetwork.framework
+ </framework>
+
+<!-- Data to copy in, usually Glade/UI files, images, sounds files
+ etc. The destination inside the bundle can be specified if the
+ files should end up at a different location, by using the
+ "dest" property. The destination must then start with the macro
+ "${bundle}", which refers to the bundle root directory.
+ -->
+ <data>
+ ${prefix}/etc/gnucash
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/lib/">
+ ${prefix}/lib/libguile-srfi-srfi-*.la
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/lib/">
+ ${prefix}/lib/libgnc-*.la
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/lib/">
+ ${prefix}/lib/libofx.la
+ </data>
+
+ <data>
+ ${prefix}/etc/xdg
+ </data>
+
+ <data>
+ ${prefix}/etc/gconf
+ </data>
+
+ <data>
+ ${prefix}/share/gnucash
+ </data>
+
+ <data>
+ ${prefix}/share/guile
+ </data>
+
+ <data>
+ ${prefix}/share/gnome
+ </data>
+
+ <data>
+ ${prefix}/share/GConf
+ </data>
+
+ <data>
+ ${prefix}/share/dbus-1/
+ </data>
+
+ <data>
+ ${prefix}/share/aqbanking
+ </data>
+
+ <data>
+ ${prefix}/share/libofx
+ </data>
+
+ <data>
+ ${prefix}/share/aqhbci
+ </data>
+
+ <data>
+ ${prefix}/share/mime
+ </data>
+
+ <data>
+ ${prefix}/share/themes
+ </data>
+
+ <!--data dest="${bundle}/Contents/Resources/slib"-->
+ <data>
+ ${prefix}/lib/slib
+ </data>
+
+ <data dest="${bundle}/Contents/Resources">
+ ${project}/gnucash.icns
+ </data>
+
+
+ <data dest='${bundle}/Contents/Resources/var/lib/dbus/machine-id'>
+ ${prefix}/var/lib/dbus/machine-id
+ </data>
+
+ <data dest='${bundle}/Contents/Resources/etc/dbus-1/'>
+ ${prefix}/etc/dbus-1/
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/License">
+ ${prefix}/share/gnucash/doc/LICENSE
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/Sources">
+ ${project}/Sources
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Help/">
+ /usr/local/src/gnome/gnucash-docs-2.2.0/help/C/gnucash-help/
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Guide/">
+ /usr/local/src/gnome/gnucash-docs-2.2.0/guide/C/gnucash-guide/
+ </data>
+
+ <translations name="gnucash">
+ ${prefix}/share/locale
+ </translations>
+
+ <translations name="aqbanking">
+ ${prefix}/share/locale
+ </translations>
+
+<!-- This takes the Quartz theme instructions from the package and puts them in the bundle gtkrc file. You may want to cusomize the source path if you want a different theme, or if you want other stuff in your gtkrc.
+
+ <data dest='${bundle}/Contents/Resources/etc/gtk-2.0/gtkrc'>
+ ${prefix}/share/themes/Quartz/gtk-2.0/gtkrc
+ </data>
+-->
+
+ <!-- Icon themes to copy. The "icons" property can be either of
+ "auto", "all", or "none". All or none should be
+ self-explanatory, while auto means that the script will try to
+ figure out which icons are needed. This is done by getting all
+ the strings from all copied binaries, and matching them against
+ icon names. To be safe, you should use "all". "none" is useful
+ if you want just the index.theme file but no icons, mostly
+ needed for the "hicolor" base theme.
+ -->
+ <!-- icon-theme icons="auto"/>
+ Tango
+ </icon-theme -->
+
+</app-bundle>
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
new file mode 100755
index 0000000..fee5501
--- /dev/null
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -0,0 +1,176 @@
+#!/bin/sh
+
+if test "x$IGE_DEBUG_LAUNCHER" != x; then
+ set -x
+fi
+
+if test "x$IGE_DEBUG_GDB" != x; then
+ EXEC="gdb --args"
+else
+ EXEC=exec
+fi
+
+export PREFIX=/opt/gnucash-2.3.x
+export PREFIXDIR="`dirname $PREFIX`"
+
+name="`basename $0`"
+tmp="$0"
+tmp=`dirname "$tmp"`
+tmp=`dirname "$tmp"`
+bundle=`dirname "$tmp"`
+bundle_contents="$bundle"/Contents
+bundle_res="$bundle_contents"/Resources
+bundle_fw="$bundle_contents"/Frameworks
+bundle_lib="$bundle_res"/lib
+bundle_bin="$bundle_res"/bin
+bundle_data="$bundle_res"/share
+bundle_etc="$bundle_res"/etc
+
+export DYLD_LIBRARY_PATH="$bundle_lib"
+export XDG_CONFIG_DIRS="$bundle_etc"/xdg
+export XDG_DATA_DIRS=$PREFIX/share
+export GTK_DATA_PREFIX="$bundle_data"
+export GTK_EXE_PREFIX="$bundle_res"
+export GTK_PATH="$bundle_res"
+
+export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
+export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
+export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
+export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
+
+# Set the locale-related variables appropriaty for GnuCash.
+unset LANG LC_MESSAGES LC_MONETARY
+
+# Start by trying the Collation preference, in case it's the only setting that exists.
+APPLECOLLATION=`defaults read .GlobalPreferences AppleCollationOrder`
+if test "${APPLECOLLATION}"; then
+ COLL=`ls -d /usr/share/locale/${APPLECOLLATION}*.UTF-8 2>> /dev/null`
+ if test "${COLL}"; then
+ # $COLL is potentially multi-line; concatenate lines by not using quotes.
+ export LANG=`echo ${COLL} | awk '{print $1}' | awk -F/ '{print $5}'`
+ fi
+fi
+unset APPLECOLLATION COLL
+
+# Continue by attempting to find the Locale preference.
+APPLELOCALE=`defaults read .GlobalPreferences AppleLocale`
+if test "${APPLELOCALE}"; then
+ LOCALELANG=`echo "${APPLELOCALE}" | awk -F@ '{print $1".UTF-8"}'`
+ if test -d "/usr/share/locale/${LOCALELANG}"; then
+ export LANG="${LOCALELANG}"
+ fi
+fi
+unset LOCALELANG
+
+# If there is still no locale value, then set US English as a default.
+if test -z "${LANG}"; then
+ export LANG=en_US.UTF-8
+fi
+
+# The AppleLocale setting may contain a currency-related substring.
+# Attempt to act on it.
+# First strip the string to just the currency symbol and the language symbol
+APPLECURRENCY=`echo "${APPLELOCALE}" | awk -F= '{print $2}'`
+APPLELANG=`echo "${APPLELOCALE}" | awk -F_ '{print $1}'`
+if test "${APPLECURRENCY}"; then
+ # The user has set a currency different from that of their locale.
+ # Search for a locale that uses that currency, and set LC_MONETARY accordingly.
+
+ # First try to find an LC_MONETARY file that combines the language with the currency.
+ FILES=`find /usr/share/locale/${APPLELANG}*UTF-8 -name LC_MONETARY -exec grep -H $APPLECURRENCY {} \;`
+ if test -z "$FILES"; then
+ # Otherwise try to find any LC_MONETARY file that uses that currency.
+ FILES=`find /usr/share/locale/*UTF-8 -name LC_MONETARY -exec grep -H $APPLECURRENCY {} \;`
+ fi
+
+ if test "$FILES"; then
+ # We found a locale that matches; set LC_MONETARY.
+ export LC_MONETARY=`echo ${FILES} | awk -F: '{print $1}' | awk -F/ '{print $5}'`
+ fi
+fi
+unset APPLECURRENCY APPLELANG APPLELOCALE FILES
+
+# Has a language ordering been set?
+# If so, set LC_MESSAGES accordingly; otherwise skip it.
+APPLELANGUAGES=`defaults read .GlobalPreferences AppleLanguages | awk 'length > 2' | awk -F, '{print $1}' | sed s/\ //g | sed s/-/_/ | sed s/\"//g`
+if test "$APPLELANGUAGES"; then
+ # A language ordering exists.
+ # Test, item per item, to see whether there is an corresponding locale.
+ for L in $APPLELANGUAGES
+ do
+ POS=`echo ${L} | awk '{print index(ENVIRON["LANG"], $0)}'`
+ if test $POS -eq 1; then
+ # The language symbol is a subset of the $LANG variable. We're done!
+ break
+ fi
+ # NOTE: the following may fail for the alternate Chinese localizations.
+ LC=`ls -d /usr/share/locale/${L}*.UTF-8 2>> /dev/null`
+ # $LC is potentially multi-line; concatenate lines by not using quotes.
+ if test $LC; then
+ # There is a UTF-8 locale matching this language.
+ export LC_MESSAGES=`echo ${LC} | awk '{print $1}' | awk -F/ '{print $5}'`
+ break
+ fi
+ done
+fi
+unset APPLELANGUAGES POS LC L
+
+if test -f "$bundle_lib/charset.alias"; then
+ export CHARSETALIASDIR="$bundle_lib"
+fi
+
+# Extra arguments can be added in environment.sh.
+EXTRA_ARGS="--config-path $bundle_etc/gnucash --share-path $bundle_data/gnucash --debug"
+
+if test -f "$bundle_res/environment.sh"; then
+ source "$bundle_res/environment.sh"
+fi
+
+# Strip out the argument added by the OS.
+if [ x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ]; then
+ shift 1
+fi
+
+export RESPFX=${bundle_res}
+PATH="${RESPFX}/bin:${PATH}"
+export PATH
+
+GUILE_WARN_DEPRECATED="no"
+export GUILE_WARN_DEPRECATED
+
+if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
+ osascript -e 'do shell script " if [ ! -d $PREFIX ]; then rm $PREFIX; else mv $PREFIX $PREFIX.Save; fi; ln -s $RESPFX $PREFIX" with administrator privileges '
+elif [ ! -e "$PREFIX" ] ; then
+ echo "Linking $RESPFX to $PREFIX"
+ osascript -e 'do shell script "if [ ! -d $PREFIXDIR ]; then mkdir -p $PREFIXDIR; fi; ln -s $RESPFX $PREFIX" with administrator privileges ';
+fi
+
+if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+ eval `dbus-launch --sh-syntax --exit-with-session --config-file=$bundle_res/etc/dbus-1/session.conf`
+fi
+
+GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
+
+EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/guile-modules"
+EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/scm"
+GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
+
+EXTRA_LIBS="${GNC_MODULE_PATH}"
+EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
+EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib"
+EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib/gnucash"
+
+LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
+DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
+export DYLD_FRAMEWORK_PATH="${bundle_fw}"
+
+export GNC_MODULE_PATH
+export GUILE_LOAD_PATH
+export LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
+
+if test -f "$HOME/.gnucashrc"; then
+ source "$HOME/.gnucashrc"
+fi
+
+$EXEC "$bundle_contents/MacOS/$name-bin" $* $EXTRA_ARGS
commit f5dd3911a8c2d1aa0a13afae1a003ff00f319829
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Sep 2 14:22:41 2009 -0700
Add translations for gnucash and aqbanking
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 5cc5137..454ca59 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -233,6 +233,14 @@
/usr/local/src/gnome/gnucash-docs-2.2.0/guide/C/gnucash-guide/
</data>
+ <translations name="gnucash">
+ ${prefix}/share/locale
+ </translations>
+
+ <translations name="aqbanking">
+ ${prefix}/share/locale
+ </translations>
+
<!-- This takes the Quartz theme instructions from the package and puts them in the bundle gtkrc file. You may want to cusomize the source path if you want a different theme, or if you want other stuff in your gtkrc.
<data dest='${bundle}/Contents/Resources/etc/gtk-2.0/gtkrc'>
commit 3059f88fb1ad4f689f2824a1ddbf2644740a1c60
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 17:15:30 2009 -0700
Fix error in binreloc which caused caused bad paths to be generated when there's no bundle.
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
index 984ccd3..4efcaa4 100644
--- a/patches/gnucash-integration.patch
+++ b/patches/gnucash-integration.patch
@@ -337,7 +337,7 @@ index d582a5d..032f2af 100644
/** @internal
* Find the canonical filename of the executable. Returns the filename
-@@ -61,6 +66,24 @@ _br_find_exe (GbrInitError *error)
+@@ -61,6 +66,25 @@ _br_find_exe (GbrInitError *error)
(char*)NULL);
g_free (prefix);
return result;
@@ -351,6 +351,7 @@ index d582a5d..032f2af 100644
+ }
+ if (!ige_mac_bundle_get_is_app_bundle (bundle)) {
+ *error = GBR_INIT_ERROR_MAC_NOT_APP_BUNDLE;
++ bundle = NULL;
+ return NULL;
+ }
+ ige_mac_bundle_setup_environment(bundle);
commit a33d701be0b96f3fd808ad4ca0a5c1c3b5380e69
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 14:55:56 2009 -0700
Another fix for binreloc bundle errors.
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
index f800e92..984ccd3 100644
--- a/patches/gnucash-integration.patch
+++ b/patches/gnucash-integration.patch
@@ -440,11 +440,22 @@ index d582a5d..032f2af 100644
prefix = gbr_find_prefix (NULL);
if (prefix == NULL) {
-@@ -519,6 +569,7 @@ gbr_find_bin_dir (const gchar *default_bin_dir)
+@@ -519,4 +569,5 @@ gbr_find_bin_dir (const gchar *default_bin_dir)
dir = g_build_filename (prefix, "bin", NULL);
g_free (prefix);
return dir;
+#endif //ENABLE_BINRELOC && MAC_INTEGRATION
}
-
-
+--- a/src/engine/binreloc.h 2008-01-07 17:06:44.000000000 -0800
++++ b/src/engine/binreloc.h 2009-08-27 14:50:44.000000000 -0700
+@@ -28,6 +28,10 @@
+ GBR_INIT_ERROR_READ_MAPS,
+ /** The file format of /proc/self/maps is invalid; kernel bug? */
+ GBR_INIT_ERROR_INVALID_MAPS,
++ /** BinReloc determined that gnucash is not running from a bundle */
++ GBR_INIT_ERROR_MAC_NOT_BUNDLE,
++ /** Binreloc determined that the bundle is not an app bundle */
++ GBR_INIT_ERROR_MAC_NOT_APP_BUNDLE,
+ /** BinReloc is disabled (the ENABLE_BINRELOC macro is not defined). */
+ GBR_INIT_ERROR_DISABLED
+ } GbrInitError;
commit 3222cce3d5f7cfb32c72b709452da6a76844f114
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Sep 2 11:42:38 2009 -0700
Use stripped frameworks (You'll have to copy and strip them manually)
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 1d5bb35..5cc5137 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -106,27 +106,27 @@
</binary>
<framework>
- /Library/Frameworks/QtCore.framework
+ /Library/Frameworks/Stripped/QtCore.framework
</framework>
<framework>
- /Library/Frameworks/QtGui.framework
+ /Library/Frameworks/Stripped/QtGui.framework
</framework>
<framework>
- /Library/Frameworks/Qt3Support.framework
+ /Library/Frameworks/Stripped/Qt3Support.framework
</framework>
<framework>
- /Library/Frameworks/QtSql.framework
+ /Library/Frameworks/Stripped/QtSql.framework
</framework>
<framework>
- /Library/Frameworks/QtXml.framework
+ /Library/Frameworks/Stripped/QtXml.framework
</framework>
<framework>
- /Library/Frameworks/QtNetwork.framework
+ /Library/Frameworks/Stripped/QtNetwork.framework
</framework>
<!-- Data to copy in, usually Glade/UI files, images, sounds files
commit 74cd25e03d9e577a9e338cf91584493766f4a91b
Author: Guillaume Lessard <glessard at Milestones.local>
Date: Wed Sep 2 04:45:47 2009 +0800
Revamped the locale-detection portion of gnucash-launcher to take into account all four locale-related variables published by Mac OS X (see "defaults .GlobalPreferences").
Signed-off-by: John Ralls <jralls at ceridwen.us>
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index 2714887..8242bdf 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -38,8 +38,82 @@ export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
-# We need a UTF-8 locale.
-export LANG="`grep \`defaults read .GlobalPreferences AppleCollationOrder 2>&1\`_ /usr/share/locale/locale.alias | tail -n1 | sed 's/\./ /' | awk '{print $2}'`.UTF-8"
+# Set the locale-related variables appropriaty for GnuCash.
+unset LANG LC_MESSAGES LC_MONETARY
+
+# Start by trying the Collation preference, in case it's the only setting that exists.
+APPLECOLLATION=`defaults read .GlobalPreferences AppleCollationOrder`
+if test "${APPLECOLLATION}"; then
+ COLL=`ls -d /usr/share/locale/${APPLECOLLATION}*.UTF-8 2>> /dev/null`
+ if test "${COLL}"; then
+ # $COLL is potentially multi-line; concatenate lines by not using quotes.
+ export LANG=`echo ${COLL} | awk '{print $1}' | awk -F/ '{print $5}'`
+ fi
+fi
+unset APPLECOLLATION COLL
+
+# Continue by attempting to find the Locale preference.
+APPLELOCALE=`defaults read .GlobalPreferences AppleLocale`
+if test "${APPLELOCALE}"; then
+ LOCALELANG=`echo "${APPLELOCALE}" | awk -F@ '{print $1".UTF-8"}'`
+ if test -d "/usr/share/locale/${LOCALELANG}"; then
+ export LANG="${LOCALELANG}"
+ fi
+fi
+unset LOCALELANG
+
+# If there is still no locale value, then set US English as a default.
+if test -z "${LANG}"; then
+ export LANG=en_US.UTF-8
+fi
+
+# The AppleLocale setting may contain a currency-related substring.
+# Attempt to act on it.
+# First strip the string to just the currency symbol and the language symbol
+APPLECURRENCY=`echo "${APPLELOCALE}" | awk -F= '{print $2}'`
+APPLELANG=`echo "${APPLELOCALE}" | awk -F_ '{print $1}'`
+if test "${APPLECURRENCY}"; then
+ # The user has set a currency different from that of their locale.
+ # Search for a locale that uses that currency, and set LC_MONETARY accordingly.
+
+ # First try to find an LC_MONETARY file that combines the language with the currency.
+ FILES=`find /usr/share/locale/${APPLELANG}*UTF-8 -name LC_MONETARY -exec grep -H $APPLECURRENCY {} \;`
+ if test -z "$FILES"; then
+ # Otherwise try to find any LC_MONETARY file that uses that currency.
+ FILES=`find /usr/share/locale/*UTF-8 -name LC_MONETARY -exec grep -H $APPLECURRENCY {} \;`
+ fi
+
+ if test "$FILES"; then
+ # We found a locale that matches; set LC_MONETARY.
+ export LC_MONETARY=`echo ${FILES} | awk -F: '{print $1}' | awk -F/ '{print $5}'`
+ fi
+fi
+unset APPLECURRENCY APPLELANG APPLELOCALE FILES
+
+# Has a language ordering been set?
+# If so, set LC_MESSAGES accordingly; otherwise skip it.
+APPLELANGUAGES=`defaults read .GlobalPreferences AppleLanguages | awk 'length > 2' | awk -F, '{print $1}' | sed s/\ //g | sed s/-/_/ | sed s/\"//g`
+if test "$APPLELANGUAGES"; then
+ # A language ordering exists.
+ # Test, item per item, to see whether there is an corresponding locale.
+ for L in $APPLELANGUAGES
+ do
+ POS=`echo ${L} | awk '{print index(ENVIRON["LANG"], $0)}'`
+ if test $POS -eq 1; then
+ # The language symbol is a subset of the $LANG variable. We're done!
+ break
+ fi
+ # NOTE: the following may fail for the alternate Chinese localizations.
+ LC=`ls -d /usr/share/locale/${L}*.UTF-8 2>> /dev/null`
+ # $LC is potentially multi-line; concatenate lines by not using quotes.
+ if test $LC; then
+ # There is a UTF-8 locale matching this language.
+ export LC_MESSAGES=`echo ${LC} | awk '{print $1}' | awk -F/ '{print $5}'`
+ break
+ fi
+ done
+fi
+unset APPLELANGUAGES POS LC L
if test -f "$bundle_lib/charset.alias"; then
export CHARSETALIASDIR="$bundle_lib"
@@ -95,4 +169,8 @@ export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
+if test -f "$HOME/.gnucashrc"; then
+ source "$HOME/.gnucashrc"
+fi
+
$EXEC "$bundle_contents/MacOS/$name-bin" $* $EXTRA_ARGS
commit 9714554c13580696f67646297b5d3737be6ed79b
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 1 15:02:06 2009 -0700
Add libsoup as explicit dependency of gtkhtml
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index 01f5183..a5259cd 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -67,6 +67,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
<dep package="libgnomeprintui"/>
<dep package="iso-codes"/>
<dep package="enchant"/>
+ <dep package="libsoup"/>
</dependencies>
</autotools>
commit 68343bb841bf506ad9f2827a14027e9c3bc95996
Merge: d83d892 6472ef4
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 1 15:02:49 2009 -0700
Merge commit 'origin/master'
commit d83d8923d426dc756bc4b6a76eb8fbd0de922e83
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 1 15:02:06 2009 -0700
Add libsoup as explicit dependency of gtkhtml
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index 01f5183..a5259cd 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -67,6 +67,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
<dep package="libgnomeprintui"/>
<dep package="iso-codes"/>
<dep package="enchant"/>
+ <dep package="libsoup"/>
</dependencies>
</autotools>
commit 6472ef410e307c24f4ba60b4b61c8fc7f3c371a8
Author: Guillaume Lessard <glessard at Milestones.local>
Date: Wed Sep 2 04:45:47 2009 +0800
Revamped the locale-detection portion of gnucash-launcher to take into account all four locale-related variables published by Mac OS X (see "defaults .GlobalPreferences").
Signed-off-by: John Ralls <jralls at ceridwen.us>
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index 0bae729..bd2db2d 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -36,8 +36,82 @@ export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
-# We need a UTF-8 locale.
-export LANG="`grep \`defaults read .GlobalPreferences AppleCollationOrder 2>&1\`_ /usr/share/locale/locale.alias | tail -n1 | sed 's/\./ /' | awk '{print $2}'`.UTF-8"
+# Set the locale-related variables appropriaty for GnuCash.
+unset LANG LC_MESSAGES LC_MONETARY
+
+# Start by trying the Collation preference, in case it's the only setting that exists.
+APPLECOLLATION=`defaults read .GlobalPreferences AppleCollationOrder`
+if test "${APPLECOLLATION}"; then
+ COLL=`ls -d /usr/share/locale/${APPLECOLLATION}*.UTF-8 2>> /dev/null`
+ if test "${COLL}"; then
+ # $COLL is potentially multi-line; concatenate lines by not using quotes.
+ export LANG=`echo ${COLL} | awk '{print $1}' | awk -F/ '{print $5}'`
+ fi
+fi
+unset APPLECOLLATION COLL
+
+# Continue by attempting to find the Locale preference.
+APPLELOCALE=`defaults read .GlobalPreferences AppleLocale`
+if test "${APPLELOCALE}"; then
+ LOCALELANG=`echo "${APPLELOCALE}" | awk -F@ '{print $1".UTF-8"}'`
+ if test -d "/usr/share/locale/${LOCALELANG}"; then
+ export LANG="${LOCALELANG}"
+ fi
+fi
+unset LOCALELANG
+
+# If there is still no locale value, then set US English as a default.
+if test -z "${LANG}"; then
+ export LANG=en_US.UTF-8
+fi
+
+# The AppleLocale setting may contain a currency-related substring.
+# Attempt to act on it.
+# First strip the string to just the currency symbol and the language symbol
+APPLECURRENCY=`echo "${APPLELOCALE}" | awk -F= '{print $2}'`
+APPLELANG=`echo "${APPLELOCALE}" | awk -F_ '{print $1}'`
+if test "${APPLECURRENCY}"; then
+ # The user has set a currency different from that of their locale.
+ # Search for a locale that uses that currency, and set LC_MONETARY accordingly.
+
+ # First try to find an LC_MONETARY file that combines the language with the currency.
+ FILES=`find /usr/share/locale/${APPLELANG}*UTF-8 -name LC_MONETARY -exec grep -H $APPLECURRENCY {} \;`
+ if test -z "$FILES"; then
+ # Otherwise try to find any LC_MONETARY file that uses that currency.
+ FILES=`find /usr/share/locale/*UTF-8 -name LC_MONETARY -exec grep -H $APPLECURRENCY {} \;`
+ fi
+
+ if test "$FILES"; then
+ # We found a locale that matches; set LC_MONETARY.
+ export LC_MONETARY=`echo ${FILES} | awk -F: '{print $1}' | awk -F/ '{print $5}'`
+ fi
+fi
+unset APPLECURRENCY APPLELANG APPLELOCALE FILES
+
+# Has a language ordering been set?
+# If so, set LC_MESSAGES accordingly; otherwise skip it.
+APPLELANGUAGES=`defaults read .GlobalPreferences AppleLanguages | awk 'length > 2' | awk -F, '{print $1}' | sed s/\ //g | sed s/-/_/ | sed s/\"//g`
+if test "$APPLELANGUAGES"; then
+ # A language ordering exists.
+ # Test, item per item, to see whether there is an corresponding locale.
+ for L in $APPLELANGUAGES
+ do
+ POS=`echo ${L} | awk '{print index(ENVIRON["LANG"], $0)}'`
+ if test $POS -eq 1; then
+ # The language symbol is a subset of the $LANG variable. We're done!
+ break
+ fi
+ # NOTE: the following may fail for the alternate Chinese localizations.
+ LC=`ls -d /usr/share/locale/${L}*.UTF-8 2>> /dev/null`
+ # $LC is potentially multi-line; concatenate lines by not using quotes.
+ if test $LC; then
+ # There is a UTF-8 locale matching this language.
+ export LC_MESSAGES=`echo ${LC} | awk '{print $1}' | awk -F/ '{print $5}'`
+ break
+ fi
+ done
+fi
+unset APPLELANGUAGES POS LC L
if test -f "$bundle_lib/charset.alias"; then
export CHARSETALIASDIR="$bundle_lib"
@@ -89,4 +163,8 @@ export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
+if test -f "$HOME/.gnucashrc"; then
+ source "$HOME/.gnucashrc"
+fi
+
$EXEC "$bundle_contents/MacOS/$name-bin" $* $EXTRA_ARGS
commit 0d3dfd58ed5ff1a25c0df8ef7c47a983796a60b7
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Aug 31 14:06:31 2009 -0700
Fix osascript so that it will work if there's a conflicting link.
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index 2d1b484..2714887 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -64,9 +64,9 @@ export PATH
GUILE_WARN_DEPRECATED="no"
export GUILE_WARN_DEPRECATED
-if [ -d "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
- osascript -e 'do shell script " if [ -h $PREFIX ]; then rm $PREFIX; else mv $PREFIX $PREFIX.Save; fi; ln -s $RESPFX $PREFIX" with administrator privileges '
-elif [ ! -d "$PREFIX" ] ; then
+if [ -e "$PREFIX" ] || [ -L "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
+ osascript -e 'do shell script " if [ ! -d $PREFIX ]; then rm $PREFIX; else mv $PREFIX $PREFIX.Save; fi; ln -s $RESPFX $PREFIX" with administrator privileges '
+elif [ ! -e "$PREFIX" ] ; then
echo "Linking $RESPFX to $PREFIX"
osascript -e 'do shell script "if [ ! -d $PREFIXDIR ]; then mkdir -p $PREFIXDIR; fi; ln -s $RESPFX $PREFIX" with administrator privileges ';
fi
commit 21b0a87326adc9fa0e7a11d960ef8f806c021f9d
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Aug 31 14:05:59 2009 -0700
Fix typo
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index 81a9743..2d1b484 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -88,7 +88,7 @@ EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib/gnucash"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
-export DYLD_FRAMEWORK_PATH="${bundle_fw}
+export DYLD_FRAMEWORK_PATH="${bundle_fw}"
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
commit 0500725f52c301d33bf4a48cf3b0406b6fc9b49d
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 30 12:52:35 2009 -0700
Added Qt3Support's dependency frameworks. Under 10.4, ld isn't able to find them on its own
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 7175f6e..3788f97 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -21,7 +21,7 @@ append_autogenargs("scrollkeeper", "--with-xml-catalog=" + os.path.join(prefix,
append_autogenargs("gnucash-unstable", "--with-html-engine=webkit")
append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
-append_autogenargs("aqbanking-qt", 'qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers" QT3TO4=/usr/bin/qt3to4')
+append_autogenargs("aqbanking-qt", 'qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support -framework QtXml -framework QtSql -framework QtNetwork" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers" QT3TO4=/usr/bin/qt3to4')
moduleset = os.environ["HOME"] + "/gnucash-on-osx/modulesets/gnucash.modules"
modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
commit 2daaa16a6d674a2f16b464da3e019519c6c0d7d3
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 30 12:45:54 2009 -0700
partially fix qt4-all target
diff --git a/patches/aqbanking.patch b/patches/aqbanking.patch
index 98db039..127a6d4 100644
--- a/patches/aqbanking.patch
+++ b/patches/aqbanking.patch
@@ -29,10 +29,10 @@
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
-+qt4-all: $(BUILT_SOURCES) config.h
++qt4-all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) clean
+ $(MAKE) $(AM_MAKEFLAGS) qt4-port
-+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
++ $(MAKE) $(AM_MAKEFLAGS) all
+
.SUFFIXES:
am--refresh:
commit f88a15a7512c7e8aac314933d55dd3851dffbf56
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 30 12:24:53 2009 -0700
Add DYLD_FRAMEWORK_PATH so that dyld can find the embedded Qt frameworks.
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index 3282ea2..81a9743 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -20,6 +20,7 @@ tmp=`dirname "$tmp"`
bundle=`dirname "$tmp"`
bundle_contents="$bundle"/Contents
bundle_res="$bundle_contents"/Resources
+bundle_fw="$bundle_contents"/Frameworks
bundle_lib="$bundle_res"/lib
bundle_bin="$bundle_res"/bin
bundle_data="$bundle_res"/share
@@ -56,38 +57,38 @@ if [ x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ]; then
shift 1
fi
-PFX=${bundle_res}
-export PFX
-PATH="${PFX}/bin:${PATH}"
+export RESPFX=${bundle_res}
+PATH="${RESPFX}/bin:${PATH}"
export PATH
GUILE_WARN_DEPRECATED="no"
export GUILE_WARN_DEPRECATED
if [ -d "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
- osascript -e 'do shell script " if [ -h $PREFIX ]; then rm $PREFIX; else mv $PREFIX $PREFIX.Save; fi; ln -s $PFX $PREFIX" with administrator privileges '
+ osascript -e 'do shell script " if [ -h $PREFIX ]; then rm $PREFIX; else mv $PREFIX $PREFIX.Save; fi; ln -s $RESPFX $PREFIX" with administrator privileges '
elif [ ! -d "$PREFIX" ] ; then
- echo "Linking $PFX to $PREFIX"
- osascript -e 'do shell script "if [ ! -d $PREFIXDIR ]; then mkdir -p $PREFIXDIR; fi; ln -s $PFX $PREFIX" with administrator privileges ';
+ echo "Linking $RESPFX to $PREFIX"
+ osascript -e 'do shell script "if [ ! -d $PREFIXDIR ]; then mkdir -p $PREFIXDIR; fi; ln -s $RESPFX $PREFIX" with administrator privileges ';
fi
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
eval `dbus-launch --sh-syntax --exit-with-session --config-file=$bundle_res/etc/dbus-1/session.conf`
fi
-GNC_MODULE_PATH="${PFX}/lib/gnucash:${GNC_MODULE_PATH}"
+GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
-EXTRA_PATH="${EXTRA_PATH}:${PFX}/share/gnucash/guile-modules"
-EXTRA_PATH="${EXTRA_PATH}:${PFX}/share/gnucash/scm"
+EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/guile-modules"
+EXTRA_PATH="${EXTRA_PATH}:${RESPFX}/share/gnucash/scm"
GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
EXTRA_LIBS="${GNC_MODULE_PATH}"
EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
-EXTRA_LIBS="${EXTRA_LIBS}:${PFX}/lib"
-EXTRA_LIBS="${EXTRA_LIBS}:${PFX}/lib/gnucash"
+EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib"
+EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib/gnucash"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
+export DYLD_FRAMEWORK_PATH="${bundle_fw}
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
commit 967cee490f75b9ca394c0987a46f5a757f12faa0
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 17:14:31 2009 -0700
Change bundle name from GnuCash.app to Gnucash.app
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 9caa457..afb3f10 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -5,19 +5,19 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
- <string>GnuCash</string>
+ <string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>GnuCash version 2.2.9 © 2009 Free Software Foundation</string>
+ <string>Gnucash version 2.2.9 © 2009 Free Software Foundation</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
- <string>org.gnucash.GnuCash</string>
+ <string>org.gnucash.Gnucash</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>2.2.9 © 2009 Free Software Foundation</string>
<key>CFBundleName</key>
- <string>GnuCash</string>
+ <string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
commit bf9c7a6047288bcca902901950916ff31a9f3d98
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 28 17:18:53 2009 -0700
Move the end-of-comment so that the frameworks stay commented out.
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 6a6c6a1..2c27dc9 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -119,7 +119,7 @@
<framework>
/Library/Frameworks/QtSql.framework
- </framework -->
+ </framework >
<framework>
/Library/Frameworks/QtXml.framework
@@ -127,7 +127,7 @@
<framework>
/Library/Frameworks/QtNetwork.framework
- </framework>
+ </framework -->
<!-- Data to copy in, usually Glade/UI files, images, sounds files
etc. The destination inside the bundle can be specified if the
commit ae7150083f3e32c714fccd732205c3d2129af363
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 28 14:33:35 2009 -0700
More Qt Frameworks for aqbanking.
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 417aeef..6a6c6a1 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -121,7 +121,15 @@
/Library/Frameworks/QtSql.framework
</framework -->
- <!-- Data to copy in, usually Glade/UI files, images, sounds files
+ <framework>
+ /Library/Frameworks/QtXml.framework
+ </framework>
+
+ <framework>
+ /Library/Frameworks/QtNetwork.framework
+ </framework>
+
+<!-- Data to copy in, usually Glade/UI files, images, sounds files
etc. The destination inside the bundle can be specified if the
files should end up at a different location, by using the
"dest" property. The destination must then start with the macro
commit b5bb373da99c5755783188b49e30fe69ba547bb8
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 28 17:06:14 2009 -0700
Add goffice modules so that graphical reports work
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 667bed0..417aeef 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -101,7 +101,11 @@
${prefix}/bin/gnc-*
</binary>
- <!--framework>
+ <binary>
+ ${prefix}/lib/goffice
+ </binary>
+
+ <!-- framework>
/Library/Frameworks/QtCore.framework
</framework>
commit 4bdaf5fbe00be8a19f8f154429a671373b7020d2
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 28 17:05:46 2009 -0700
Fix the moduleset path yet again
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index d710f7b..7175f6e 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -23,7 +23,7 @@ append_autogenargs("gnucash-unstable", "--with-html-engine=webkit")
append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
append_autogenargs("aqbanking-qt", 'qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers" QT3TO4=/usr/bin/qt3to4')
-moduleset = os.environ["HOME"] + "/gnucash-on-osx/master/modulesets/gnucash.modules"
+moduleset = os.environ["HOME"] + "/gnucash-on-osx/modulesets/gnucash.modules"
modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
#build_policy = "updated-deps"
commit 1959c914b85d27057d85108bd5ae9529f783e5f4
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 28 13:41:12 2009 -0700
Replace module_autogenargs list entries with append_autogenargs calls. Add an append_autogenargs for scrollkeeper, to say where the xml-catalog lives.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 83db5df..d710f7b 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -14,11 +14,14 @@ else:
skip.append("bison")
autogenargs=autogenargs + ' --disable-xlib'
-module_autogenargs["gconf"]="--enable-static --enable-shared --disable-scrollkeeper --disable-xlib"
-module_autogenargs["libofx"]="--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib"
-module_autogenargs["libgnomeui"]="--disable-static --enable-shared --disable-scrollkeeper --without-x"
-module_autogenargs["libdbi-drivers"]="--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib"
-append_autogenargs("aqbanking-qt", 'qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers"')
+append_autogenargs("gconf", "--enable-static --enable-shared --disable-scrollkeeper --disable-xlib")
+append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
+append_autogenargs("libgnomeui", "--disable-static --enable-shared --disable-scrollkeeper --disable-xlib --without-x")
+append_autogenargs("scrollkeeper", "--with-xml-catalog=" + os.path.join(prefix, "etc/xml/catalog"))
+
+append_autogenargs("gnucash-unstable", "--with-html-engine=webkit")
+append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
+append_autogenargs("aqbanking-qt", 'qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers" QT3TO4=/usr/bin/qt3to4')
moduleset = os.environ["HOME"] + "/gnucash-on-osx/master/modulesets/gnucash.modules"
modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
commit b65d9b5e79239ed8577df58ff35e9751e5e50a63
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 28 13:38:22 2009 -0700
Add "stable" to the module path for gnucash-docs
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 6f63cbe..428e3e7 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -170,7 +170,7 @@
</autotools>
<autotools id="gnucash-docs" makeargs=" html" >
- <branch repo="gnucash.org" module="gnucash-docs-2.2.0.tar.gz"
+ <branch repo="gnucash.org" module="stable/gnucash-docs-2.2.0.tar.gz"
version="2.2.0"/>
<dependencies>
<dep package="scrollkeeper"/>
commit 957c3000b10de8661333c641308661e1f271c43e
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 28 17:06:37 2009 -0700
Pretty up the framework elements
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index f41fa6f..1d5bb35 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -115,19 +115,19 @@
<framework>
/Library/Frameworks/Qt3Support.framework
- </framework>
+ </framework>
<framework>
/Library/Frameworks/QtSql.framework
- </framework>
+ </framework>
<framework>
/Library/Frameworks/QtXml.framework
- </framework>
+ </framework>
- <framework>
+ <framework>
/Library/Frameworks/QtNetwork.framework
- </framework>
+ </framework>
<!-- Data to copy in, usually Glade/UI files, images, sounds files
etc. The destination inside the bundle can be specified if the
commit b71772142a1c1ade18a933aed312f6644398b97e
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 28 17:06:14 2009 -0700
Add goffice modules so that graphical reports work
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 2ed53ac..f41fa6f 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -101,6 +101,10 @@
${prefix}/bin/gnc-*
</binary>
+ <binary>
+ ${prefix}/lib/goffice
+ </binary>
+
<framework>
/Library/Frameworks/QtCore.framework
</framework>
commit d39aec8b3b5df56531cf6293a5c29ef4f7ce323d
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 28 17:05:46 2009 -0700
Fix the moduleset path yet again
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index d710f7b..7175f6e 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -23,7 +23,7 @@ append_autogenargs("gnucash-unstable", "--with-html-engine=webkit")
append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
append_autogenargs("aqbanking-qt", 'qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers" QT3TO4=/usr/bin/qt3to4')
-moduleset = os.environ["HOME"] + "/gnucash-on-osx/master/modulesets/gnucash.modules"
+moduleset = os.environ["HOME"] + "/gnucash-on-osx/modulesets/gnucash.modules"
modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
#build_policy = "updated-deps"
commit bb3f699396802b440f26ddc611c62bc0c7eefa6f
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 28 14:33:35 2009 -0700
More Qt Frameworks for aqbanking.
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index fbdb6e0..2ed53ac 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -117,7 +117,15 @@
/Library/Frameworks/QtSql.framework
</framework>
- <!-- Data to copy in, usually Glade/UI files, images, sounds files
+ <framework>
+ /Library/Frameworks/QtXml.framework
+ </framework>
+
+ <framework>
+ /Library/Frameworks/QtNetwork.framework
+ </framework>
+
+<!-- Data to copy in, usually Glade/UI files, images, sounds files
etc. The destination inside the bundle can be specified if the
files should end up at a different location, by using the
"dest" property. The destination must then start with the macro
commit e5034fa59f6b75cdc314bc53693768b7b8e3ee3e
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 28 13:41:12 2009 -0700
Replace module_autogenargs list entries with append_autogenargs calls. Add an append_autogenargs for scrollkeeper, to say where the xml-catalog lives.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 83db5df..d710f7b 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -14,11 +14,14 @@ else:
skip.append("bison")
autogenargs=autogenargs + ' --disable-xlib'
-module_autogenargs["gconf"]="--enable-static --enable-shared --disable-scrollkeeper --disable-xlib"
-module_autogenargs["libofx"]="--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib"
-module_autogenargs["libgnomeui"]="--disable-static --enable-shared --disable-scrollkeeper --without-x"
-module_autogenargs["libdbi-drivers"]="--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib"
-append_autogenargs("aqbanking-qt", 'qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers"')
+append_autogenargs("gconf", "--enable-static --enable-shared --disable-scrollkeeper --disable-xlib")
+append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
+append_autogenargs("libgnomeui", "--disable-static --enable-shared --disable-scrollkeeper --disable-xlib --without-x")
+append_autogenargs("scrollkeeper", "--with-xml-catalog=" + os.path.join(prefix, "etc/xml/catalog"))
+
+append_autogenargs("gnucash-unstable", "--with-html-engine=webkit")
+append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
+append_autogenargs("aqbanking-qt", 'qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers" QT3TO4=/usr/bin/qt3to4')
moduleset = os.environ["HOME"] + "/gnucash-on-osx/master/modulesets/gnucash.modules"
modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
commit a9976f75947cdffe379eed2eb17f0d310f03fcf3
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 28 13:38:22 2009 -0700
Add "stable" to the module path for gnucash-docs
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 6eb5434..00d212d 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -170,7 +170,7 @@
</autotools>
<autotools id="gnucash-docs" makeargs=" html" >
- <branch repo="gnucash.org" module="gnucash-docs-2.2.0.tar.gz"
+ <branch repo="gnucash.org" module="stable/gnucash-docs-2.2.0.tar.gz"
version="2.2.0"/>
<dependencies>
<dep package="scrollkeeper"/>
commit f7af0966a3360da20f4d089d78e6b789925b3a5b
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 17:15:30 2009 -0700
Fix error in binreloc which caused caused bad paths to be generated when there's no bundle.
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
index 621ad0d..d3ac78b 100644
--- a/patches/gnucash-integration.patch
+++ b/patches/gnucash-integration.patch
@@ -337,7 +337,7 @@ index d582a5d..032f2af 100644
/** @internal
* Find the canonical filename of the executable. Returns the filename
-@@ -61,6 +66,24 @@ _br_find_exe (GbrInitError *error)
+@@ -61,6 +66,25 @@ _br_find_exe (GbrInitError *error)
(char*)NULL);
g_free (prefix);
return result;
@@ -351,6 +351,7 @@ index d582a5d..032f2af 100644
+ }
+ if (!ige_mac_bundle_get_is_app_bundle (bundle)) {
+ *error = GBR_INIT_ERROR_MAC_NOT_APP_BUNDLE;
++ bundle = NULL;
+ return NULL;
+ }
+ ige_mac_bundle_setup_environment(bundle);
commit 62d9fe8afc3ba58928ba53c0246c984b61eda8a0
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 17:14:31 2009 -0700
Change bundle name from GnuCash.app to Gnucash.app
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 9caa457..afb3f10 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -5,19 +5,19 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
- <string>GnuCash</string>
+ <string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>GnuCash version 2.2.9 © 2009 Free Software Foundation</string>
+ <string>Gnucash version 2.2.9 © 2009 Free Software Foundation</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
- <string>org.gnucash.GnuCash</string>
+ <string>org.gnucash.Gnucash</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>2.2.9 © 2009 Free Software Foundation</string>
<key>CFBundleName</key>
- <string>GnuCash</string>
+ <string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
commit 1e6c606faca70fed871bc7f9a76326e157e30e49
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 15:52:13 2009 -0700
Fix more patch typos
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
index 984ccd3..621ad0d 100644
--- a/patches/gnucash-integration.patch
+++ b/patches/gnucash-integration.patch
@@ -384,7 +384,6 @@ index d582a5d..032f2af 100644
case GBR_INIT_ERROR_DISABLED:
error_message = "Binary relocation support is disabled.";
break;
-
@@ -474,18 +496,33 @@ gbr_find_prefix (const gchar *default_prefix)
{
gchar *dir1, *dir2;
@@ -446,6 +445,7 @@ index d582a5d..032f2af 100644
return dir;
+#endif //ENABLE_BINRELOC && MAC_INTEGRATION
}
+diff -u src/engine/binreloc.h
--- a/src/engine/binreloc.h 2008-01-07 17:06:44.000000000 -0800
+++ b/src/engine/binreloc.h 2009-08-27 14:50:44.000000000 -0700
@@ -28,6 +28,10 @@
commit 1bffe594495082100d28a4a843515a2a963502e0
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 14:55:56 2009 -0700
Another fix for binreloc bundle errors.
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
index f800e92..984ccd3 100644
--- a/patches/gnucash-integration.patch
+++ b/patches/gnucash-integration.patch
@@ -440,11 +440,22 @@ index d582a5d..032f2af 100644
prefix = gbr_find_prefix (NULL);
if (prefix == NULL) {
-@@ -519,6 +569,7 @@ gbr_find_bin_dir (const gchar *default_bin_dir)
+@@ -519,4 +569,5 @@ gbr_find_bin_dir (const gchar *default_bin_dir)
dir = g_build_filename (prefix, "bin", NULL);
g_free (prefix);
return dir;
+#endif //ENABLE_BINRELOC && MAC_INTEGRATION
}
-
-
+--- a/src/engine/binreloc.h 2008-01-07 17:06:44.000000000 -0800
++++ b/src/engine/binreloc.h 2009-08-27 14:50:44.000000000 -0700
+@@ -28,6 +28,10 @@
+ GBR_INIT_ERROR_READ_MAPS,
+ /** The file format of /proc/self/maps is invalid; kernel bug? */
+ GBR_INIT_ERROR_INVALID_MAPS,
++ /** BinReloc determined that gnucash is not running from a bundle */
++ GBR_INIT_ERROR_MAC_NOT_BUNDLE,
++ /** Binreloc determined that the bundle is not an app bundle */
++ GBR_INIT_ERROR_MAC_NOT_APP_BUNDLE,
+ /** BinReloc is disabled (the ENABLE_BINRELOC macro is not defined). */
+ GBR_INIT_ERROR_DISABLED
+ } GbrInitError;
commit e1a73756f46cbee0ea5aa2085399c4c2ab385efa
Merge: 01d18c4 080d98b
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 14:46:47 2009 -0700
Merge branch 'master' of git at github.com:jralls/gnucash-on-osx
commit 01d18c458af9a7ba14edb21434fd6c3dd0e73382
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 14:44:41 2009 -0700
Better error reporting for binreloc bundle errors
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
index 9b69265..f800e92 100644
--- a/patches/gnucash-integration.patch
+++ b/patches/gnucash-integration.patch
@@ -346,11 +346,11 @@ index d582a5d..032f2af 100644
+ g_type_init();
+ bundle = ige_mac_bundle_get_default();
+ if (!bundle) {
-+ *error = GBR_INIT_ERROR_DISABLED;
++ *error = GBR_INIT_ERROR_MAC_NOT_BUNDLE;
+ return NULL;
+ }
+ if (!ige_mac_bundle_get_is_app_bundle (bundle)) {
-+ *error = GBR_INIT_ERROR_OPEN_MAPS;
++ *error = GBR_INIT_ERROR_MAC_NOT_APP_BUNDLE;
+ return NULL;
+ }
+ ige_mac_bundle_setup_environment(bundle);
@@ -371,6 +371,20 @@ index d582a5d..032f2af 100644
g_warning ("_br_find_exe_for_symbol not implemented on win32.");
if (error)
*error = GBR_INIT_ERROR_DISABLED;
+@@ -414,6 +414,12 @@ set_gerror (GError **error, GbrInitError errcode)
+ case GBR_INIT_ERROR_INVALID_MAPS:
+ error_message = "The file format of /proc/self/maps is invalid.";
+ break;
++ case GBR_INIT_ERROR_MAC_NOT_BUNDLE:
++ error_message = "Binreloc did not find a bundle";
++ break;
++ case GBR_INIT_ERROR_MAC_NOT_APP_BUNDLE:
++ error_message = "Binreloc found that the bundle is not an app bundle";
++ break;
+ case GBR_INIT_ERROR_DISABLED:
+ error_message = "Binary relocation support is disabled.";
+ break;
+
@@ -474,18 +496,33 @@ gbr_find_prefix (const gchar *default_prefix)
{
gchar *dir1, *dir2;
commit 16adb7ff2c36503047bc458ebeb9abb1374e9613
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 14:44:41 2009 -0700
Better error reporting for binreloc bundle errors
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
index 9b69265..f800e92 100644
--- a/patches/gnucash-integration.patch
+++ b/patches/gnucash-integration.patch
@@ -346,11 +346,11 @@ index d582a5d..032f2af 100644
+ g_type_init();
+ bundle = ige_mac_bundle_get_default();
+ if (!bundle) {
-+ *error = GBR_INIT_ERROR_DISABLED;
++ *error = GBR_INIT_ERROR_MAC_NOT_BUNDLE;
+ return NULL;
+ }
+ if (!ige_mac_bundle_get_is_app_bundle (bundle)) {
-+ *error = GBR_INIT_ERROR_OPEN_MAPS;
++ *error = GBR_INIT_ERROR_MAC_NOT_APP_BUNDLE;
+ return NULL;
+ }
+ ige_mac_bundle_setup_environment(bundle);
@@ -371,6 +371,20 @@ index d582a5d..032f2af 100644
g_warning ("_br_find_exe_for_symbol not implemented on win32.");
if (error)
*error = GBR_INIT_ERROR_DISABLED;
+@@ -414,6 +414,12 @@ set_gerror (GError **error, GbrInitError errcode)
+ case GBR_INIT_ERROR_INVALID_MAPS:
+ error_message = "The file format of /proc/self/maps is invalid.";
+ break;
++ case GBR_INIT_ERROR_MAC_NOT_BUNDLE:
++ error_message = "Binreloc did not find a bundle";
++ break;
++ case GBR_INIT_ERROR_MAC_NOT_APP_BUNDLE:
++ error_message = "Binreloc found that the bundle is not an app bundle";
++ break;
+ case GBR_INIT_ERROR_DISABLED:
+ error_message = "Binary relocation support is disabled.";
+ break;
+
@@ -474,18 +496,33 @@ gbr_find_prefix (const gchar *default_prefix)
{
gchar *dir1, *dir2;
commit 080d98b7c5c69f2d6da45c6b9365bd2b0bd52062
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 13:35:21 2009 -0700
Fixed path on moduleset
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 5031beb..83db5df 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -20,7 +20,7 @@ module_autogenargs["libgnomeui"]="--disable-static --enable-shared --disable-scr
module_autogenargs["libdbi-drivers"]="--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib"
append_autogenargs("aqbanking-qt", 'qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers"')
-moduleset = os.environ["HOME"] + "/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
+moduleset = os.environ["HOME"] + "/gnucash-on-osx/master/modulesets/gnucash.modules"
modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
#build_policy = "updated-deps"
commit e13395a7e0b3266e35310e8f0b44a19ac6e84bfc
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 13:35:21 2009 -0700
Fixed path on moduleset
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 5031beb..83db5df 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -20,7 +20,7 @@ module_autogenargs["libgnomeui"]="--disable-static --enable-shared --disable-scr
module_autogenargs["libdbi-drivers"]="--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib"
append_autogenargs("aqbanking-qt", 'qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers"')
-moduleset = os.environ["HOME"] + "/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
+moduleset = os.environ["HOME"] + "/gnucash-on-osx/master/modulesets/gnucash.modules"
modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
#build_policy = "updated-deps"
commit 83c77f12605c8f20d847fcaa2af428dc12dd564d
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 13:12:03 2009 -0700
Fix tabs (were spaces) in aqbanking.patch
diff --git a/patches/aqbanking.patch b/patches/aqbanking.patch
index 61a5a9d..98db039 100644
--- a/patches/aqbanking.patch
+++ b/patches/aqbanking.patch
@@ -1,8 +1,8 @@
--- src/frontends/qbanking/lib/Makefile.in 2007-10-15 12:47:51 -0700
+++ src/frontends/qbanking/lib/Makefile.in 2009-08-25 13:27:27 -0700
@@ -556,9 +556,9 @@
- dialogs/libdialogs.la views/libviews.la \
- $(aqbanking_internal_libs) $(am__append_1)
+ dialogs/libdialogs.la views/libviews.la \
+ $(aqbanking_internal_libs) $(am__append_1)
testlib_SOURCES = testlib.cpp
-testlib_LDADD = libqbanking.la $(aqbanking_internal_libs)
+testlib_LDADD = libqbanking.la $(aqbanking_internal_libs) $(qt3_libs)
@@ -11,7 +11,7 @@
+checklib_LDADD = libqbanking.la $(aqbanking_internal_libs) $(qt3_libs)
TESTS = checklib
all: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
--- src/frontends/qbanking/lib/dialogs/qbimporter.cpp 2009-08-23 15:11:25 -0700
+++ src/frontends/qbanking/lib/dialogs/qbimporter.cpp 2009-08-25 12:53:25 -0700
@@ -835,7 +835,7 @@
@@ -27,13 +27,13 @@
+++ Makefile.in 2009-08-25 14:01:07.000000000 -0700
@@ -551,6 +551,11 @@
all: $(BUILT_SOURCES) config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+qt4-all: $(BUILT_SOURCES) config.h
-+ $(MAKE) $(AM_MAKEFLAGS) clean
-+ $(MAKE) $(AM_MAKEFLAGS) qt4-port
-+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
++ $(MAKE) $(AM_MAKEFLAGS) clean
++ $(MAKE) $(AM_MAKEFLAGS) qt4-port
++ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
.SUFFIXES:
am--refresh:
- @:
\ No newline at end of file
+ @:
commit dc6cce989f359ba617567c04e9d1e3db031c6d89
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 13:12:03 2009 -0700
Fix tabs (were spaces) in aqbanking.patch
diff --git a/patches/aqbanking.patch b/patches/aqbanking.patch
index 61a5a9d..98db039 100644
--- a/patches/aqbanking.patch
+++ b/patches/aqbanking.patch
@@ -1,8 +1,8 @@
--- src/frontends/qbanking/lib/Makefile.in 2007-10-15 12:47:51 -0700
+++ src/frontends/qbanking/lib/Makefile.in 2009-08-25 13:27:27 -0700
@@ -556,9 +556,9 @@
- dialogs/libdialogs.la views/libviews.la \
- $(aqbanking_internal_libs) $(am__append_1)
+ dialogs/libdialogs.la views/libviews.la \
+ $(aqbanking_internal_libs) $(am__append_1)
testlib_SOURCES = testlib.cpp
-testlib_LDADD = libqbanking.la $(aqbanking_internal_libs)
+testlib_LDADD = libqbanking.la $(aqbanking_internal_libs) $(qt3_libs)
@@ -11,7 +11,7 @@
+checklib_LDADD = libqbanking.la $(aqbanking_internal_libs) $(qt3_libs)
TESTS = checklib
all: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
--- src/frontends/qbanking/lib/dialogs/qbimporter.cpp 2009-08-23 15:11:25 -0700
+++ src/frontends/qbanking/lib/dialogs/qbimporter.cpp 2009-08-25 12:53:25 -0700
@@ -835,7 +835,7 @@
@@ -27,13 +27,13 @@
+++ Makefile.in 2009-08-25 14:01:07.000000000 -0700
@@ -551,6 +551,11 @@
all: $(BUILT_SOURCES) config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+qt4-all: $(BUILT_SOURCES) config.h
-+ $(MAKE) $(AM_MAKEFLAGS) clean
-+ $(MAKE) $(AM_MAKEFLAGS) qt4-port
-+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
++ $(MAKE) $(AM_MAKEFLAGS) clean
++ $(MAKE) $(AM_MAKEFLAGS) qt4-port
++ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
.SUFFIXES:
am--refresh:
- @:
\ No newline at end of file
+ @:
commit 475967ea9072034a7dc5899ccb7bd345a55a7d11
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 11:09:09 2009 -0700
Don't load QT frameworks by default
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index c514f21..667bed0 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -101,7 +101,7 @@
${prefix}/bin/gnc-*
</binary>
- <framework>
+ <!--framework>
/Library/Frameworks/QtCore.framework
</framework>
@@ -115,7 +115,7 @@
<framework>
/Library/Frameworks/QtSql.framework
- </framework>
+ </framework -->
<!-- Data to copy in, usually Glade/UI files, images, sounds files
etc. The destination inside the bundle can be specified if the
commit b84c3b03c09ce02543acb1fbb5db7adacb4bc414
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 11:08:03 2009 -0700
fix typo
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 25b923d..6eb5434 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -162,7 +162,7 @@
<dep package="meta-goffice"/>
<dep package="libofx"/>
<!-- dep package="aqbanking"/ -->
- <dep package="aqbanking-qt">
+ <dep package="aqbanking-qt"/>
<dep package="meta-gtkhtml"/>
<dep package="Slib"/>
</dependencies>
commit a9caa12c8af7e7af8a7176707877721710d4240e
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 11:07:01 2009 -0700
aqbanking-qt is the default for self-contained
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 6f63cbe..25b923d 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -127,8 +127,8 @@
<dep package="meta-goffice"/>
<dep package="meta-gtk-osx-core"/>
<dep package="libofx"/>
- <dep package="aqbanking"/>
- <!-- dep package="aqbanking-qt"/ -->
+ <!--dep package="aqbanking"/-->
+ <dep package="aqbanking-qt"/>
<dep package="meta-gtkhtml"/>
<dep package="Slib"/>
</dependencies>
@@ -144,8 +144,8 @@
<dep package="meta-gtk-osx-core"/>
<dep package="meta-goffice"/>
<dep package="libofx"/>
- <dep package="aqbanking"/>
- <!-- dep package="aqbanking-qt"/ -->
+ <!--dep package="aqbanking"/ -->
+ <dep package="aqbanking-qt"/>
<dep package="meta-gtkhtml"/>
<dep package="Slib"/>
</dependencies>
@@ -161,8 +161,8 @@
<dep package="meta-gtk-osx-core"/>
<dep package="meta-goffice"/>
<dep package="libofx"/>
- <dep package="aqbanking"/>
- <!-- dep package="aqbanking-qt"/ -->
+ <!-- dep package="aqbanking"/ -->
+ <dep package="aqbanking-qt">
<dep package="meta-gtkhtml"/>
<dep package="Slib"/>
</dependencies>
commit d3a4a1d039ed9aed583efb7846268b41f3d0ecdb
Merge: b09d239 63ef062
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 11:05:07 2009 -0700
Merge branch 'master' into self-contained
commit 63ef06250405626d4faa38eb431e49677d4c5eef
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 11:03:16 2009 -0700
Updated instructions to reflect available binaries, multiple gnucash modules, and qt support for aqbanking.
diff --git a/README.markdown b/README.markdown
index d58cd72..1e38b93 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,6 +1,6 @@
#Building GnuCash with GTK-OSX#
-##Overview##
+##Overview##
GnuCash can be built to run more or less natively on OSX -- meaning
without X11. Better yet, the build is almost automatic.
@@ -8,16 +8,25 @@ This is tested and works for Macinstosh OSX Versions 10.4 (Tiger) and
10.5 (Leopard) on both PowerPC and Intel. It does not create universal
binaries.
+##Binaries available for download##
+
+Precompiled app bundles are available from
+http://gnucash.sourceforge.net, and users who are simply interested in
+running Gnucash on their Macs should obtain the latest stable release
+from there.
+
##Preliminaries##
Tiger or newer is <em>required</em> for gtk-osx.
You need Python 2.5 to run jhbuild. This is already part of Leopard
(OSX 10.5), but Tiger (10.4) provided Python 2.3, so the gtk-osx
maintainer has included logic to make a new python for Tiger users.
+You will also need Git (http://metastatic.org/source/git-osx.html) and Tiger users will need Subversion (http://www.open.collab.net/downloads/community/)
+
+If you haven't already done so, retrieve this package:
+ git clone git://github.com/jralls/gnucash-on-osx.git
-Download
- http://github.com/jralls/gnucash-on-osx/raw/master/.jhbuildrc-custom
-into your home directory.
+Copy the .jhbuildrc-custom into your home directory.
Note that by default, jhbuild will put everything into your home
directory. I prefer to build and install into /usr/local, so you'll
@@ -31,6 +40,25 @@ the instructions. <b><em>Don't run jhbuild build yet!</em></b>
Tiger users will need to retrieve and install
http://downloads.sourceforge.net/cups/cups-1.2.12.dmg
+##Alternate Versions##
+
+There are modules provided for building the latest stable release (gnucash), the latest unstable (development) release (gnucash-unstable), and the current subversion trunk (gnucash-svn). Just edit the "modules = " line in .jhbuildrc-custom to point at the one you want.
+
+##AQBanking and Qt##
+
+With an additional dependency, you can build in the setup wizard for
+AQBanking. This depends on Nokia's Qt library (the same one that KDE
+uses). First, you must download and install the latest MacOSX Qt4
+package from https://qt.nokia.com/downloads/downloads#lgpl
+
+Edit gnucash-on-osx/modulesets/gnucash-modules so that the dependency
+for aqbanking in the gnucash module that you want to build is
+aqbanking-qt. There's a commented out dependency; just uncomment it
+and comment out the plain aqbanking one.
+
+Edit gnucash-on-osx/gnucash-bundler/gnucash.bundle and uncomment the 4
+Qt framework elements.
+
##Building##
Once all of the preliminaries are complete, run:
@@ -56,10 +84,10 @@ the Dock) to click on when you run GnuCash. Here's how to do this:
* Download the bundler from http://downloads.sourceforge.net/sourceforge/gtk-osx/ige-mac-bundler-0.5.tar.gz unpack it, cd into the ige-mac-bundler directory, and
make install
- * Download http://downloads.sourceforge.net/sourceforge/gtk-osx/gnucash-bundler-1.0.tar.gz and unpack it.
*
- <tt>$> cd gnucash-bundler</tt>
+ <tt>$> cd gnucash-on-osx/gnucash-bundler</tt>
* Look through gnucash-launcher and gnucash.bundle and adjust the paths to match your installation.
+ * If you built a gnucash-unstable or gnucash-svn, edit Info.plist to have the right version information.
* make gnucash-launcher executable :
<tt>$> chmod +x gnucash-launcher</tt>
* execute
commit e20cd0777bba71d67fe4ff1eba1349ecc517c7e6
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 11:02:22 2009 -0700
Patch aqbanking for building with Qt4
diff --git a/patches/aqbanking.patch b/patches/aqbanking.patch
new file mode 100644
index 0000000..61a5a9d
--- /dev/null
+++ b/patches/aqbanking.patch
@@ -0,0 +1,39 @@
+--- src/frontends/qbanking/lib/Makefile.in 2007-10-15 12:47:51 -0700
++++ src/frontends/qbanking/lib/Makefile.in 2009-08-25 13:27:27 -0700
+@@ -556,9 +556,9 @@
+ dialogs/libdialogs.la views/libviews.la \
+ $(aqbanking_internal_libs) $(am__append_1)
+ testlib_SOURCES = testlib.cpp
+-testlib_LDADD = libqbanking.la $(aqbanking_internal_libs)
++testlib_LDADD = libqbanking.la $(aqbanking_internal_libs) $(qt3_libs)
+ checklib_SOURCES = checklib.cpp
+-checklib_LDADD = libqbanking.la $(aqbanking_internal_libs)
++checklib_LDADD = libqbanking.la $(aqbanking_internal_libs) $(qt3_libs)
+ TESTS = checklib
+ all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+--- src/frontends/qbanking/lib/dialogs/qbimporter.cpp 2009-08-23 15:11:25 -0700
++++ src/frontends/qbanking/lib/dialogs/qbimporter.cpp 2009-08-25 12:53:25 -0700
+@@ -835,7 +835,7 @@
+ // conversion operator "QCString::operator const char * ()
+ // const" that will correctly convert the QCString to the
+ // const char*
+- fd=open(fname.local8Bit().data(), O_RDONLY);
++ fd=::open(fname.local8Bit().data(), O_RDONLY);
+ if (fd==-1) {
+ qs=QWidget::tr("Could not open file \"%1\": %2")
+ .arg(fname)
+--- Makefile.in 2007-10-15 12:48:21.000000000 -0700
++++ Makefile.in 2009-08-25 14:01:07.000000000 -0700
+@@ -551,6 +551,11 @@
+ all: $(BUILT_SOURCES) config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
++qt4-all: $(BUILT_SOURCES) config.h
++ $(MAKE) $(AM_MAKEFLAGS) clean
++ $(MAKE) $(AM_MAKEFLAGS) qt4-port
++ $(MAKE) $(AM_MAKEFLAGS) all-recursive
++
+ .SUFFIXES:
+ am--refresh:
+ @:
\ No newline at end of file
commit 10959d400ab542f11cb0e582ed433a4807290a80
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 11:01:56 2009 -0700
Add gnucash-unstable branch, update dbi args to use local sql
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 461f751..6f63cbe 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -18,7 +18,7 @@
<repository type="tarball" name="csail"
href="http://groups.csail.mit.edu/mac/ftpdir/"/>
<repository type="tarball" name="gnucash.org"
- href="http://www.gnucash.org/pub/gnucash/sources/stable/"/>
+ href="http://www.gnucash.org/pub/gnucash/sources/"/>
<repository type="svn" name="svn.gnucash.org"
href="http://svn.gnucash.org/repo/"/>
@@ -104,7 +104,8 @@
version="0.8.3"/>
</autotools>
- <autotools id="libdbi-drivers" autogen-sh="configure">
+ <autotools id="libdbi-drivers" autogen-sh="configure"
+ autogenargs='--with-sqlite3 --with-sqlite3-incdir="/usr/include" --with-sqlite3-libdir="/usr/lib"'>
<branch repo="sourceforge" version="0.8.3-1"
module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz" />
<dependencies>
@@ -116,7 +117,7 @@
<autotools id="gnucash" autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc">
- <branch module="gnucash-2.2.9.tar.gz" version="2.2.9"
+ <branch module="stable/gnucash-2.2.9.tar.gz" version="2.2.9"
repo="gnucash.org">
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-xlib.patch" strip="0"/>
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-in.patch" strip="0"/>
commit 8204ef6c915f300d488987440098d2d1dff4fb15
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 10:59:56 2009 -0700
Change default source of moduleset to local.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index c329040..5031beb 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -20,7 +20,7 @@ module_autogenargs["libgnomeui"]="--disable-static --enable-shared --disable-scr
module_autogenargs["libdbi-drivers"]="--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib"
append_autogenargs("aqbanking-qt", 'qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers"')
-moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
+moduleset = os.environ["HOME"] + "/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
#build_policy = "updated-deps"
commit a909f11ee8a48f6ad0943f1baa17c2ecee335a05
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 10:59:33 2009 -0700
Update stable version numbers
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index c8fb922..9caa457 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>GnuCash</string>
<key>CFBundleGetInfoString</key>
- <string>GnuCash version 2.2.8 © 2008 Free Software Foundation</string>
+ <string>GnuCash version 2.2.9 © 2009 Free Software Foundation</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,22 +15,22 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.2.8 © 2008 Free Software Foundation</string>
+ <string>2.2.9 © 2009 Free Software Foundation</string>
<key>CFBundleName</key>
<string>GnuCash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.2.8</string>
+ <string>2.2.9</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.2.8</string>
+ <string>2.2.9</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
<true/>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2008 Free Software Foundation</string>
+ <string>Copyright 2009 Free Software Foundation</string>
</dict>
</plist>
commit 38cd5c2d01d4541c91951cb6a88ca7de7ca43997
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 27 10:59:07 2009 -0700
Add optional aqbanking with Qt support.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 50563f2..c329040 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -18,7 +18,7 @@ module_autogenargs["gconf"]="--enable-static --enable-shared --disable-scrollkee
module_autogenargs["libofx"]="--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib"
module_autogenargs["libgnomeui"]="--disable-static --enable-shared --disable-scrollkeeper --without-x"
module_autogenargs["libdbi-drivers"]="--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib"
-
+append_autogenargs("aqbanking-qt", 'qt3_libs="-framework QtCore -framework QtGui -framework Qt3Support" qt3_includes="-I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/Qt3Support.framework/Headers"')
moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 0f086ee..c514f21 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -101,7 +101,23 @@
${prefix}/bin/gnc-*
</binary>
- <!-- Data to copy in, usually Glade/UI files, images, sounds files
+ <framework>
+ /Library/Frameworks/QtCore.framework
+ </framework>
+
+ <framework>
+ /Library/Frameworks/QtGui.framework
+ </framework>
+
+ <framework>
+ /Library/Frameworks/Qt3Support.framework
+ </framework>
+
+ <framework>
+ /Library/Frameworks/QtSql.framework
+ </framework>
+
+ <!-- Data to copy in, usually Glade/UI files, images, sounds files
etc. The destination inside the bundle can be specified if the
files should end up at a different location, by using the
"dest" property. The destination must then start with the macro
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 81e84e4..461f751 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -49,6 +49,18 @@
</dependencies>
</autotools>
+ <autotools id="aqbanking-qt" autogen-sh="configure"
+ autogenargs='--enable-ofx=yes --disable-kde --disable-chipcard-client --with-backends="aqhbci aqdtaus aqofxconnect" --with-frontends="cbanking g2banking qbanking"' makeargs="qt4-all" >
+ <branch module="aqbanking/aqbanking-2.3.3.tar.gz" version="2.3.3"
+ repo="sourceforge">
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/aqbanking.patch" strip="0"/>
+ </branch>
+ <dependencies>
+ <dep package="libofx"/>
+ <dep package="gwenhywfar"/>
+ </dependencies>
+ </autotools>
+
<autotools id="OpenSP" autogen-sh='configure'
autogenargs="--disable-static --enable-shared --disable-doc-build">
<branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
@@ -115,6 +127,7 @@
<dep package="meta-gtk-osx-core"/>
<dep package="libofx"/>
<dep package="aqbanking"/>
+ <!-- dep package="aqbanking-qt"/ -->
<dep package="meta-gtkhtml"/>
<dep package="Slib"/>
</dependencies>
@@ -126,17 +139,35 @@
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc ">
<branch repo="svn.gnucash.org" module="gnucash"/>
- <dependencies>
+ <dependencies>
<dep package="meta-gtk-osx-core"/>
<dep package="meta-goffice"/>
<dep package="libofx"/>
<dep package="aqbanking"/>
+ <!-- dep package="aqbanking-qt"/ -->
<dep package="meta-gtkhtml"/>
<dep package="Slib"/>
</dependencies>
</autotools>
+ <autotools id="gnucash-unstable"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi ">
+ <branch module="unstable/gnucash-2.3.4.tar.gz" version="2.3.4"
+ repo="gnucash.org"/>
+ <dependencies>
+ <dep package="meta-gtk-osx-core"/>
+ <dep package="meta-goffice"/>
+ <dep package="libofx"/>
+ <dep package="aqbanking"/>
+ <!-- dep package="aqbanking-qt"/ -->
+ <dep package="meta-gtkhtml"/>
+ <dep package="Slib"/>
+ </dependencies>
+
+ </autotools>
+
<autotools id="gnucash-docs" makeargs=" html" >
<branch repo="gnucash.org" module="gnucash-docs-2.2.0.tar.gz"
version="2.2.0"/>
commit b09d2395061e73e823edbccc0bb0ba59abecf0e9
Merge: 841e204 1a706d7
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 21 10:04:38 2009 -0700
Merge branch 'master' into self-contained
commit 1a706d7beb959d4179684791abe39f0cb2c1f6ce
Merge: aac0c18 4317f08
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 21 10:02:54 2009 -0700
Merge commit 'HEAD'; commit 'origin/master'
commit aac0c187e7f95693e03a90bb8ee79fe89cd0c618
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 21 09:59:19 2009 -0700
Add libdbi for building gnucash unstable. Users will have to explicitly build libdbi-drivers before building gnucash, as there's no way to add dependencies to .jhbuildrc
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 6f322fb..50563f2 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -17,6 +17,7 @@ autogenargs=autogenargs + ' --disable-xlib'
module_autogenargs["gconf"]="--enable-static --enable-shared --disable-scrollkeeper --disable-xlib"
module_autogenargs["libofx"]="--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib"
module_autogenargs["libgnomeui"]="--disable-static --enable-shared --disable-scrollkeeper --without-x"
+module_autogenargs["libdbi-drivers"]="--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib"
moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index c5902a9..81e84e4 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -87,6 +87,21 @@
</dependencies>
</autotools>
+ <autotools id="libdbi" autogen-sh="configure">
+ <branch repo="sourceforge" module="libdbi/libdbi-0.8.3.tar.gz"
+ version="0.8.3"/>
+ </autotools>
+
+ <autotools id="libdbi-drivers" autogen-sh="configure">
+ <branch repo="sourceforge" version="0.8.3-1"
+ module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz" />
+ <dependencies>
+ <dep package="libdbi"/>
+ </dependencies>
+ </autotools>
+
+
+
<autotools id="gnucash" autogen-sh="configure"
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc">
<branch module="gnucash-2.2.9.tar.gz" version="2.2.9"
commit 4317f0887767ee56b9a62d5c36c8df387753ffe9
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Aug 11 17:38:06 2009 -0700
Cleared out some cruft files which are no longer (or never were) needed.
diff --git a/.jhbuildrc-fw-10.4 b/.jhbuildrc-fw-10.4
deleted file mode 100644
index c98961f..0000000
--- a/.jhbuildrc-fw-10.4
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- mode: python -*-
-#
-# Copyright (C) 2006 - 2008 Imendio AB
-#
-# Build setup for using the frameworks for GLib, Cairo, GTK+ etc.
-#
-
-prompt_prefix = "FW"
-
-# Source and installation locations.
-#
-root = os.path.expanduser("~/Source/gtk-fw")
-checkoutroot = os.path.join(root, "source")
-prefix = os.path.join(root, "inst")
-
-sdkdir = setup_sdk_10_4()
-
-# Skip those for now.
-#
-skip.append("gst-plugins-ugly")
-skip.append("gst-plugins-bad")
-skip.append("gst-ffmpeg")
-skip.append("faad")
-
-# Skip everything that is included in our frameworks.
-#
-skip.append("glib")
-skip.append("pango")
-skip.append("atk")
-skip.append("cairo")
-skip.append("gtk+")
-skip.append("ige-mac-integration")
-skip.append("gtk-engines")
-skip.append("hicolor-icon-theme")
-skip.append("gnome-icon-theme")
-skip.append("gettext")
-skip.append("intltool")
-skip.append("libpng")
-skip.append("libtiff")
-skip.append("libjpeg")
-skip.append("libglade")
-skip.append("loudmouth")
-skip.append("WebKit")
-
-# Not needed.
-#
-skip.append("waf")
-skip.append("pyxml")
-skip.append("automake-1.4")
-skip.append("automake-1.7")
-skip.append("automake-1.8")
-skip.append("tango-icon-theme")
-skip.append("tango-icon-theme-extras")
-
-# Setup jhbuild to point to frameworks.
-#
-environ_prepend("JHB_PREPEND_FRAMEWORKS", "/Library/Frameworks/GLib.framework", ":")
-environ_prepend("JHB_PREPEND_FRAMEWORKS", "/Library/Frameworks/Cairo.framework", ":")
-environ_prepend("JHB_PREPEND_FRAMEWORKS", "/Library/Frameworks/Gtk.framework", ":")
-environ_prepend("JHB_PREPEND_FRAMEWORKS", "/Library/Frameworks/Libglade.framework", ":")
-environ_prepend("JHB_PREPEND_FRAMEWORKS", "/Library/Frameworks/Loudmouth.framework", ":")
-environ_prepend("JHB_PREPEND_FRAMEWORKS", "/Library/Frameworks/WebKitGtk.framework", ":")
diff --git a/.jhbuildrc-gnucash b/.jhbuildrc-gnucash
deleted file mode 100644
index d589510..0000000
--- a/.jhbuildrc-gnucash
+++ /dev/null
@@ -1,116 +0,0 @@
-checkoutroot = os.path.expanduser('/usr/local/src/gnome')
-prefix = '/usr/local/gtk'
-autogenargs='--disable-static --disable-gtk-doc --disable-docs --disable-scrollkeeper ABI=32'
-path = os.path.expanduser('usr/local/gtk/bin/install-check')
-if os.path.exists(path):
- os.environ['INSTALL'] = path
-#NOTE: Installed by meta-gtk-osx-bootstrap & meta-gtk-osx-core:
-# libpng, gtk-doc, libjpeg, libtiff, libxml2, libxslt, docbook-setup,
-# gnome-doc-utils-fake, expat, perl-xml-parser, hicolor-icon-theme,
-# libcurl, bison, gnome-common, intltool
-# glib, cairo, freetype, fontconfig, meta-gtk-bootstrap,atk, pango,
-# pixman, ige-mac-integration
-
-modules=[meta-gtk-osx-bootstrap, meta-gtk-osx-core, libglade, libIDL, ORBit2, gconf, libgnomecanvas, dbus, dbus-glib, popt, icon-naming-utils, gome-icon-theme]
-
-moduleset=gnome-external-deps-2.22.modules
-
-modules=[libgpg-error, libgcrypt, libgsf, libtasn1]
-
-moduleset=gnome-suites-2.22.modules
-modules=[libgnomecups, gnome-mime-data, gnome-vfs, audiofile, esound,libart_lgpl, libbonobo, libbonoboui, libgnome, libgnomecanvas, libgnomeui, gnome-keyring, gtkhtml, libgnomeprint]
-
-Dependency Tree:
-
-libglade
- gtk+
- atk
- pango
- glib
- cairo
- pixman
- fontconfig
- freetype
- expat
- libpng
- gtk-doc
- docbook-setup
- libxslt
- libxml2
- gnome-doc-utils-fake
- libjpeg
- libtiff
- gnome-common
- intltool
- perl-xml-parser
- expat
- hicolor-icon-theme
- libcurl
- bison
-libgnomecanvas
- gtk+ (see libglade)
- libart_lgpl
-popt
-gnome-icon-theme
- icon-naming-utils
- gtk+
-
-
-{gnome-suites-2.22.modules}
-goffice X
- libgsf {gnome-external-deps} X
- gnome-vfs X
- gconf (from gtk-osx-random.modules)
- gtk+ (see libglade)
- ORBit2
- libIDL
- desktop-file-utils
- shared-mime-info
- gnome-mime-data
- avahi {gnome-external-deps} x
- dbus-python {gnome-external-deps} x
- dbus-glib(from gtk-osx-random.modules)
- pygtk (from gtk-osx-python.modules)
- pygobject
- pycairo
- libglade (q.v.)
- hal {gnome-external-deps} x
- dbus-glib (from gtk-osx-random.modules)
- dbus
- gtk+ (see libglade)
- libvolume_id {gnome-external-deps} x
- gamin {gnome-external-deps} x
-
- libbonobo x
- ORBit2 (see gconf)
- intltool (see pango)
- libxml2 (see pango)
- libgnomecanvas (gtk-osx-random.modules)
- libglade (q.v.)
- gnome-vfs (see libgsf)
-
-libgnomeprint x
- libgnomecups x
- pango (see libglade)
-
-gtkhtml X
- libgnomeui X
- gnome-keyring
- libgcrypt {gnome-external-deps} X
- libgpg-error {gnome-external-deps} X
- libtasn1 {gnome-external-deps} X
- libbonoboui (see libgnome)
- libgnome
- gnome-vfs (see libgsf)
- esound
- audifile
- libbonobo (see libgsf)
- esound
- audiofile
-
- libglade (q.v.)
- gnome-icon-theme (gtk-osx-themes.modules)
- gail X
- libsoup x
- gnutls {gnome-external-deps} X
- opencdk {gnome-external-deps} X
diff --git a/Gnucash Build Instructions b/Gnucash Build Instructions
deleted file mode 100644
index 2e028fe..0000000
--- a/Gnucash Build Instructions
+++ /dev/null
@@ -1,62 +0,0 @@
-
-==Overview==
-GnuCash can be built to run more or less natively on OSX -- meaning without X11. Better yet, the build is almost automatic.
-
-You can do this also with MacPorts: The details are described at MacOSX/MacPortsDetail. If you already have MacPorts installed, you should use that procedure, as gtk-osx doesn't work well with a MacPorts installation.
-
-If you want to have a clickable GnuCash.app to put in your Applications folder, this is the solution to use. If you want to be able to easily customize your installation, this is also the solution for you. Don't want all of the extra stuff that MacPorts drags in? Well, this might be a bit better... but GnuCash is notorious for its huge list of dependencies. Want to keep up with the latest work from the Gnome developers? This solution gets many of its packages directly from source-code-control... That's a double-edged sword, of course, because if a build gets broken, you're pretty well stuck until the developers for that package fix it.
-
-
-
-I've succeeded in building this under various incarnations of Leopard while perfecting the modulesets, always on a Mac Pro... but it ought to work on any Mac running Tiger or Leopard.
-
-The default configuration builds in your home folder. On my system, I build in /usr/local/src/gnome and install to /usr/local/gtk. If you want to do that, uncomment the checkoutroot and prefix lines in .jhbuildrc-custom, then create the folders up front and give yourself ownership. If you don't know how to do that, then you should probably leave it the way it is.
-
-==Preliminaries==
-Tiger or newer is '''''required'''' for gtk-osx.
-
-You need Python 2.5 to run jhbuild. This is already part of Leopard (OSX 10.5), but Tiger (10.4) provided Python 2.3, so the gtk-osx maintainer has included logic to make a new python for Tiger users.
-
-Download http://github.com/jralls/gnucash-on-osx/raw/master/.jhbuildrc-custom into your home directory.
-
-Note that by default, jhbuild will put everything into your home directory. I prefer to build and install into /usr/local, so you'll find commented out settings to do it that way at the top of .jhbuildrc-custom. You can uncomment these and change them to whatever you like -- or leave them as they are.
-
-Go to http://live.gnome.org/GTK%2B/OSX/BuildInstructions and follow the instructions. '''''Don't run jhbuild build yet!'''''
-
-At the moment, in order to build gtk-doc (which is required by a bunch of packages), you need python bindings for libxml2. For Leopard users, if you don't have this installed somewhere on your $PYTHONPATH, and for all Tiger users, run
-<tt>
-$> jhbuild buildone libxml-py
-</tt>
-
-If you have set <tt>$MACOSX_DEPLOYMENT_TARGET</tt> to something other than your running version of OSX, you may get an error during jhbuld bootstrap or later when building targets.
-
-==Building==
-
-Once all of the preliminaries are complete, run:
-<tt>
-$> jhbuild build
-</tt>
-
-
-
-==Running from the commandline==
-
-Now you're ready to try it out:
-<tt>
-$> $PREFIX/bin/gnucash
-</tt>
-
-==Making a Bundle==
-So far so good, but you don't really want to have to open a Terminal window every time you want to use GnuCash, now do you? Of course not. You want a nice icon in your Applications folder (and maybe in the Dock) to click on when you run GnuCash. Here's how to do this:
-
-:Download the bundler from http://github.com/jralls/gnucash-on-osx/raw/master/ige-mac-bundler.tar.gz, unpack it, cd into the ige-mac-bundler directory, and <tt>make install</tt>
-:Download http://github.com/jralls/gnucash-on-osx/raw/master/gnucash-bundler.tar.gz and unpack it.
-:<tt>cd gnucash-bundler</tt>
-:Look through gnucash-launcher and gnucash.bundle and adjust the paths to match your installation.
-:make gnucash-launcher executable (<tt>chmod +x gnucash-launcher</tt>)
-:execute <tt>jhbuild shell</tt> to set up the environment for the bundler
-:while in the shell, execute <tt> ige-mac-bundler gnucash.bundle</tt>.
-
-And your bundle should be ready to go.
-Try <tt>GnuCash.app/Contents/MacOSX/GnuCash</tt> from the command-line so that you can see any error messages. If that works, try <tt>open GnuCash.app</tt>. If that works, then you can move GnuCash.app to your Applications folder and it's ready to use. '''''Don't move or remove the installation directory (~/gtk/inst by default): Both dbus and GnuCash have links pointing into it which can't at present be changed.'''''
-
diff --git a/gnucash.start b/gnucash.start
deleted file mode 100644
index eef42de..0000000
--- a/gnucash.start
+++ /dev/null
@@ -1,34 +0,0 @@
-export PREFIX="/usr/local/gtk2/" #You'll have to fix this up if you changed it
-export PATH="$PREFIX/bin:${PATH}"
-export XDG_CONFIG_DIRS=$PREFIX/etc/xdg
-export XDG_DATA_DIRS=$PREFIX/share
-
-
-GUILE_WARN_DEPRECATED="no"
-export GUILE_WARN_DEPRECATED
-
-if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
- eval `dbus-launch --sh-syntax --exit-with-session --config-file=$PREFIX/etc/dbus-1/session.conf`
-fi
-
-GNC_MODULE_PATH="$PREFIX/lib/gnucash:${GNC_MODULE_PATH}"
-
-EXTRA_PATH="${EXTRA_PATH}:$PREFIX/share/gnucash/guile-modules"
-EXTRA_PATH="${EXTRA_PATH}:$PREFIX/share/gnucash/scm"
-GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
-
-EXTRA_LIBS="${GNC_MODULE_PATH}"
-EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
-EXTRA_LIBS="${EXTRA_LIBS}:$PREFIX/lib"
-EXTRA_LIBS="${EXTRA_LIBS}:$PREFIX/lib/gnucash"
-
-LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
-DYLD_LIBRARY_PATH="${EXTRA_LIBS}:${DYLD_LIBRARY_PATH}"
-
-export GNC_MODULE_PATH
-export GUILE_LOAD_PATH
-export LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH
-
-exec gnucash-bin "$@"
-
diff --git a/gtk-osx-build-setup.sh b/gtk-osx-build-setup.sh
deleted file mode 100644
index ab5017d..0000000
--- a/gtk-osx-build-setup.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-#
-# Script that sets up jhbuild for GTK+ OS X building. Run this to
-# checkout jhbuild and the required configuration.
-#
-# Copyright 2007, 2008 Imendio AB
-#
-# Run this whenever you want to update jhbuild or the jhbuild setup;
-# it is safe to run it repeatedly. Note that it overwrites
-# ~/.jhbuildrc however. Custom settings should be kept in
-# ~/.jhbuildrc-custom.
-#
-# You need Mac OS X 10.4 or newer and Xcode 2.5 or newer. Make sure
-# you have subversion (svn) installed, 10.5 has it by default.
-#
-# Quick HOWTO:
-#
-# sh gtk-osx-build-setup.sh
-#
-# jhbuild bootstrap
-# jhbuild build meta-gtk-osx-bootstrap
-# jhbuild build
-#
-# See http://developer.imendio.com/projects/gtk-macosx for more information.
-#
-
-SOURCE=/usr/local/src
-BASEURL=http://people.imendio.com/richard
-
-do_exit()
-{
- echo $1
- exit 1
-}
-
-if test x`which svn` == x; then
- do_exit "Svn (subversion) is not available, please install it and try again."
-fi
-
-mkdir -p $SOURCE 2>/dev/null || do_exit "The directory $SOURCE could not be created. Check permissions and try again."
-
-if ! test -d $SOURCE/jhbuild; then
- echo "Checking out jhbuild from subversion..."
- svn co http://svn.gnome.org/svn/jhbuild/trunk $SOURCE/jhbuild >/dev/null
-else
- echo "Updating jhbuild from subversion..."
- (cd $SOURCE/jhbuild && svn up >/dev/null)
-fi
-
-echo "Installing jhbuild..."
-(cd $SOURCE/jhbuild && sudo make -f Makefile.plain DISABLE_GETTEXT=1 install >/dev/null)
-
-echo "Installing jhbuild configuration..."
-curl -s $BASEURL/gtk-osx-build/jhbuildrc-gtk-osx -o $HOME/.jhbuildrc
-curl -s $BASEURL/gtk-osx-build/jhbuildrc-gtk-osx-fw-10.4 -o $HOME/.jhbuildrc-fw-10.4
-if [ ! -f $HOME/.jhbuildrc-custom ]; then
- curl -s $BASEURL/gtk-osx-build/jhbuildrc-gtk-osx-custom-example -o $HOME/.jhbuildrc-custom
-fi
-
-#if test "x`echo $PATH | grep $HOME/bin`" == x; then
-# echo "PATH does not contain $HOME/bin, it is recommended that you add that."
-# echo
-#fi
-
-echo "Done."
commit b19f18627a8c5d2fbc977a683a7b8177808154b1
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 9 10:50:27 2009 -0700
Add OFX modules to bundle
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 8a338ab..0f086ee 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -119,6 +119,10 @@
${prefix}/lib/libgnc-*.la
</data>
+ <data dest="${bundle}/Contents/Resources/lib/">
+ ${prefix}/lib/libofx.la
+ </data>
+
<data>
${prefix}/etc/xdg
</data>
@@ -152,6 +156,10 @@
</data>
<data>
+ ${prefix}/share/libofx
+ </data>
+
+ <data>
${prefix}/share/aqhbci
</data>
commit 2194c0820716783fa17fd1bc3fde6b37728eec07
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 6 11:42:44 2009 -0700
Added libgnc-*.la to data transfers
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 49e74b3..8a338ab 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -111,10 +111,14 @@
${prefix}/etc/gnucash
</data>
- <data dest="${bundle}/Contents/Resources/lib/">
+ <data dest="${bundle}/Contents/Resources/lib/">
${prefix}/lib/libguile-srfi-srfi-*.la
</data>
+ <data dest="${bundle}/Contents/Resources/lib/">
+ ${prefix}/lib/libgnc-*.la
+ </data>
+
<data>
${prefix}/etc/xdg
</data>
commit 841e2044c201ca6070d9cc28c6a7fcb9e47d3d1b
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 9 10:51:28 2009 -0700
Better scripts for creating the $PREFIX back-link
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index 7dda599..3282ea2 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -11,6 +11,7 @@ else
fi
export PREFIX=/opt/gnucash-2.2.9
+export PREFIXDIR="`dirname $PREFIX`"
name="`basename $0`"
tmp="$0"
@@ -67,7 +68,7 @@ if [ -d "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
osascript -e 'do shell script " if [ -h $PREFIX ]; then rm $PREFIX; else mv $PREFIX $PREFIX.Save; fi; ln -s $PFX $PREFIX" with administrator privileges '
elif [ ! -d "$PREFIX" ] ; then
echo "Linking $PFX to $PREFIX"
- osascript -e 'do shell script "ln -s $PFX $PREFIX" with administrator privileges ';
+ osascript -e 'do shell script "if [ ! -d $PREFIXDIR ]; then mkdir -p $PREFIXDIR; fi; ln -s $PFX $PREFIX" with administrator privileges ';
fi
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
commit e5b2bc921817a3156e026c8456dffefc338a0cd0
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 9 10:50:27 2009 -0700
Add OFX modules to bundle
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 6be4103..11178d0 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -119,6 +119,10 @@
${prefix}/lib/libgnc-*.la
</data>
+ <data dest="${bundle}/Contents/Resources/lib/">
+ ${prefix}/lib/libofx.la
+ </data>
+
<data>
${prefix}/etc/xdg
</data>
@@ -152,6 +156,10 @@
</data>
<data>
+ ${prefix}/share/libofx
+ </data>
+
+ <data>
${prefix}/share/aqhbci
</data>
commit 1ef1294a7028d494aeba8eec98f90d36f5acb73e
Merge: 7eb1621 7709270
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 6 14:28:18 2009 -0700
Merge commit 'origin/self-contained' into self-contained
commit 7eb162129c98848a7d71797cc54495749a0f8294
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 6 14:27:16 2009 -0700
Compressed the two step move/link to a single step.
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index 6c6a5e4..7dda599 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -64,17 +64,10 @@ GUILE_WARN_DEPRECATED="no"
export GUILE_WARN_DEPRECATED
if [ -d "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
- if [ -h "$PREFIX" ]; then
- echo "Deleting Old Link"
- osascript -e 'do shell script "rm $PREFIX" with administrator priviliges';
- else
- echo "Moving existing directory out of the way"
- osascript -e 'do shell script "mv $PREFIX $PREFIX.Save" with administrator privileges';
- fi
-fi
-if [ ! -d "$PREFIX" ] ; then
+ osascript -e 'do shell script " if [ -h $PREFIX ]; then rm $PREFIX; else mv $PREFIX $PREFIX.Save; fi; ln -s $PFX $PREFIX" with administrator privileges '
+elif [ ! -d "$PREFIX" ] ; then
echo "Linking $PFX to $PREFIX"
- osascript -e 'do shell script "ln -s $PFX $PREFIX" with administrator privileges';
+ osascript -e 'do shell script "ln -s $PFX $PREFIX" with administrator privileges ';
fi
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
commit 3cccad30a15f17ecb5462e7339c5b1647d551805
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 6 14:26:41 2009 -0700
Added LICENSE and Sources to the bundle
diff --git a/gnucash-bundler/Sources b/gnucash-bundler/Sources
new file mode 100644
index 0000000..9744d4a
--- /dev/null
+++ b/gnucash-bundler/Sources
@@ -0,0 +1,42 @@
+This bundle provides GnuCash, an accounting program. See the file
+"LICENSE" in the Contents folder of the bundle for the licensing
+terms. Sources are available at http://www.gnucash.org.
+
+Also provided in this app bundle are a variety of libraries, most of
+which are provided under the terms of the Gnu General Public
+License. To comply with the redistribution requirements of that
+license, the current list of dependencies and the World Wide Web
+addresses at which you can find the source code and the exact license
+terms for each are provided below. Note that this list is only of
+those dpendencies provided here in binary form. Other programs may be
+required to successfully build GnuCash from source. Additional
+information on that may be found at http://www.gnucash.org.
+
+GConf: http://projects.gnome.org/gconf
+AQBanking: http://www.aquamania.de/aqbanking
+Gettext: http://www.gnu.org/software/gettext
+Gtk+-2.0: http://www.gtk.org
+ORBit: http://orbit-resource.sourceforge.net/
+bonobo: http://ftp.acc.umu.se/pub/GNOME/sources/libbonobo/
+cairo: http://cairographics.org/
+dbus: http://dbus.freedesktop.org
+enchant: http://www.abisource.com/projects/enchant/
+expat: http://expat.sourceforge.net/
+fontconfig: http://www.fontconfig.org/wiki/
+freetype: http://www.freetype.org/
+Glade: http://glade.gnome.org/
+Guile: http://www.gnu.org/software/guile/guile.html
+Ige-mac-integration: http://gtk-osx.sourceforge.net
+libart_lgpl: http://www.linuxfromscratch.org/blfs/view/cvs/general/libart_lgpl.html
+libgnome: http://www.gnome.org
+libgoffice: http://ftp.gnome.org/pub/GNOME/sources/goffice/
+libjpeg: http://www.ijg.org/
+libofx: http://libofx.sourceforge.net
+libpng: http://www.libpng.org/pub/png/
+libtiff: http://www.libtiff.org/index.html
+OpenSP: http://openjade.sourceforge.net/
+Pango: http://www.pango.org
+Popt: http://rpm5.org/files/popt/
+Python: http://www.python.org
+readline: http://www.gnu.org/software/readline
+Slib: http://groups.csail.mit.edu/slib
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 5ce6d71..b9a39b6 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -177,6 +177,14 @@
${prefix}/etc/dbus-1/
</data>
+ <data dest="${bundle}/Contents/Resources/License">
+ ${prefix}/share/gnucash/doc/LICENSE
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/Sources">
+ ${project}/Sources
+ </data>
+
<data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Help/">
/usr/local/src/gnome/gnucash-docs-2.2.0/help/C/gnucash-help/
</data>
commit 770927000221d787e89e53b4630a1aebd1e6c854
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 6 11:42:44 2009 -0700
Added libgnc-*.la to data transfers
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 5ce6d71..d7c5e6e 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -111,10 +111,14 @@
${prefix}/etc/gnucash
</data>
- <data dest="${bundle}/Contents/Resources/lib/">
+ <data dest="${bundle}/Contents/Resources/lib/">
${prefix}/lib/libguile-srfi-srfi-*.la
</data>
+ <data dest="${bundle}/Contents/Resources/lib/">
+ ${prefix}/lib/libgnc-*.la
+ </data>
+
<data>
${prefix}/etc/xdg
</data>
commit b32e6d896b4f04ba305d53287b2857ca5c99842c
Merge: 9072729 a941d5b
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Aug 4 15:23:03 2009 -0700
Merge branch 'master' into self-contained
commit a941d5b06dfe53cbbc1fb5e2786331d45a77672b
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Aug 4 15:22:36 2009 -0700
Ensure that ige-mac-integration gets build before building gnucash.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index c29fe69..c5902a9 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -97,6 +97,7 @@
</branch>
<dependencies>
<dep package="meta-goffice"/>
+ <dep package="meta-gtk-osx-core"/>
<dep package="libofx"/>
<dep package="aqbanking"/>
<dep package="meta-gtkhtml"/>
@@ -111,6 +112,7 @@
autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc ">
<branch repo="svn.gnucash.org" module="gnucash"/>
<dependencies>
+ <dep package="meta-gtk-osx-core"/>
<dep package="meta-goffice"/>
<dep package="libofx"/>
<dep package="aqbanking"/>
commit cb6e89de18950c37395a82fb1430ec4e40d637aa
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Aug 4 14:31:54 2009 -0700
Slib new version
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a5d7c1b..c29fe69 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -78,7 +78,7 @@
makeinstallargs="-f Makefile.gnucash">
<!-- <branch repo="slib.savannah.gnu.org"
module="slib"/> -->
- <branch repo="csail" module="scm/slib-3b1.zip" version="3b1"
+ <branch repo="csail" module="scm/slib-3b2.zip" version="3b1"
checkoutdir="slib">
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/slib-install.patch"/>
</branch>
commit 90727291843d764c3d3ae626a2fbae776130ac64
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Aug 4 14:47:33 2009 -0700
Add Documentation to bundle
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 49e74b3..5ce6d71 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -177,6 +177,14 @@
${prefix}/etc/dbus-1/
</data>
+ <data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Help/">
+ /usr/local/src/gnome/gnucash-docs-2.2.0/help/C/gnucash-help/
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/English.lproj/GnuCash Guide/">
+ /usr/local/src/gnome/gnucash-docs-2.2.0/guide/C/gnucash-guide/
+ </data>
+
<!-- This takes the Quartz theme instructions from the package and puts them in the bundle gtkrc file. You may want to cusomize the source path if you want a different theme, or if you want other stuff in your gtkrc.
<data dest='${bundle}/Contents/Resources/etc/gtk-2.0/gtkrc'>
commit 96e4ab4fff0978d301371894ab6a4a6ae1c4f9d9
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Aug 4 14:31:54 2009 -0700
Slib new version
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a5d7c1b..c29fe69 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -78,7 +78,7 @@
makeinstallargs="-f Makefile.gnucash">
<!-- <branch repo="slib.savannah.gnu.org"
module="slib"/> -->
- <branch repo="csail" module="scm/slib-3b1.zip" version="3b1"
+ <branch repo="csail" module="scm/slib-3b2.zip" version="3b1"
checkoutdir="slib">
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/slib-install.patch"/>
</branch>
commit 2316caa4f9619c0fd26c0672376bb51b5fb6ff88
Merge: 798bd74 49339dd
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 2 17:43:01 2009 -0700
Merge branch 'master' into self-contained
commit 49339dde113a520923c6318c817fe9e437f5670f
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 2 17:39:16 2009 -0700
Added modules for gnucash docs (the stable ones)
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 8421288..a5d7c1b 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -120,5 +120,22 @@
</autotools>
+ <autotools id="gnucash-docs" makeargs=" html" >
+ <branch repo="gnucash.org" module="gnucash-docs-2.2.0.tar.gz"
+ version="2.2.0"/>
+ <dependencies>
+ <dep package="scrollkeeper"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="scrollkeeper">
+ <branch repo="sourceforge" module="scrollkeeper/scrollkeeper-0.3.14.tar.gz"
+ version="0.3.14"/>
+ <dependencies>
+ <dep package="libxml2"/>
+ <dep package="libxslt"/>
+ <dep package="gtk-osx-docbook"/>
+ </dependencies>
+ </autotools>
</moduleset>
commit 798bd74c4beb64383b4386157ed73c3ec20c70fc
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 2 14:54:18 2009 -0700
Set up for self-contained application bundle
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index 0bae729..6c6a5e4 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -10,7 +10,7 @@ else
EXEC=exec
fi
-export PREFIX=~/gtk/inst
+export PREFIX=/opt/gnucash-2.2.9
name="`basename $0`"
tmp="$0"
@@ -62,9 +62,20 @@ export PATH
GUILE_WARN_DEPRECATED="no"
export GUILE_WARN_DEPRECATED
-#if test !(-f "${PFX}/var/run/dbus/pid"); then
-# dbus-daemon --system
-#fi
+
+if [ -d "$PREFIX" ] && [ ! "$PREFIX" -ef "$bundle_res" ]; then
+ if [ -h "$PREFIX" ]; then
+ echo "Deleting Old Link"
+ osascript -e 'do shell script "rm $PREFIX" with administrator priviliges';
+ else
+ echo "Moving existing directory out of the way"
+ osascript -e 'do shell script "mv $PREFIX $PREFIX.Save" with administrator privileges';
+ fi
+fi
+if [ ! -d "$PREFIX" ] ; then
+ echo "Linking $PFX to $PREFIX"
+ osascript -e 'do shell script "ln -s $PFX $PREFIX" with administrator privileges';
+fi
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
eval `dbus-launch --sh-syntax --exit-with-session --config-file=$bundle_res/etc/dbus-1/session.conf`
commit 5fd188b83b9e5d2e74db284234c6ab81732e079b
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 2 12:27:27 2009 -0700
Add all directories required for self-contained operation.
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 83cbb3b..49e74b3 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -76,6 +76,15 @@
<binary>
${prefix}/lib/gnucash
</binary>
+
+ <binary>
+ ${prefix}/lib/aqbanking
+ </binary>
+
+ <binary>
+ ${prefix}/lib/libglade
+ </binary>
+
<binary>
${prefix}/libexec
</binary>
@@ -135,6 +144,14 @@
</data>
<data>
+ ${prefix}/share/aqbanking
+ </data>
+
+ <data>
+ ${prefix}/share/aqhbci
+ </data>
+
+ <data>
${prefix}/share/mime
</data>
commit c87a3080d8844d4878791ca1aca3447d8d33d54e
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 1 17:00:51 2009 -0700
Correct g_type_init patch
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
index 0986b22..9b69265 100644
--- a/patches/gnucash-integration.patch
+++ b/patches/gnucash-integration.patch
@@ -337,12 +337,13 @@ index d582a5d..032f2af 100644
/** @internal
* Find the canonical filename of the executable. Returns the filename
-@@ -61,6 +66,23 @@ _br_find_exe (GbrInitError *error)
+@@ -61,6 +66,24 @@ _br_find_exe (GbrInitError *error)
(char*)NULL);
g_free (prefix);
return result;
+#elif MAC_INTEGRATION
+ gchar *prefix = NULL, *result = NULL;
++ g_type_init();
+ bundle = ige_mac_bundle_get_default();
+ if (!bundle) {
+ *error = GBR_INIT_ERROR_DISABLED;
commit c486faf6a3bdc1edba013dc742b70172395384b9
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 1 16:58:12 2009 -0700
Revert "Initialize the g_type system for ige-mac-bundle when using binreloc."
(Patched the wrong place.)
This reverts commit 41465da091d1b31efa1a48729ae7456cc17bf059.
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
index de427c2..0986b22 100644
--- a/patches/gnucash-integration.patch
+++ b/patches/gnucash-integration.patch
@@ -433,15 +433,3 @@ index d582a5d..032f2af 100644
}
---- a/src/bin/gnucash-bin.c
-+++ b/src/bin/gnucash-bin.c
-@@ -571,6 +571,9 @@ main(int argc, char ** argv)
- #ifdef ENABLE_BINRELOC
- {
- GError *binreloc_error = NULL;
-+#ifdef MAC_INTEGRATION
-+ g_type_init();
-+endif
- if (!gbr_init(&binreloc_error)) {
- g_print("main: Error on gbr_init: %s\n", binreloc_error->message);
- g_error_free(binreloc_error);
commit 21a6536fdca4dfbb2d140bb5ff7226beab739c9e
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 1 16:54:11 2009 -0700
Revert "Fixed typos in patch"
This reverts commit 2267278abfd6d849e110570a9b0eeb8eb31ec297.
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
index 455bc5d..de427c2 100644
--- a/patches/gnucash-integration.patch
+++ b/patches/gnucash-integration.patch
@@ -435,13 +435,13 @@ index d582a5d..032f2af 100644
--- a/src/bin/gnucash-bin.c
+++ b/src/bin/gnucash-bin.c
-@@ -565,6 +571,9 @@ main(int argc, char ** argv)
+@@ -571,6 +571,9 @@ main(int argc, char ** argv)
#ifdef ENABLE_BINRELOC
{
GError *binreloc_error = NULL;
+#ifdef MAC_INTEGRATION
+ g_type_init();
-+#endif
++endif
if (!gbr_init(&binreloc_error)) {
g_print("main: Error on gbr_init: %s\n", binreloc_error->message);
g_error_free(binreloc_error);
commit 2267278abfd6d849e110570a9b0eeb8eb31ec297
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 1 16:31:14 2009 -0700
Fixed typos in patch
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
index de427c2..455bc5d 100644
--- a/patches/gnucash-integration.patch
+++ b/patches/gnucash-integration.patch
@@ -435,13 +435,13 @@ index d582a5d..032f2af 100644
--- a/src/bin/gnucash-bin.c
+++ b/src/bin/gnucash-bin.c
-@@ -571,6 +571,9 @@ main(int argc, char ** argv)
+@@ -565,6 +571,9 @@ main(int argc, char ** argv)
#ifdef ENABLE_BINRELOC
{
GError *binreloc_error = NULL;
+#ifdef MAC_INTEGRATION
+ g_type_init();
-+endif
++#endif
if (!gbr_init(&binreloc_error)) {
g_print("main: Error on gbr_init: %s\n", binreloc_error->message);
g_error_free(binreloc_error);
commit d42f97327ee8462556e243f020294ee1c3860ac5
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 1 16:22:46 2009 -0700
Enable binreloc by default
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 75d802b..8421288 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -88,7 +88,7 @@
</autotools>
<autotools id="gnucash" autogen-sh="configure"
- autogenargs="--enable-ofx --enable-aqbanking ">
+ autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc">
<branch module="gnucash-2.2.9.tar.gz" version="2.2.9"
repo="gnucash.org">
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-xlib.patch" strip="0"/>
@@ -108,7 +108,7 @@
<autotools id="gnucash-svn"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
- autogenargs="--enable-ofx --enable-aqbanking ">
+ autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc ">
<branch repo="svn.gnucash.org" module="gnucash"/>
<dependencies>
<dep package="meta-goffice"/>
commit 41465da091d1b31efa1a48729ae7456cc17bf059
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 1 16:22:15 2009 -0700
Initialize the g_type system for ige-mac-bundle when using binreloc.
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
index 0986b22..de427c2 100644
--- a/patches/gnucash-integration.patch
+++ b/patches/gnucash-integration.patch
@@ -433,3 +433,15 @@ index d582a5d..032f2af 100644
}
+--- a/src/bin/gnucash-bin.c
++++ b/src/bin/gnucash-bin.c
+@@ -571,6 +571,9 @@ main(int argc, char ** argv)
+ #ifdef ENABLE_BINRELOC
+ {
+ GError *binreloc_error = NULL;
++#ifdef MAC_INTEGRATION
++ g_type_init();
++endif
+ if (!gbr_init(&binreloc_error)) {
+ g_print("main: Error on gbr_init: %s\n", binreloc_error->message);
+ g_error_free(binreloc_error);
commit 2ba768e41d88cd9c075898621f7ba7e353bf063a
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jul 19 15:11:28 2009 -0700
Only pull in the one libtool (.la) file we need, not all of them.
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 8f7e12a..83cbb3b 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -102,6 +102,10 @@
${prefix}/etc/gnucash
</data>
+ <data dest="${bundle}/Contents/Resources/lib/">
+ ${prefix}/lib/libguile-srfi-srfi-*.la
+ </data>
+
<data>
${prefix}/etc/xdg
</data>
@@ -147,9 +151,6 @@
${project}/gnucash.icns
</data>
- <data dest='${bundle}/Contents/Resources/lib/'>
- ${prefix}/lib/*.la
- </data>
<data dest='${bundle}/Contents/Resources/var/lib/dbus/machine-id'>
${prefix}/var/lib/dbus/machine-id
commit c7283b52c74e7fd0e8ff501a1d73dfeed7572595
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jul 19 15:09:19 2009 -0700
Fixed PREFIX to point to the default; removed `pwd` from definition of tmp
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
index 813572d..0bae729 100755
--- a/gnucash-bundler/gnucash-launcher
+++ b/gnucash-bundler/gnucash-launcher
@@ -10,10 +10,10 @@ else
EXEC=exec
fi
-export PREFIX=/usr/local/gtk
+export PREFIX=~/gtk/inst
name="`basename $0`"
-tmp="`pwd`/$0"
+tmp="$0"
tmp=`dirname "$tmp"`
tmp=`dirname "$tmp"`
bundle=`dirname "$tmp"`
commit 71c202c94039febce240a982ee50da41d4a08714
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jul 14 16:46:39 2009 -0700
Add in some missing directories
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 5844f75..8f7e12a 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -21,8 +21,10 @@
<image>
<!-- Not implemented yet (DMG image). -->
</image>
+ <!-- Comment this out to keep the install names in binaries -->
<run-install-name-tool/>
+
<!-- Optionally specify a launcher script to use. If the
application sets up everything needed itself, like
environment variable, linker paths, etc, a launcher script is
@@ -66,6 +68,11 @@
${prefix}/lib/GConf/2/*.so
</binary>
+ <!-- Seems to get missed by the dependency resolver -->
+ <binary>
+ ${prefix}/lib/libguile-srfi*
+ </binary>
+
<binary>
${prefix}/lib/gnucash
</binary>
@@ -100,6 +107,10 @@
</data>
<data>
+ ${prefix}/etc/gconf
+ </data>
+
+ <data>
${prefix}/share/gnucash
</data>
@@ -112,6 +123,14 @@
</data>
<data>
+ ${prefix}/share/GConf
+ </data>
+
+ <data>
+ ${prefix}/share/dbus-1/
+ </data>
+
+ <data>
${prefix}/share/mime
</data>
@@ -143,8 +162,8 @@
<!-- This takes the Quartz theme instructions from the package and puts them in the bundle gtkrc file. You may want to cusomize the source path if you want a different theme, or if you want other stuff in your gtkrc.
<data dest='${bundle}/Contents/Resources/etc/gtk-2.0/gtkrc'>
- ${prefix}/share/themes/Quartz/gtk-2.0/gtkrc
- </data>
+ ${prefix}/share/themes/Quartz/gtk-2.0/gtkrc
+ </data>
-->
<!-- Icon themes to copy. The "icons" property can be either of
commit 52212b2b5c74df883c17253f12fbd07d9737e416
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jul 10 14:58:19 2009 -0700
Changed pulling the gnucash.icns from the bundler directory so that it doesn't (pointlessly) have to be copied to the gnucash tree.
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index b27c702..5844f75 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -125,7 +125,7 @@
</data>
<data dest="${bundle}/Contents/Resources">
- ${prefix}/share/gnucash/pixmaps/gnucash.icns
+ ${project}/gnucash.icns
</data>
<data dest='${bundle}/Contents/Resources/lib/'>
commit 1e8f869442b0fbce7af33c8c967edcd6326cdc27
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jul 10 14:57:08 2009 -0700
Commented out the insertion of the gtk-quartz-theme .gtkrc, as gtk-quartz-theme isn't built by default.
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index b9045b9..b27c702 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -140,11 +140,12 @@
${prefix}/etc/dbus-1/
</data>
-<!-- This takes the Quartz theme instructions from the package and puts them in the bundle gtkrc file. You may want to cusomize the source path if you want a different theme, or if you want other stuff in your gtkrc. -->
+<!-- This takes the Quartz theme instructions from the package and puts them in the bundle gtkrc file. You may want to cusomize the source path if you want a different theme, or if you want other stuff in your gtkrc.
<data dest='${bundle}/Contents/Resources/etc/gtk-2.0/gtkrc'>
- ${prefix}/share/themes/Quartz/gtk-2.0/gtkrc
- </data>
+ ${prefix}/share/themes/Quartz/gtk-2.0/gtkrc
+ </data>
+-->
<!-- Icon themes to copy. The "icons" property can be either of
"auto", "all", or "none". All or none should be
commit 0156091b10e55dc21622ced21fea20682f61efe8
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jul 10 14:55:49 2009 -0700
Changed destination of bundle to $HOME/GnuCash.app
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index a9ca8c3..b9045b9 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -16,7 +16,7 @@
app. If you leave out the path, the current directory is
used.
-->
- <destination overwrite="yes">${env:HOME}/gnucash-bundler</destination>
+ <destination overwrite="yes">${env:HOME}</destination>
<image>
<!-- Not implemented yet (DMG image). -->
commit ffeeb4f46ea6bac3a8836c384f19cd8bbeed96b5
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 27 16:29:54 2009 -0700
Converted entirely to tarball downloads for stability.
Updated all packages to the best current versions; there are comments in the modulesets where that isn't the absolute latest.
Removed several modules which are already supported in GTK-OSX.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 524203d..75d802b 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -19,6 +19,8 @@
href="http://groups.csail.mit.edu/mac/ftpdir/"/>
<repository type="tarball" name="gnucash.org"
href="http://www.gnucash.org/pub/gnucash/sources/stable/"/>
+ <repository type="svn" name="svn.gnucash.org"
+ href="http://svn.gnucash.org/repo/"/>
@@ -102,5 +104,21 @@
</dependencies>
</autotools>
+
+ <autotools id="gnucash-svn"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+
+ autogenargs="--enable-ofx --enable-aqbanking ">
+ <branch repo="svn.gnucash.org" module="gnucash"/>
+ <dependencies>
+ <dep package="meta-goffice"/>
+ <dep package="libofx"/>
+ <dep package="aqbanking"/>
+ <dep package="meta-gtkhtml"/>
+ <dep package="Slib"/>
+ </dependencies>
+
+ </autotools>
+
</moduleset>
diff --git a/modulesets/goffice.modules b/modulesets/goffice.modules
index 8571b8c..e6dc691 100644
--- a/modulesets/goffice.modules
+++ b/modulesets/goffice.modules
@@ -2,9 +2,9 @@
<!-- Moduleset for building goffice libraries needed for GnuCash -->
<moduleset>
- <repository type="svn" name="svn.gnome.org" default="yes"
- href="http://svn.gnome.org/svn/"/>
-
+ <repository type="tarball" name="ftp.gnome.org" default="yes"
+ href="http://ftp.gnome.org/pub/GNOME/sources/"/>
+
<metamodule id="meta-goffice">
<dependencies>
<dep package="goffice"/>
@@ -14,7 +14,7 @@
</metamodule>
<autotools id="goffice">
- <!--
+ <!--
You need: Debian package name
glib >= 2.8.0 libglib2.0-dev
gtk+ >= 2.6.0 libgtk2.0-dev
@@ -24,8 +24,10 @@ You need: Debian package name
gnome-xml >= 2.4.12 libxml2-dev
NOTE: gnome-xml is also known as libxml
libart >= 2.3.11 libart-2.0-dev
--->
- <branch revision="goffice-0-6"/>
+ -->
+ <!-- gnucash 2.2.9 won't build against newer GOffice. -->
+ <branch module="goffice/0.7/goffice-0.7.4.tar.bz2" version="0.7.4"
+ md5sum="8fe65cb6a60e6064025fa465da99d31e"/>
<dependencies>
<dep package="glib"/>
<dep package="libgsf"/>
@@ -39,7 +41,8 @@ You need: Debian package name
</autotools>
<autotools id="libgsf">
- <branch revision="1034"/>
+ <branch module="libgsf/1.14/libgsf-1.14.15.tar.bz2" version="1.14.15"
+ md5sum="5118e971b4257f50b6914404593f63cf"/>
<dependencies>
<dep package="glib"/>
<dep package="gnome-vfs"/>
@@ -48,7 +51,8 @@ You need: Debian package name
</autotools>
<autotools id="libart_lgpl">
- <branch revision="280"/>
+ <branch module="libart_lgpl/2.3/libart_lgpl-2.3.20.tar.bz2"
+ version="2.3.20" md5sum="d0ce67f2ebcef1e51a83136c69242a73"/>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
<dep package="meta-gtk-osx-core"/>
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index b1c1f26..01f5183 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -4,9 +4,7 @@
<moduleset>
- <repository type="svn" name="svn.gnome.org" default="yes"
- href="http://svn.gnome.org/svn/"/>
- <repository type="tarball" name="ftp.gnome.org"
+ <repository type="tarball" name="ftp.gnome.org" default="yes"
href="http://ftp.gnome.org/pub/GNOME/sources/"/>
<repository type='tarball' name='rpm5.org'
href="http://rpm5.org/files/"/>
@@ -58,7 +56,8 @@ later).
Optionally you may want to install GConf 1.0.7 (or later).
-->
- <branch revision="gnome-2-26"/>
+ <branch module="gtkhtml/3.26/gtkhtml-3.26.2.tar.bz2" version="3.26.2"
+ md5sum="5b109d47aaa95898a169fa9ae572c763"/>
<dependencies>
<dep package="gtk+"/>
<dep package="libgnomeui"/>
@@ -70,19 +69,16 @@ Optionally you may want to install GConf 1.0.7 (or later).
<dep package="enchant"/>
</dependencies>
</autotools>
+
<autotools id="libgnomecups">
- <branch revision="236"/>
+ <branch module="libgnomecups/0.2/libgnomecups-0.2.3.tar.bz2" version="0.2.3"
+ md5sum="dc4920c15c9f886f73ea74fbff0ae48b"/>
<dependencies>
<dep package="glib"/>
<dep package="gnome-common"/>
</dependencies>
</autotools>
- <autotools id="bison">
- <branch module="bison/bison-2.3.tar.gz" version="2.3"
- repo="ftp.gnu.org"/>
- </autotools>
-
<autotools id="libgnomeprint" autogen.sh="autoreconf">
<branch module="libgnomeprint/2.18/libgnomeprint-2.18.6.tar.gz"
repo="ftp.gnome.org" version="2.18.6"
@@ -103,7 +99,8 @@ Optionally you may want to install GConf 1.0.7 (or later).
</autotools>
<autotools id="libgnomeprintui">
- <branch revision="2716"/>
+ <branch module="libgnomeprintui/2.18/libgnomeprintui-2.18.4.tar.bz2"
+ version="2.18.4" md5sum="e76d763f6279b900a63e5fb2909f8810"/>
<dependencies>
<dep package="libgnomeprint"/>
<dep package="gtk+"/>
@@ -113,7 +110,8 @@ Optionally you may want to install GConf 1.0.7 (or later).
</autotools>
-<!-- Audiofile hasn't been actively developed since 2004 -->
+ <!-- Audiofile hasn't been actively developed since 2004 and doesn't
+ really seem necessary. -->
<!--
<autotools id='audiofile' autogen-sh="configure">
<branch module='audiofile/audiofile-0.2.6.tar.gz'
@@ -129,8 +127,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
</autotools>
-->
<autotools id="popt" autogen-sh='configure'>
- <branch module="popt/popt-1.14.tar.gz" version="1.14"
- repo="rpm5.org"/>
+ <branch module="popt/popt-1.14.tar.gz" version="1.14" repo="rpm5.org"/>
</autotools>
<!--gnome-vfs in gnome-suites-2.24.modules includes the following
@@ -141,7 +138,8 @@ Optionally you may want to install GConf 1.0.7 (or later).
but building them on OS-X proved problematic and gnome-vfs builds well
without them -->
<autotools id="gnome-vfs">
- <branch revision="5547"/>
+ <branch module="gnome-vfs/2.24/gnome-vfs-2.24.1.tar.bz2" version="2/24/1"
+ md5sum="100f9af16dc659e375ee8da45175a28d"/>
<dependencies>
<dep package="gconf"/>
<dep package="shared-mime-info"/>
@@ -150,16 +148,6 @@ Optionally you may want to install GConf 1.0.7 (or later).
</dependencies>
</autotools>
-
- <autotools id="enchant" autogen-sh="configure" >
- <branch module="1.4.2/enchant-1.4.2.tar.gz" version="1.4.2"
- repo="abisource/enchant" size='595192'
- md5sum="fe4558269ff59f569ab9581c907d58cb" />
- <dependencies>
- <dep package="glib"/>
- </dependencies>
- </autotools>
-
<autotools id="libgnomeui" >
<branch module="libgnomeui/2.24/libgnomeui-2.24.1.tar.gz" version="2.24.1"
repo="ftp.gnome.org" md5sum="4494a9e25eebd33fdf66ef30069179ee">
@@ -174,7 +162,8 @@ Optionally you may want to install GConf 1.0.7 (or later).
</autotools>
<autotools id="gnome-keyring">
- <branch revision="gnome-2-26"/>
+ <branch module="gnome-keyring/2.26/gnome-keyring-2.26.1.tar.bz2"
+ version="2.26.1" md5sum="060b349a0aae130fdd3cd0a9827258c6"/>
<dependencies>
<dep package="gtk+"/>
<dep package="libgcrypt"/>
@@ -184,7 +173,8 @@ Optionally you may want to install GConf 1.0.7 (or later).
<autotools id="libbonobo">
<!-- DEPENDS says "ORBit" -->
- <branch revision="3527"/>
+ <branch module="libbonobo/2.24/libbonobo-2.24.1.tar.bz2" version="2.24.1"
+ md5sum="8868b6083392964a6969547ceb8d7cd1"/>
<dependencies>
<dep package="popt"/>
<dep package="ORBit2"/>
@@ -196,7 +186,8 @@ Optionally you may want to install GConf 1.0.7 (or later).
</autotools>
<autotools id="libbonoboui">
- <branch revision="2665"/>
+ <branch module="libbonoboui/2.24/libbonoboui-2.24.1.tar.bz2"
+ version="2.24.1" md5sum="9ff3ec1c7aefd0b1a15a5b21ecc7b4e4"/>
<dependencies>
<dep package="libgnome"/>
<dep package="libbonobo"/>
@@ -206,7 +197,8 @@ Optionally you may want to install GConf 1.0.7 (or later).
</autotools>
<autotools id="libgnome" autogenargs="--disable-esd" >
- <branch revision="3912"/>
+ <branch module="libgnome/2.26/libgnome-2.26.0.tar.bz2" version="2.26.0"
+ md5sum="a5634fe9ddc54bbb726cbaaa35abc0b9"/>
<dependencies>
<dep package="libxml2"/>
<dep package="libxslt"/>
@@ -217,46 +209,13 @@ Optionally you may want to install GConf 1.0.7 (or later).
</dependencies>
</autotools>
- <autotools id="dbus" autogen-sh='configure'
- autogenargs="--disable-selinux --without-x
- --with-session-socket-dir=$PREFIX/tmp">
- <branch module="dbus/dbus-1.2.12.tar.gz" version="1.2.12"
- repo="freedesktop.org">
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/dbus-install.patch"/>
- </branch>
- <after>
- <dep package="gtk+"/>
- </after>
- </autotools>
-
- <autotools id="dbus-glib" autogenargs="--disable-selinux">
- <branch module="dbus-glib/dbus-glib-0.80.tar.gz" version="0.80"
- repo="freedesktop.org"/>
- <dependencies>
- <dep package="libxml2"/>
- <dep package="dbus"/>
- </dependencies>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="meta-gtk-osx-core"/>
- </after>
- </autotools>
-
<autotools id="libgnomecanvas">
- <branch revision="1349"/>
+ <branch module="libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2"
+ version="2.26.0" md5sum="9bbc635e5ae70e63af071af74ba7e72f"/>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
<dep package="meta-gtk-osx-core"/>
</after>
</autotools>
- <autotools id="libtasn1" supports-non-srcdir-builds="no">
- <branch module="gnutls/libtasn1-1.8.tar.gz" version="1.8"
- repo="ftp.gnu.org">
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/libtasn1.patch" skip="0"/>
- </branch>
- </autotools>
-
-
-
</moduleset>
\ No newline at end of file
commit 7fe62b269153b7ebef282abccc8239ff04096968
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 27 16:27:42 2009 -0700
Updated to latest procedure, including pointers to gtk-osx/sourceforge.net
diff --git a/README.markdown b/README.markdown
index faa6af5..d58cd72 100644
--- a/README.markdown
+++ b/README.markdown
@@ -4,16 +4,9 @@
GnuCash can be built to run more or less natively on OSX -- meaning
without X11. Better yet, the build is almost automatic.
-I've succeeded in building this under various incarnations of Leopard
-while perfecting the modulesets, always on a Mac Pro... but it ought
-to work on any Mac running Tiger or Leopard.
-
-The default configuration builds in your home folder. On my system, I
-build in /usr/local/src/gnome and install to /usr/local/gtk. If you
-want to do that, uncomment the checkoutroot and prefix lines in
-.jhbuildrc-custom, then create the folders up front and give yourself
-ownership. If you don't know how to do that, then you should probably
-leave it the way it is.
+This is tested and works for Macinstosh OSX Versions 10.4 (Tiger) and
+10.5 (Leopard) on both PowerPC and Intel. It does not create universal
+binaries.
##Preliminaries##
Tiger or newer is <em>required</em> for gtk-osx.
@@ -32,26 +25,27 @@ find commented out settings to do it that way at the top of
.jhbuildrc-custom. You can uncomment these and change them to whatever
you like -- or leave them as they are.
-Go to http://live.gnome.org/GTK%2B/OSX/BuildInstructions and follow
+Go to http://sourceforge.net/apps/trac/gtk-osx/wiki//Build and follow
the instructions. <b><em>Don't run jhbuild build yet!</em></b>
-At the moment, in order to build gtk-doc (which is required by a bunch
-of packages), you need python bindings for libxml2. For Leopard users,
-if you don't have this installed somewhere on your $PYTHONPATH, and
-for all Tiger users, run
-
- $> jhbuild buildone libxml-py
+Tiger users will need to retrieve and install
+http://downloads.sourceforge.net/cups/cups-1.2.12.dmg
##Building##
Once all of the preliminaries are complete, run:
$> jhbuild build
+You also need to
+ $> mkdir $PREFIX/tmp
+
##Running from the commandline##
Now you're ready to try it out:
$> $PREFIX/bin/gnucash
+($PREFIX is the path to where you've built gtk; you can fill it in yourself or use jhbuild shell to set it for you.)
+
##Making a Bundle##
So far so good, but you don't really want to have to open a Terminal
@@ -59,19 +53,20 @@ window every time you want to use GnuCash, now do you? Of course
not. You want a nice icon in your Applications folder (and maybe in
the Dock) to click on when you run GnuCash. Here's how to do this:
- * Download the bundler from http://github.com/jralls/gnucash-on-osx/raw/master/ige-mac-bundler.tar.gz, unpack it, cd into the ige-mac-bundler directory, and
+ * Download the bundler from http://downloads.sourceforge.net/sourceforge/gtk-osx/ige-mac-bundler-0.5.tar.gz unpack it, cd into the ige-mac-bundler directory, and
+
make install
- * Download http://github.com/jralls/gnucash-on-osx/raw/master/gnucash-bundler.tar.gz and unpack it.
+ * Download http://downloads.sourceforge.net/sourceforge/gtk-osx/gnucash-bundler-1.0.tar.gz and unpack it.
*
- cd gnucash-bundler</tt>
+ <tt>$> cd gnucash-bundler</tt>
* Look through gnucash-launcher and gnucash.bundle and adjust the paths to match your installation.
* make gnucash-launcher executable :
- chmod +x gnucash-launcher
+ <tt>$> chmod +x gnucash-launcher</tt>
* execute
- jhbuild shell
+ <tt>jhbuild shell</tt>
to set up the environment for the bundler
* while in the shell, execute
- ige-mac-bundler gnucash.bundle
+ <tt>ige-mac-bundler gnucash.bundle</tt>
* exit the shell
And your bundle should be ready to go.
commit a167a14c3174fdc322aa7f228ad9c8e4a0bc196d
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jun 12 20:00:58 2009 -0700
Remove the configure.in patch. It was a dumb idea,
it only belongs in a vcs build (and jhbuild won't patch those).
diff --git a/patches/gnucash-xlib.patch b/patches/gnucash-xlib.patch
index ef7e907..818476f 100644
--- a/patches/gnucash-xlib.patch
+++ b/patches/gnucash-xlib.patch
@@ -9,15 +9,3 @@
do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
---- configure.in 2008-07-06 17:16:42.000000000 -0700
-+++ configure.in 2008-07-06 17:17:06.000000000 -0700
-@@ -215,7 +215,7 @@
- AM_CONDITIONAL(GNUCASH_SEPARATE_BUILDDIR, test "x${srcdir}" != "x.")
-
- # These are unavailable on windows/mingw32
--AC_CHECK_HEADERS(X11/Xlib.h glob.h)
-+AC_CHECK_HEADERS(glob.h)
- AM_CONDITIONAL(HAVE_X11_XLIB_H, test "x$ac_cv_header_X11_Xlib_h" = "xyes")
- AC_CHECK_FUNCS(chown gethostname getppid getuid gettimeofday gmtime_r)
- AC_CHECK_FUNCS(gethostid link)
-
commit 3438d1e8829df1db24b0f0a4097b692e81a3cf3e
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jun 12 15:39:02 2009 -0700
Fixed configure in patch
diff --git a/patches/gnucash-xlib.patch b/patches/gnucash-xlib.patch
index ff8aa0c..ef7e907 100644
--- a/patches/gnucash-xlib.patch
+++ b/patches/gnucash-xlib.patch
@@ -11,12 +11,13 @@
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--- configure.in 2008-07-06 17:16:42.000000000 -0700
+++ configure.in 2008-07-06 17:17:06.000000000 -0700
-@@ -213,7 +213,7 @@
+@@ -215,7 +215,7 @@
AM_CONDITIONAL(GNUCASH_SEPARATE_BUILDDIR, test "x${srcdir}" != "x.")
# These are unavailable on windows/mingw32
-AC_CHECK_HEADERS(X11/Xlib.h glob.h)
+AC_CHECK_HEADERS(glob.h)
+ AM_CONDITIONAL(HAVE_X11_XLIB_H, test "x$ac_cv_header_X11_Xlib_h" = "xyes")
AC_CHECK_FUNCS(chown gethostname getppid getuid gettimeofday gmtime_r)
AC_CHECK_FUNCS(gethostid link)
-
+
commit 07a404420343537b013acad35f5c567db50bbaf2
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jun 12 13:47:11 2009 -0700
Change included module to modulesets-stable/gtk-osx.modules -- to fix git versioning issues.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 3fd8eb0..524203d 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -22,7 +22,7 @@
- <include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets/gtk-osx.modules"/>
+ <include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/>
<include href="gtkhtml.modules"/>
<include href="goffice.modules"/>
commit ce5ca6372791b0a986244d7bc588646e31c25e33
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jun 12 13:46:00 2009 -0700
Add the changes to configure.in to gnucash-xlib.patch
diff --git a/patches/gnucash-xlib.patch b/patches/gnucash-xlib.patch
index 818476f..ff8aa0c 100644
--- a/patches/gnucash-xlib.patch
+++ b/patches/gnucash-xlib.patch
@@ -9,3 +9,14 @@
do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+--- configure.in 2008-07-06 17:16:42.000000000 -0700
++++ configure.in 2008-07-06 17:17:06.000000000 -0700
+@@ -213,7 +213,7 @@
+ AM_CONDITIONAL(GNUCASH_SEPARATE_BUILDDIR, test "x${srcdir}" != "x.")
+
+ # These are unavailable on windows/mingw32
+-AC_CHECK_HEADERS(X11/Xlib.h glob.h)
++AC_CHECK_HEADERS(glob.h)
+ AC_CHECK_FUNCS(chown gethostname getppid getuid gettimeofday gmtime_r)
+ AC_CHECK_FUNCS(gethostid link)
+
commit 86b6c8cc426d5cb3b2ab0f26a67c091bab351e65
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jun 2 10:51:46 2009 -0700
Removed ige-mac-bundler.tar.gz from archive, will upload it to ige-mac-bundler downloads instead.
diff --git a/ige-mac-bundler.tar.gz b/ige-mac-bundler.tar.gz
deleted file mode 100644
index 34e824e..0000000
Binary files a/ige-mac-bundler.tar.gz and /dev/null differ
commit e7c98b741ac98cea50b9ea7f47324b3c7e026858
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jun 2 10:14:44 2009 -0700
Added instructions to install themes and engines and to put the quartz theme into the bundle gtkrc
diff --git a/gnucash-bundler.tar.gz b/gnucash-bundler.tar.gz
deleted file mode 100644
index 7fef277..0000000
Binary files a/gnucash-bundler.tar.gz and /dev/null differ
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index c7c5d2e..a9ca8c3 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -16,7 +16,7 @@
app. If you leave out the path, the current directory is
used.
-->
- <!--destination overwrite="yes">${env:HOME}/gnucash-bundler</destination-->
+ <destination overwrite="yes">${env:HOME}/gnucash-bundler</destination>
<image>
<!-- Not implemented yet (DMG image). -->
@@ -53,6 +53,11 @@
<binary>
${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/loaders/*.so
</binary>
+<!-- Copy in the theme engines. -->
+ <binary>
+ ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/engines/*.so
+ </binary>
+
<binary>
${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-fc.so
</binary>
@@ -110,13 +115,17 @@
${prefix}/share/mime
</data>
+ <data>
+ ${prefix}/share/themes
+ </data>
+
<!--data dest="${bundle}/Contents/Resources/slib"-->
<data>
${prefix}/lib/slib
</data>
<data dest="${bundle}/Contents/Resources">
- ${project}/gnucash.icns
+ ${prefix}/share/gnucash/pixmaps/gnucash.icns
</data>
<data dest='${bundle}/Contents/Resources/lib/'>
@@ -131,6 +140,11 @@
${prefix}/etc/dbus-1/
</data>
+<!-- This takes the Quartz theme instructions from the package and puts them in the bundle gtkrc file. You may want to cusomize the source path if you want a different theme, or if you want other stuff in your gtkrc. -->
+
+ <data dest='${bundle}/Contents/Resources/etc/gtk-2.0/gtkrc'>
+ ${prefix}/share/themes/Quartz/gtk-2.0/gtkrc
+ </data>
<!-- Icon themes to copy. The "icons" property can be either of
"auto", "all", or "none". All or none should be
commit 6979acd2f972e7a5a99d5daccd511d62776d56ed
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jun 1 16:52:22 2009 -0700
Restored the module-autogenargs for libgnomeui; they're needed if X11 is installed
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index b97bc82..6f322fb 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -16,7 +16,7 @@ else:
autogenargs=autogenargs + ' --disable-xlib'
module_autogenargs["gconf"]="--enable-static --enable-shared --disable-scrollkeeper --disable-xlib"
module_autogenargs["libofx"]="--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib"
-#module_autogenargs["libgnomeui"]="--disable-static --enable-shared --disable-scrollkeeper --disable-xlib --without-x"
+module_autogenargs["libgnomeui"]="--disable-static --enable-shared --disable-scrollkeeper --without-x"
moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
commit 7a6b4fcd69b9ad1eef09f41a0e42f5aada8e3b86
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jun 1 15:03:32 2009 -0700
Fixed more patch errors in gnucash-integration.patch
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
index b72d8c1..0986b22 100644
--- a/patches/gnucash-integration.patch
+++ b/patches/gnucash-integration.patch
@@ -1,33 +1,3 @@
-diff --git a/configure.in b/configure.in
---- a/configure.in 2009-05-31 17:36:26.000000000 -0700
-+++ b/configure.in 2009-05-31 17:39:20.000000000 -0700
-@@ -215,7 +215,7 @@
- AM_CONDITIONAL(GNUCASH_SEPARATE_BUILDDIR, test "x${srcdir}" != "x.")
-
- # These are unavailable on windows/mingw32
--AC_CHECK_HEADERS(X11/Xlib.h glob.h)
-+AC_CHECK_HEADERS(glob.h)
- AM_CONDITIONAL(HAVE_X11_XLIB_H, test "x$ac_cv_header_X11_Xlib_h" = "xyes")
- AC_CHECK_FUNCS(chown gethostname getppid getuid gettimeofday gmtime_r)
- AC_CHECK_FUNCS(gethostid link)
-@@ -351,5 +351,17 @@
- AC_MSG_RESULT(no)
- ;;
- esac
-+
-+### --------------------------------------------------------------------------
-+### Check to see if GDK uses the quartz backend and if we can use
-+### MacOSX integration
-+_gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
-+AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
-+if test "x$_gdk_tgt" = xquartz; then
-+ PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration)
-+ AC_SUBST(IGE_MAC_LIBS)
-+ AC_SUBST(IGE_MAC_CFLAGS)
-+fi
-
- ### --------------------------------------------------------------------------
- ### Guile version checks (should this be something other than the Gnome check?)
--- a/configure 2009-02-23 12:25:34.000000000 -0800
+++ b/configure 2009-05-31 18:26:34.000000000 -0700
@@ -891,6 +891,10 @@
@@ -37,10 +7,10 @@ diff --git a/configure.in b/configure.in
+GDK_TARGET_QUARTZ_TRUE
+GDK_TARGET_QUARTZ_FALSE
+IGE_MAC_CFLAGS
-+IGE_MAC_LIBSGLIB26_LIBS
++IGE_MAC_LIBS
+ GLIB26_LIBS
GLIB_MKENUMS
GOBJECT_QUERY
- GLIB_GENMARSHAL
@@ -26750,5 +26754,124 @@
esac
@@ -191,13 +161,13 @@ diff --git a/configure.in b/configure.in
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -374,4 +376,5 @@
- -I${top_srcdir}/src/gnc-module \
- ${QOF_CFLAGS} \
- ${GLIB_CFLAGS} \
+@@ -374,6 +376,7 @@
+ -I${top_srcdir}/src/gnc-module \
+ ${QOF_CFLAGS} \
+ ${GLIB_CFLAGS} \
+ ${IGE_MAC_CFLAGS} \
- ${GUILE_INCS}
-
+ ${GUILE_INCS}
+
libgncmod_engine_la_SOURCES = \
@@ -477,6 +480,7 @@
${REGEX_LIBS} \
@@ -219,19 +189,19 @@ diff --git a/configure.in b/configure.in
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -439,7 +441,8 @@
- -I${top_srcdir}/src -I${top_builddir}/src \
- -I${top_srcdir}/lib/libc ${GLIB_CFLAGS} ${GLADE_CFLAGS} \
- ${GTK_CFLAGS} ${GNOME_CFLAGS} ${GTKHTML_CFLAGS} ${GUILE_INCS} \
+ -I${top_srcdir}/src -I${top_builddir}/src \
+ -I${top_srcdir}/lib/libc ${GLIB_CFLAGS} ${GLADE_CFLAGS} \
+ ${GTK_CFLAGS} ${GNOME_CFLAGS} ${GTKHTML_CFLAGS} ${GUILE_INCS} \
- ${QOF_CFLAGS} ${GOFFICE_CFLAGS} $(am__append_3)
+ ${QOF_CFLAGS} ${GOFFICE_CFLAGS} $(IGE_MAC_CFLAGS) \
+ $(am__append_3)
libgncmod_gnome_utils_la_SOURCES = QuickFill.c account-quickfill.c \
- cursors.c dialog-account.c dialog-book-close.c \
- dialog-commodity.c dialog-options.c dialog-preferences.c \
+ cursors.c dialog-account.c dialog-book-close.c \
+ dialog-commodity.c dialog-options.c dialog-preferences.c \
@@ -557,8 +560,8 @@
- $(top_builddir)/lib/libc/libc-missing.la ${GNOME_LIBS} \
- ${GTKHTML_LIBS} ${GUILE_LIBS} ${GDK_PIXBUF_LIBS} ${GLADE_LIBS} \
- ${GUILE_LIBS} ${GLIB_LIBS} ${DB_LIBS} ${QOF_LIBS} \
+ $(top_builddir)/lib/libc/libc-missing.la ${GNOME_LIBS} \
+ ${GTKHTML_LIBS} ${GUILE_LIBS} ${GDK_PIXBUF_LIBS} ${GLADE_LIBS} \
+ ${GUILE_LIBS} ${GLIB_LIBS} ${DB_LIBS} ${QOF_LIBS} \
- ${GOFFICE_LIBS} ${REGEX_LIBS} ${LIBXML2_LIBS} $(am__append_1) \
- $(am__append_4)
+ ${GOFFICE_LIBS} ${REGEX_LIBS} ${LIBXML2_LIBS} ${IGE_MAC_LIBS} \
@@ -256,7 +226,7 @@ index a664630..42ed231 100644
#include "gnc-html.h"
#include "gnc-autosave.h"
+#ifdef MAC_INTEGRATION
-+#include <igemacintegration/igemacintegration.h>
++#include <igemacintegration/ige-mac-integration.h>
+#endif
/** Names of signals generated by the main window. */
@@ -342,48 +312,7 @@ index a664630..42ed231 100644
/* Callbacks */
static void
gnc_main_window_add_widget (GtkUIManager *merge,
-@@ -3103,6 +3156,9 @@ gnc_main_window_page_reordered (GtkNotebook *notebook,
- LEAVE(" ");
- }
- #endif
-+#ifdef MAC_INTEGRATION
-+#include <igemacintegration/ige-mac-menu.h>
-+#endif
-
- static void
- gnc_main_window_plugin_added (GncPlugin *manager,
- --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
-index 3a9f056..0fc611a 100644
---- a/src/gnome-utils/Makefile.am
-+++ b/src/gnome-utils/Makefile.am
-@@ -20,7 +20,8 @@ AM_CFLAGS = \
- ${GTKHTML_CFLAGS} \
- ${GUILE_INCS} \
- ${QOF_CFLAGS} \
-- ${GOFFICE_CFLAGS}
-+ ${GOFFICE_CFLAGS} \
-+ $(IGE_MAC_CFLAGS)
-
- libgncmod_gnome_utils_la_SOURCES = \
- QuickFill.c \
-@@ -193,11 +194,14 @@ libgncmod_gnome_utils_la_LIBADD = \
- ${QOF_LIBS} \
- ${GOFFICE_LIBS} \
- ${REGEX_LIBS} \
-- ${LIBXML2_LIBS}
-+ ${LIBXML2_LIBS} \
-+ ${IGE_MAC_LIBS}
-
--if HAVE_X11_XLIB_H
-+if HAVE_X11_XLIB_H
-+if !GDK_TARGET_QUARTZ
- libgncmod_gnome_utils_la_LIBADD += -lX11
- endif
-+endif
-
- if BUILDING_FROM_SVN
- swig-gnome-utils.c: gnome-utils.i gnc-html.h \
- --git a/src/engine/binreloc.c b/src/engine/binreloc.c
+diff --git a/src/engine/binreloc.c b/src/engine/binreloc.c
index d582a5d..032f2af 100644
--- a/src/engine/binreloc.c
+++ b/src/engine/binreloc.c
@@ -504,23 +433,3 @@ index d582a5d..032f2af 100644
}
- --git a/src/engine/Makefile.am b/src/engine/Makefile.am
-index bbc65e8..e96dbbf 100644
---- a/src/engine/Makefile.am
-+++ b/src/engine/Makefile.am
-@@ -10,6 +10,7 @@ AM_CFLAGS = \
- -I${top_srcdir}/src/gnc-module \
- ${QOF_CFLAGS} \
- ${GLIB_CFLAGS} \
-+ ${IGE_MAC_CFLAGS} \
- ${GUILE_INCS}
-
- libgncmod_engine_la_SOURCES = \
-@@ -116,6 +117,7 @@ libgncmod_engine_la_LIBADD = \
- ${REGEX_LIBS} \
- ${GLIB_LIBS} \
- ${BINRELOC_LIBS} \
-+ ${IGE_MAC_LIBS} \
- ${top_builddir}/lib/libc/libc-missing.la
-
- gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
commit b89c8fc84e2701123f2ba921e93511a8e274d101
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jun 1 13:19:55 2009 -0700
Fixed spacing error in gnucash-integration.patch
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
index 761ddd7..b72d8c1 100644
--- a/patches/gnucash-integration.patch
+++ b/patches/gnucash-integration.patch
@@ -13,7 +13,7 @@ diff --git a/configure.in b/configure.in
@@ -351,5 +351,17 @@
AC_MSG_RESULT(no)
;;
-esac
+ esac
+
+### --------------------------------------------------------------------------
+### Check to see if GDK uses the quartz backend and if we can use
commit 52dd908e9fcec41ac25849a289dbabba004a0161
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jun 1 13:16:36 2009 -0700
Fixed tabification errors in gnucash-integration.patch
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
index 072ba53..761ddd7 100644
--- a/patches/gnucash-integration.patch
+++ b/patches/gnucash-integration.patch
@@ -10,10 +10,10 @@ diff --git a/configure.in b/configure.in
AM_CONDITIONAL(HAVE_X11_XLIB_H, test "x$ac_cv_header_X11_Xlib_h" = "xyes")
AC_CHECK_FUNCS(chown gethostname getppid getuid gettimeofday gmtime_r)
AC_CHECK_FUNCS(gethostid link)
-@@ -361,5 +361,17 @@
- AC_SUBST(IGE_MAC_CFLAGS)
- fi
-
+@@ -351,5 +351,17 @@
+ AC_MSG_RESULT(no)
+ ;;
+esac
+
+### --------------------------------------------------------------------------
+### Check to see if GDK uses the quartz backend and if we can use
@@ -25,7 +25,7 @@ diff --git a/configure.in b/configure.in
+ AC_SUBST(IGE_MAC_LIBS)
+ AC_SUBST(IGE_MAC_CFLAGS)
+fi
-+
+
### --------------------------------------------------------------------------
### Guile version checks (should this be something other than the Gnome check?)
--- a/configure 2009-02-23 12:25:34.000000000 -0800
@@ -41,7 +41,7 @@ diff --git a/configure.in b/configure.in
GLIB_MKENUMS
GOBJECT_QUERY
GLIB_GENMARSHAL
-@@ -26750,5 +26763,124 @@
+@@ -26750,5 +26754,124 @@
esac
@@ -166,14 +166,12 @@ diff --git a/configure.in b/configure.in
+
### --------------------------------------------------------------------------
### Guile version checks (should this be something other than the Gnome check?
-@@ -33564,4 +33690,6 @@
+@@ -33564,6 +33692,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-+if test -z "${GDK_TARGET_QUARTZ_TRUE}" && test -z "${GDK_TARGET_QUARTZ_FALSE}";
- then
-+ { { $as_echo "$as_me:$LINENO: error: conditional \"GDK_TARGET_QUARTZ\" was ne
-ver defined.
++if test -z "${GDK_TARGET_QUARTZ_TRUE}" && test -z "${GDK_TARGET_QUARTZ_FALSE}";then
++ { { $as_echo "$as_me:$LINENO: error: conditional \"GDK_TARGET_QUARTZ\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"GDK_TARGET_QUARTZ\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
@@ -193,15 +191,15 @@ ver defined.
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -374,6 +375,7 @@
- -I${top_srcdir}/src/gnc-module \
- ${QOF_CFLAGS} \
- ${GLIB_CFLAGS} \
-+ ${IGE_MAC_CFLAGS} \
- ${GUILE_INCS}
+@@ -374,4 +376,5 @@
+ -I${top_srcdir}/src/gnc-module \
+ ${QOF_CFLAGS} \
+ ${GLIB_CFLAGS} \
++ ${IGE_MAC_CFLAGS} \
+ ${GUILE_INCS}
libgncmod_engine_la_SOURCES = \
-@@ -477,6 +479,7 @@
+@@ -477,6 +480,7 @@
${REGEX_LIBS} \
${GLIB_LIBS} \
${BINRELOC_LIBS} \
@@ -221,23 +219,23 @@ ver defined.
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -439,7 +441,8 @@
- -I${top_srcdir}/src -I${top_builddir}/src \
- -I${top_srcdir}/lib/libc ${GLIB_CFLAGS} ${GLADE_CFLAGS} \
- ${GTK_CFLAGS} ${GNOME_CFLAGS} ${GTKHTML_CFLAGS} ${GUILE_INCS} \
-- ${QOF_CFLAGS} ${GOFFICE_CFLAGS} $(am__append_3)
-+ ${QOF_CFLAGS} ${GOFFICE_CFLAGS} $(IGE_MAC_CFLAGS) \
-+ $(am__append_3)
+ -I${top_srcdir}/src -I${top_builddir}/src \
+ -I${top_srcdir}/lib/libc ${GLIB_CFLAGS} ${GLADE_CFLAGS} \
+ ${GTK_CFLAGS} ${GNOME_CFLAGS} ${GTKHTML_CFLAGS} ${GUILE_INCS} \
+- ${QOF_CFLAGS} ${GOFFICE_CFLAGS} $(am__append_3)
++ ${QOF_CFLAGS} ${GOFFICE_CFLAGS} $(IGE_MAC_CFLAGS) \
++ $(am__append_3)
libgncmod_gnome_utils_la_SOURCES = QuickFill.c account-quickfill.c \
- cursors.c dialog-account.c dialog-book-close.c \
- dialog-commodity.c dialog-options.c dialog-preferences.c \
+ cursors.c dialog-account.c dialog-book-close.c \
+ dialog-commodity.c dialog-options.c dialog-preferences.c \
@@ -557,8 +560,8 @@
- $(top_builddir)/lib/libc/libc-missing.la ${GNOME_LIBS} \
- ${GTKHTML_LIBS} ${GUILE_LIBS} ${GDK_PIXBUF_LIBS} ${GLADE_LIBS} \
- ${GUILE_LIBS} ${GLIB_LIBS} ${DB_LIBS} ${QOF_LIBS} \
-- ${GOFFICE_LIBS} ${REGEX_LIBS} ${LIBXML2_LIBS} $(am__append_1) \
-- $(am__append_4)
-+ ${GOFFICE_LIBS} ${REGEX_LIBS} ${LIBXML2_LIBS} ${IGE_MAC_LIBS} \
-+ $(am__append_1) $(am__append_4)
+ $(top_builddir)/lib/libc/libc-missing.la ${GNOME_LIBS} \
+ ${GTKHTML_LIBS} ${GUILE_LIBS} ${GDK_PIXBUF_LIBS} ${GLADE_LIBS} \
+ ${GUILE_LIBS} ${GLIB_LIBS} ${DB_LIBS} ${QOF_LIBS} \
+- ${GOFFICE_LIBS} ${REGEX_LIBS} ${LIBXML2_LIBS} $(am__append_1) \
+- $(am__append_4)
++ ${GOFFICE_LIBS} ${REGEX_LIBS} ${LIBXML2_LIBS} ${IGE_MAC_LIBS} \
++ $(am__append_1) $(am__append_4)
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
gncmod_DATA = gnome-utils.scm
gncscmdir = ${GNC_SHAREDIR}/scm
commit ab4d1469001f945aacb4675c8c166239b5bcb648
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jun 1 12:52:58 2009 -0700
Fix leftover temp change in .jhbuildrc-custom
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 0bbf200..b97bc82 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -19,7 +19,7 @@ module_autogenargs["libofx"]="--with-opensp-includes=" + prefix + "/include/Open
#module_autogenargs["libgnomeui"]="--disable-static --enable-shared --disable-scrollkeeper --disable-xlib --without-x"
-#moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
+moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
#build_policy = "updated-deps"
commit 7021bd5a18a52c5adfa1150656102e80db07853e
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jun 1 12:41:48 2009 -0700
Fixed up integration patch
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
index 314a531..072ba53 100644
--- a/patches/gnucash-integration.patch
+++ b/patches/gnucash-integration.patch
@@ -1,522 +1,190 @@
-diff --git a/Makefile.in b/Makefile.in
-index 7a1d24a..50fbde8 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -42,10 +42,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-@@ -185,6 +184,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -192,29 +193,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -276,6 +258,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -297,7 +280,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = ${GNC_DOC_INSTALL_DIR}
-@@ -331,7 +313,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . doc lib src intl-scm packaging po accounts checks
-@@ -482,7 +463,7 @@ clean-libtool:
- -rm -rf .libs _libs
-
- distclean-libtool:
-- -rm -f libtool config.lt
-+ -rm -f libtool
- install-dist_docDATA: $(dist_doc_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
-@@ -576,7 +557,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/accounts/C/Makefile.in b/accounts/C/Makefile.in
-index 3d3102e..4651081 100644
---- a/accounts/C/Makefile.in
-+++ b/accounts/C/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/C
-@@ -338,8 +319,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/Makefile.in b/accounts/Makefile.in
-index 9e0bf59..e0fcfd6 100644
---- a/accounts/Makefile.in
-+++ b/accounts/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+diff --git a/configure.in b/configure.in
+--- a/configure.in 2009-05-31 17:36:26.000000000 -0700
++++ b/configure.in 2009-05-31 17:39:20.000000000 -0700
+@@ -215,7 +215,7 @@
+ AM_CONDITIONAL(GNUCASH_SEPARATE_BUILDDIR, test "x${srcdir}" != "x.")
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = C da de_AT de_CH de_DE el_GR en_GB es_ES es_MX fi_FI fr_CH fr_CA fr_FR hu_HU it ja nl nb pt_BR pt_PT ru sk tr_TR zh_CN
-@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/accounts/da/Makefile.in b/accounts/da/Makefile.in
-index b46baca..2442524 100644
---- a/accounts/da/Makefile.in
-+++ b/accounts/da/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+ # These are unavailable on windows/mingw32
+-AC_CHECK_HEADERS(X11/Xlib.h glob.h)
++AC_CHECK_HEADERS(glob.h)
+ AM_CONDITIONAL(HAVE_X11_XLIB_H, test "x$ac_cv_header_X11_Xlib_h" = "xyes")
+ AC_CHECK_FUNCS(chown gethostname getppid getuid gettimeofday gmtime_r)
+ AC_CHECK_FUNCS(gethostid link)
+@@ -361,5 +361,17 @@
+ AC_SUBST(IGE_MAC_CFLAGS)
+ fi
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/da
-@@ -325,8 +306,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/de_AT/Makefile.in b/accounts/de_AT/Makefile.in
-index cf62263..4c288a3 100644
---- a/accounts/de_AT/Makefile.in
-+++ b/accounts/de_AT/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
++
++### --------------------------------------------------------------------------
++### Check to see if GDK uses the quartz backend and if we can use
++### MacOSX integration
++_gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
++AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
++if test "x$_gdk_tgt" = xquartz; then
++ PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration)
++ AC_SUBST(IGE_MAC_LIBS)
++ AC_SUBST(IGE_MAC_CFLAGS)
++fi
++
+ ### --------------------------------------------------------------------------
+ ### Guile version checks (should this be something other than the Gnome check?)
+--- a/configure 2009-02-23 12:25:34.000000000 -0800
++++ b/configure 2009-05-31 18:26:34.000000000 -0700
+@@ -891,6 +891,10 @@
+ DL_LIB
+ HAVE_GLIB_2_8_FALSE
+ HAVE_GLIB_2_8_TRUE
++GDK_TARGET_QUARTZ_TRUE
++GDK_TARGET_QUARTZ_FALSE
++IGE_MAC_CFLAGS
++IGE_MAC_LIBSGLIB26_LIBS
+ GLIB_MKENUMS
+ GOBJECT_QUERY
+ GLIB_GENMARSHAL
+@@ -26750,5 +26763,124 @@
+ esac
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -160,6 +159,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -167,29 +168,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -251,6 +233,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -272,7 +255,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -306,7 +288,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = $(GNC_ACCOUNTS_DIR)/de_AT
-@@ -327,8 +308,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/de_CH/Makefile.in b/accounts/de_CH/Makefile.in
-index a9a51ff..41d02db 100644
---- a/accounts/de_CH/Makefile.in
-+++ b/accounts/de_CH/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
++
++### --------------------------------------------------------------------------
++### Check to see if GDK uses the quartz backend and if we can use
++### MacOSX integration
++_gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
++ if test x$_gdk_tgt = xquartz; then
++ GDK_TARGET_QUARTZ_TRUE=
++ GDK_TARGET_QUARTZ_FALSE='#'
++else
++ GDK_TARGET_QUARTZ_TRUE='#'
++ GDK_TARGET_QUARTZ_FALSE=
++fi
++
++if test "x$_gdk_tgt" = xquartz; then
++
++ succeeded=no
++
++ if test -z "$PKG_CONFIG"; then
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++ $as_echo_n "(cached) " >&6
++else
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++ ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
++else
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++ fi
++
++ if test "$PKG_CONFIG" = "no" ; then
++ echo "*** The pkg-config script could not be found. Make sure it is"
++ echo "*** in your path, or set the PKG_CONFIG environment variable"
++ echo "*** to the full path to pkg-config."
++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++ else
++ pkg_config_min_version=0.9.0
++ if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
++ { $as_echo "$as_me:$LINENO: checking for ige-mac-integration" >&5
++$as_echo_n "checking for ige-mac-integration... " >&6; }
++
++ if $PKG_CONFIG --silence-errors --exists "ige-mac-integration" ; then
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ succeeded=yes
++
++ { $as_echo "$as_me:$LINENO: checking IGE_MAC_CFLAGS" >&5
++$as_echo_n "checking IGE_MAC_CFLAGS... " >&6; }
++ IGE_MAC_CFLAGS=`$PKG_CONFIG --cflags "ige-mac-integration"`
++ { $as_echo "$as_me:$LINENO: result: $IGE_MAC_CFLAGS" >&5
++$as_echo "$IGE_MAC_CFLAGS" >&6; }
++
++ { $as_echo "$as_me:$LINENO: checking IGE_MAC_LIBS" >&5
++$as_echo_n "checking IGE_MAC_LIBS... " >&6; }
++ IGE_MAC_LIBS=`$PKG_CONFIG --libs "ige-mac-integration"`
++ { $as_echo "$as_me:$LINENO: result: $IGE_MAC_LIBS" >&5
++$as_echo "$IGE_MAC_LIBS" >&6; }
++ else
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++ IGE_MAC_CFLAGS=""
++ IGE_MAC_LIBS=""
++ ## If we have a custom action on failure, don't print errors, but
++ ## do set a variable so people can do so.
++ IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ige-mac-integration" 2>&1`
++ echo $IGE_MAC_PKG_ERRORS
++ fi
++
++
++
++ else
++ echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
++ echo "*** See http://www.freedesktop.org/software/pkgconfig"
++ fi
++ fi
++
++ if test $succeeded = yes; then
++ :
++ else
++ { { $as_echo "$as_me:$LINENO: error: Library requirements (ige-mac-integration) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
++$as_echo "$as_me: error: Library requirements (ige-mac-integration) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++
++
++
++fi
++
+ ### --------------------------------------------------------------------------
+ ### Guile version checks (should this be something other than the Gnome check?
+@@ -33564,4 +33690,6 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
++if test -z "${GDK_TARGET_QUARTZ_TRUE}" && test -z "${GDK_TARGET_QUARTZ_FALSE}";
+ then
++ { { $as_echo "$as_me:$LINENO: error: conditional \"GDK_TARGET_QUARTZ\" was ne
+ver defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"GDK_TARGET_QUARTZ\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
+ if test -z "${GUILE_TRUE}" && test -z "${GUILE_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"GUILE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+--- a/src/engine/Makefile.in 2009-02-23 12:25:25.000000000 -0800
++++ b/src/engine/Makefile.in 2009-06-01 09:52:04.000000000 -0700
+@@ -215,6 +214,8 @@
GUILE_LIBS = @GUILE_LIBS@
GUILE_TOOLS = @GUILE_TOOLS@
HTMLHELP_LIBS = @HTMLHELP_LIBS@
@@ -525,94 +193,25 @@ index a9a51ff..41d02db 100644
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/de_CH
-@@ -327,8 +308,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/de_DE/Makefile.in b/accounts/de_DE/Makefile.in
-index 00416d7..a2a144c 100644
---- a/accounts/de_DE/Makefile.in
-+++ b/accounts/de_DE/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+@@ -374,6 +375,7 @@
+ -I${top_srcdir}/src/gnc-module \
+ ${QOF_CFLAGS} \
+ ${GLIB_CFLAGS} \
++ ${IGE_MAC_CFLAGS} \
+ ${GUILE_INCS}
+
+ libgncmod_engine_la_SOURCES = \
+@@ -477,6 +479,7 @@
+ ${REGEX_LIBS} \
+ ${GLIB_LIBS} \
+ ${BINRELOC_LIBS} \
++ ${IGE_MAC_LIBS} \
+ ${top_builddir}/lib/libc/libc-missing.la
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+--- a/src/gnome-utils/Makefile.in 2009-02-23 12:25:26.000000000 -0800
++++ b/src/gnome-utils/Makefile.in 2009-06-01 09:52:04.000000000 -0700
+@@ -280,6 +280,8 @@
GUILE_LIBS = @GUILE_LIBS@
GUILE_TOOLS = @GUILE_TOOLS@
HTMLHELP_LIBS = @HTMLHELP_LIBS@
@@ -621,42568 +220,309 @@ index 00416d7..a2a144c 100644
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/de_DE
-@@ -336,8 +317,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/el_GR/Makefile.in b/accounts/el_GR/Makefile.in
-index 563257e..7e2b852 100644
---- a/accounts/el_GR/Makefile.in
-+++ b/accounts/el_GR/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+@@ -439,7 +441,8 @@
+ -I${top_srcdir}/src -I${top_builddir}/src \
+ -I${top_srcdir}/lib/libc ${GLIB_CFLAGS} ${GLADE_CFLAGS} \
+ ${GTK_CFLAGS} ${GNOME_CFLAGS} ${GTKHTML_CFLAGS} ${GUILE_INCS} \
+- ${QOF_CFLAGS} ${GOFFICE_CFLAGS} $(am__append_3)
++ ${QOF_CFLAGS} ${GOFFICE_CFLAGS} $(IGE_MAC_CFLAGS) \
++ $(am__append_3)
+ libgncmod_gnome_utils_la_SOURCES = QuickFill.c account-quickfill.c \
+ cursors.c dialog-account.c dialog-book-close.c \
+ dialog-commodity.c dialog-options.c dialog-preferences.c \
+@@ -557,8 +560,8 @@
+ $(top_builddir)/lib/libc/libc-missing.la ${GNOME_LIBS} \
+ ${GTKHTML_LIBS} ${GUILE_LIBS} ${GDK_PIXBUF_LIBS} ${GLADE_LIBS} \
+ ${GUILE_LIBS} ${GLIB_LIBS} ${DB_LIBS} ${QOF_LIBS} \
+- ${GOFFICE_LIBS} ${REGEX_LIBS} ${LIBXML2_LIBS} $(am__append_1) \
+- $(am__append_4)
++ ${GOFFICE_LIBS} ${REGEX_LIBS} ${LIBXML2_LIBS} ${IGE_MAC_LIBS} \
++ $(am__append_1) $(am__append_4)
+ gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+ gncmod_DATA = gnome-utils.scm
+ gncscmdir = ${GNC_SHAREDIR}/scm
+diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c
+index a664630..42ed231 100644
+--- a/src/gnome-utils/gnc-main-window.c
++++ b/src/gnome-utils/gnc-main-window.c
+@@ -32,7 +32,6 @@
+ @author Copyright (C) 2003 Jan Arne Petersen <jpetersen at uni-bonn.de>
+ @author Copyright (C) 2003,2005,2006 David Hampton <hampton at employees.org>
+ */
+-
+ #include "config.h"
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/el_GR
-@@ -324,8 +305,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/en_GB/Makefile.in b/accounts/en_GB/Makefile.in
-index e2af267..0d69884 100644
---- a/accounts/en_GB/Makefile.in
-+++ b/accounts/en_GB/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+ #include <gnome.h>
+@@ -67,6 +66,9 @@
+ // +JSLED
+ #include "gnc-html.h"
+ #include "gnc-autosave.h"
++#ifdef MAC_INTEGRATION
++#include <igemacintegration/igemacintegration.h>
++#endif
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/en_GB
-@@ -339,8 +320,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/es_ES/Makefile.in b/accounts/es_ES/Makefile.in
-index ac32a42..cc408c2 100644
---- a/accounts/es_ES/Makefile.in
-+++ b/accounts/es_ES/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+ /** Names of signals generated by the main window. */
+ enum {
+@@ -145,6 +147,9 @@ static void do_popup_menu(GncPluginPage *page, GdkEventButton *event);
+ static gboolean gnc_main_window_popup_menu_cb (GtkWidget *widget, GncPluginPage *page);
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/es_ES
-@@ -336,8 +317,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/es_MX/Makefile.in b/accounts/es_MX/Makefile.in
-index fd924ad..72d229a 100644
---- a/accounts/es_MX/Makefile.in
-+++ b/accounts/es_MX/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+ static GtkAction *gnc_main_window_find_action (GncMainWindow *window, const gchar *name);
++#ifdef MAC_INTEGRATION
++static void gtk_quartz_set_menu(GncMainWindow* window);
++#endif
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/es_MX
-@@ -336,8 +317,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/fi_FI/Makefile.in b/accounts/fi_FI/Makefile.in
-index beeda38..ab6f2f5 100644
---- a/accounts/fi_FI/Makefile.in
-+++ b/accounts/fi_FI/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+ /** The instance private data structure for an embedded window
+ * object. */
+@@ -1344,7 +1349,14 @@ gnc_main_window_update_one_menu_action (GncMainWindow *window,
+ "label", data->label,
+ "visible", data->visible,
+ (char *)NULL);
+- LEAVE(" ");
++#ifdef MAC_INTEGRATION
++ {
++ GtkWidget *menu = gtk_ui_manager_get_widget(window->ui_merge,
++ "/menubar"
++);
++ ige_mac_menu_sync(GTK_MENU_SHELL( menu ));
++ }
++ #endif LEAVE(" ");
+ }
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/fi_FI
-@@ -323,8 +304,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/fr_CA/Makefile.in b/accounts/fr_CA/Makefile.in
-index fff9ff4..fc6bdef 100644
---- a/accounts/fr_CA/Makefile.in
-+++ b/accounts/fr_CA/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/fr_CA
-@@ -335,8 +316,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/fr_CH/Makefile.in b/accounts/fr_CH/Makefile.in
-index 532cb46..7fe734e 100644
---- a/accounts/fr_CH/Makefile.in
-+++ b/accounts/fr_CH/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+@@ -1900,6 +1912,9 @@ gnc_main_window_init (GncMainWindow *window,
+ qof_event_register_handler(gnc_main_window_event_handler, window);
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/fr_CH
-@@ -337,8 +318,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/fr_FR/Makefile.in b/accounts/fr_FR/Makefile.in
-index 1f76745..6322232 100644
---- a/accounts/fr_FR/Makefile.in
-+++ b/accounts/fr_FR/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+ gnc_main_window_setup_window (window);
++#ifdef MAC_INTEGRATION
++ gtk_quartz_set_menu(window);
++#endif
+ gnc_gobject_tracking_remember(G_OBJECT(window),
+ G_OBJECT_CLASS(klass));
+ }
+@@ -2948,6 +2963,44 @@ gnc_main_window_setup_window (GncMainWindow *window)
+ LEAVE(" ");
+ }
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/fr_FR
-@@ -337,8 +318,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/hu_HU/Makefile.in b/accounts/hu_HU/Makefile.in
-index 8608258..ab56b9b 100644
---- a/accounts/hu_HU/Makefile.in
-+++ b/accounts/hu_HU/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/hu_HU
-@@ -337,8 +318,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/it/Makefile.in b/accounts/it/Makefile.in
-index 079f53e..419162b 100644
---- a/accounts/it/Makefile.in
-+++ b/accounts/it/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/it
-@@ -335,8 +316,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/ja/Makefile.in b/accounts/ja/Makefile.in
-index 70dfa0e..b2d81e5 100644
---- a/accounts/ja/Makefile.in
-+++ b/accounts/ja/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/ja
-@@ -337,8 +318,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/nb/Makefile.in b/accounts/nb/Makefile.in
-index 13fb357..d6abd66 100644
---- a/accounts/nb/Makefile.in
-+++ b/accounts/nb/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/nb
-@@ -339,8 +320,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/nl/Makefile.in b/accounts/nl/Makefile.in
-index a1ed440..f4bd3fa 100644
---- a/accounts/nl/Makefile.in
-+++ b/accounts/nl/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/nl
-@@ -322,8 +303,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/pt_BR/Makefile.in b/accounts/pt_BR/Makefile.in
-index 2ef9340..aa5bc98 100644
---- a/accounts/pt_BR/Makefile.in
-+++ b/accounts/pt_BR/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/pt_BR
-@@ -336,8 +317,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/pt_PT/Makefile.in b/accounts/pt_PT/Makefile.in
-index 0ab9196..e6d329c 100644
---- a/accounts/pt_PT/Makefile.in
-+++ b/accounts/pt_PT/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/pt_PT
-@@ -335,8 +316,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/ru/Makefile.in b/accounts/ru/Makefile.in
-index 071c3ed..5120f84 100644
---- a/accounts/ru/Makefile.in
-+++ b/accounts/ru/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/ru
-@@ -325,8 +306,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/sk/Makefile.in b/accounts/sk/Makefile.in
-index 58a578d..9c3331c 100644
---- a/accounts/sk/Makefile.in
-+++ b/accounts/sk/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/sk
-@@ -336,8 +317,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/tr_TR/Makefile.in b/accounts/tr_TR/Makefile.in
-index 169a6e4..aa0e4c6 100644
---- a/accounts/tr_TR/Makefile.in
-+++ b/accounts/tr_TR/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/tr_TR
-@@ -329,8 +310,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/accounts/zh_CN/Makefile.in b/accounts/zh_CN/Makefile.in
-index ba85312..e455cb7 100644
---- a/accounts/zh_CN/Makefile.in
-+++ b/accounts/zh_CN/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accountdir = ${GNC_ACCOUNTS_DIR}/zh_CN
-@@ -338,8 +319,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/aclocal.m4 b/aclocal.m4
-index 049708b..28b2b52 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-@@ -13,12 +13,864 @@
-
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
--[m4_warning([this file was generated for autoconf 2.63.
-+m4_if(AC_AUTOCONF_VERSION, [2.61],,
-+[m4_warning([this file was generated for autoconf 2.61.
- You have another version of autoconf. It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+# (This private macro should not be called outside this file.)
-+AC_DEFUN([AM_AUTOMAKE_VERSION],
-+[am__api_version='1.10'
-+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-+dnl require some minimum version. Point them to the right macro.
-+m4_if([$1], [1.10.1], [],
-+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-+])
-+
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too. Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+[AM_AUTOMAKE_VERSION([1.10.1])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-+
-+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+#
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory. The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run. This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+# fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+# fails if $ac_aux_dir is absolute,
-+# fails when called from a subdirectory in a VPATH build with
-+# a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir. In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+# MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH. The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
-+
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
-+
-+# AM_CONDITIONAL -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 8
-+
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])dnl
-+AC_SUBST([$1_FALSE])dnl
-+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-+if $2; then
-+ $1_TRUE=
-+ $1_FALSE='#'
-+else
-+ $1_TRUE='#'
-+ $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+ AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
-+fi])])
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 9
-+
-+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# written in clear, in which case automake, when reading aclocal.m4,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery. Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+
-+
-+# _AM_DEPENDENCIES(NAME)
-+# ----------------------
-+# See how the compiler implements dependency checking.
-+# NAME is "CC", "CXX", "GCJ", or "OBJC".
-+# We try a few techniques and use that to set a single cache variable.
-+#
-+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-+# dependency, and given that the user is not expected to run this macro,
-+# just rely on AC_PROG_CC.
-+AC_DEFUN([_AM_DEPENDENCIES],
-+[AC_REQUIRE([AM_SET_DEPDIR])dnl
-+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-+AC_REQUIRE([AM_DEP_TRACK])dnl
-+
-+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
-+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
-+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
-+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
-+ [depcc="$$1" am_compiler_list=])
-+
-+AC_CACHE_CHECK([dependency style of $depcc],
-+ [am_cv_$1_dependencies_compiler_type],
-+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+ # We make a subdir and do the tests there. Otherwise we can end up
-+ # making bogus files that we don't know about and never remove. For
-+ # instance it was reported that on HP-UX the gcc test will end up
-+ # making a dummy file named `D' -- because `-MD' means `put the output
-+ # in D'.
-+ mkdir conftest.dir
-+ # Copy depcomp to subdir because otherwise we won't find it if we're
-+ # using a relative directory.
-+ cp "$am_depcomp" conftest.dir
-+ cd conftest.dir
-+ # We will build objects and dependencies in a subdirectory because
-+ # it helps to detect inapplicable dependency modes. For instance
-+ # both Tru64's cc and ICC support -MD to output dependencies as a
-+ # side effect of compilation, but ICC will put the dependencies in
-+ # the current directory while Tru64 will put them in the object
-+ # directory.
-+ mkdir sub
-+
-+ am_cv_$1_dependencies_compiler_type=none
-+ if test "$am_compiler_list" = ""; then
-+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-+ fi
-+ for depmode in $am_compiler_list; do
-+ # Setup a source with many dependencies, because some compilers
-+ # like to wrap large dependency lists on column 80 (with \), and
-+ # we should not choose a depcomp mode which is confused by this.
-+ #
-+ # We need to recreate these files for each test, as the compiler may
-+ # overwrite some of them when testing with obscure command lines.
-+ # This happens at least with the AIX C compiler.
-+ : > sub/conftest.c
-+ for i in 1 2 3 4 5 6; do
-+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
-+ done
-+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+ case $depmode in
-+ nosideeffect)
-+ # after this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested
-+ if test "x$enable_dependency_tracking" = xyes; then
-+ continue
-+ else
-+ break
-+ fi
-+ ;;
-+ none) break ;;
-+ esac
-+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+ # mode. It turns out that the SunPro C++ compiler does not properly
-+ # handle `-M -o', and we need to detect this.
-+ if depmode=$depmode \
-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+ >/dev/null 2>conftest.err &&
-+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+ # icc doesn't choke on unknown options, it will just issue warnings
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+ am_cv_$1_dependencies_compiler_type=$depmode
-+ break
-+ fi
-+ fi
-+ done
-+
-+ cd ..
-+ rm -rf conftest.dir
-+else
-+ am_cv_$1_dependencies_compiler_type=none
-+fi
-+])
-+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-+AM_CONDITIONAL([am__fastdep$1], [
-+ test "x$enable_dependency_tracking" != xno \
-+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-+])
-+
-+
-+# AM_SET_DEPDIR
-+# -------------
-+# Choose a directory name for dependency files.
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-+AC_DEFUN([AM_SET_DEPDIR],
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-+])
-+
-+
-+# AM_DEP_TRACK
-+# ------------
-+AC_DEFUN([AM_DEP_TRACK],
-+[AC_ARG_ENABLE(dependency-tracking,
-+[ --disable-dependency-tracking speeds up one-time build
-+ --enable-dependency-tracking do not reject slow dependency extractors])
-+if test "x$enable_dependency_tracking" != xno; then
-+ am_depcomp="$ac_aux_dir/depcomp"
-+ AMDEPBACKSLASH='\'
-+fi
-+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-+AC_SUBST([AMDEPBACKSLASH])dnl
-+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-+])
-+
-+# Generate code to set up dependency tracking. -*- Autoconf -*-
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+#serial 3
-+
-+# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+# ------------------------------
-+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[for mf in $CONFIG_FILES; do
-+ # Strip MF so we end up with the name of the file.
-+ mf=`echo "$mf" | sed -e 's/:.*$//'`
-+ # Check whether this is an Automake generated Makefile or not.
-+ # We used to match only the files named `Makefile.in', but
-+ # some people rename them; so instead we look at the file content.
-+ # Grep'ing the first line is not enough: some people post-process
-+ # each Makefile.in and add a new line on top of each file to say so.
-+ # Grep'ing the whole file is not good either: AIX grep has a line
-+ # limit of 2048, but all sed's we know have understand at least 4000.
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+ dirpart=`AS_DIRNAME("$mf")`
-+ else
-+ continue
-+ fi
-+ # Extract the definition of DEPDIR, am__include, and am__quote
-+ # from the Makefile without running `make'.
-+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+ test -z "$DEPDIR" && continue
-+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+ test -z "am__include" && continue
-+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+ # When using ansi2knr, U may be empty or an underscore; expand it
-+ U=`sed -n 's/^U = //p' < "$mf"`
-+ # Find all dependency output files, they are included files with
-+ # $(DEPDIR) in their names. We invoke sed twice because it is the
-+ # simplest approach to changing $(DEPDIR) to its actual value in the
-+ # expansion.
-+ for file in `sed -n "
-+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+ # Make sure the directory exists.
-+ test -f "$dirpart/$file" && continue
-+ fdir=`AS_DIRNAME(["$file"])`
-+ AS_MKDIR_P([$dirpart/$fdir])
-+ # echo "creating $dirpart/$file"
-+ echo '# dummy' > "$dirpart/$file"
-+ done
-+done
-+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+
-+
-+# AM_OUTPUT_DEPENDENCY_COMMANDS
-+# -----------------------------
-+# This macro should only be invoked once -- use via AC_REQUIRE.
-+#
-+# This code is only required when automatic dependency tracking
-+# is enabled. FIXME. This creates each `.P' file that we will
-+# need in order to bootstrap the dependency handling code.
-+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[AC_CONFIG_COMMANDS([depfiles],
-+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+])
-+
-+# Do all the work for Automake. -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2008 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 13
-+
-+# This macro actually does too much. Some checks are only needed if
-+# your package does certain things. But this isn't really a big deal.
-+
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out. PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition. After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.60])dnl
-+dnl Autoconf wants to disallow AM_ names. We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+ # is not polluted with repeated "-I."
-+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-+ # test to see if srcdir already configured
-+ if test -f $srcdir/config.status; then
-+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+ fi
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+ if (cygpath --version) >/dev/null 2>/dev/null; then
-+ CYGPATH_W='cygpath -w'
-+ else
-+ CYGPATH_W=echo
-+ fi
-+fi
-+AC_SUBST([CYGPATH_W])
-+
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ AC_SUBST([PACKAGE], [$1])dnl
-+ AC_SUBST([VERSION], [$2])],
-+[_AM_SET_OPTIONS([$1])dnl
-+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+
-+# Some tools Automake needs.
-+AC_REQUIRE([AM_SANITY_CHECK])dnl
-+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AM_PROG_INSTALL_SH
-+AM_PROG_INSTALL_STRIP
-+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-+# We need awk for the "check" target. The system "awk" is bad on
-+# some platforms.
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+ [_AM_PROG_TAR([v7])])])
-+_AM_IF_OPTION([no-dependencies],,
-+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+ [_AM_DEPENDENCIES(CC)],
-+ [define([AC_PROG_CC],
-+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+ [_AM_DEPENDENCIES(CXX)],
-+ [define([AC_PROG_CXX],
-+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-+ [_AM_DEPENDENCIES(OBJC)],
-+ [define([AC_PROG_OBJC],
-+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-+])
-+])
-+
-+
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated. The stamp files are numbered to have different names.
-+
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_arg=$1
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+ case $_am_header in
-+ $_am_arg | $_am_arg:* )
-+ break ;;
-+ * )
-+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+ esac
-+done
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-+
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-+AC_SUBST(install_sh)])
-+
-+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot. For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+ am__leading_dot=.
-+else
-+ am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
-+
-+# Check to see how 'make' treats includes. -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
-+
-+# AM_MAKE_INCLUDE()
-+# -----------------
-+# Check to see how make treats includes.
-+AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+ @echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+AC_MSG_CHECKING([for style of include used by $am_make])
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+ am__include=include
-+ am__quote=
-+ _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+ echo '.include "confinc"' > confmf
-+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+ am__include=.include
-+ am__quote="\""
-+ _am_result=BSD
-+ fi
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
-+rm -f confinc confmf
-+])
-+
-+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 5
-+
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
-+
-+
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([missing])dnl
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+ am_missing_run="$MISSING --run "
-+else
-+ am_missing_run=
-+ AC_MSG_WARN([`missing' script is too old or missing])
-+fi
-+])
-+
-+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check for `mkdir -p'.
-+AC_DEFUN([AM_PROG_MKDIR_P],
-+[AC_PREREQ([2.60])dnl
-+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-+dnl while keeping a definition of mkdir_p for backward compatibility.
-+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-+dnl adjustment using top_builddir (which is defined more often than
-+dnl MKDIR_P).
-+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-+case $mkdir_p in
-+ [[\\/$]]* | ?:[[\\/]]*) ;;
-+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+])
-+
-+# Helper functions for option handling. -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
-+
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME. Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-+
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-+
-+# Check to make sure that the build environment is sane. -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# AM_SANITY_CHECK
-+# ---------------
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments. Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+ if test "$[*]" = "X"; then
-+ # -L didn't work.
-+ set X `ls -t $srcdir/configure conftest.file`
-+ fi
-+ rm -f conftest.file
-+ if test "$[*]" != "X $srcdir/configure conftest.file" \
-+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
-+
-+ # If neither matched, then we have a broken ls. This can happen
-+ # if, for instance, CONFIG_SHELL is bash and it inherits a
-+ # broken ls alias from the environment. This has actually
-+ # happened. Such a system could not be considered "sane".
-+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-+alias in your environment])
-+ fi
-+
-+ test "$[2]" = conftest.file
-+ )
-+then
-+ # Ok.
-+ :
-+else
-+ AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+AC_MSG_RESULT(yes)])
-+
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
-+# One issue with vendor `install' (even GNU) is that you can't
-+# specify the program used to strip binaries. This is especially
-+# annoying in cross-compiling environments, where the build's strip
-+# is unlikely to handle the host's binaries.
-+# Fortunately install-sh will honor a STRIPPROG variable, so we
-+# always use install-sh in `make install-strip', and initialize
-+# STRIPPROG with the value of the STRIP variable (set by the user).
-+AC_DEFUN([AM_PROG_INSTALL_STRIP],
-+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'. However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-+if test "$cross_compiling" != no; then
-+ AC_CHECK_TOOL([STRIP], [strip], :)
-+fi
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-+
-+# Copyright (C) 2006 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# _AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-+# This macro is traced by Automake.
-+AC_DEFUN([_AM_SUBST_NOTMAKE])
-+
-+# Check how to create a tarball. -*- Autoconf -*-
-+
-+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# _AM_PROG_TAR(FORMAT)
-+# --------------------
-+# Check how to create a tarball in format FORMAT.
-+# FORMAT should be one of `v7', `ustar', or `pax'.
-+#
-+# Substitute a variable $(am__tar) that is a command
-+# writing to stdout a FORMAT-tarball containing the directory
-+# $tardir.
-+# tardir=directory && $(am__tar) > result.tar
-+#
-+# Substitute a variable $(am__untar) that extract such
-+# a tarball read from stdin.
-+# $(am__untar) < result.tar
-+AC_DEFUN([_AM_PROG_TAR],
-+[# Always define AMTAR for backward compatibility.
-+AM_MISSING_PROG([AMTAR], [tar])
-+m4_if([$1], [v7],
-+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-+ [m4_case([$1], [ustar],, [pax],,
-+ [m4_fatal([Unknown tar format])])
-+AC_MSG_CHECKING([how to create a $1 tar archive])
-+# Loop over all known methods to create a tar archive until one works.
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-+# Do not fold the above two line into one, because Tru64 sh and
-+# Solaris sh will not grok spaces in the rhs of `-'.
-+for _am_tool in $_am_tools
-+do
-+ case $_am_tool in
-+ gnutar)
-+ for _am_tar in tar gnutar gtar;
-+ do
-+ AM_RUN_LOG([$_am_tar --version]) && break
-+ done
-+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-+ am__untar="$_am_tar -xf -"
-+ ;;
-+ plaintar)
-+ # Must skip GNU tar: if it does not support --format= it doesn't create
-+ # ustar tarball either.
-+ (tar --version) >/dev/null 2>&1 && continue
-+ am__tar='tar chf - "$$tardir"'
-+ am__tar_='tar chf - "$tardir"'
-+ am__untar='tar xf -'
-+ ;;
-+ pax)
-+ am__tar='pax -L -x $1 -w "$$tardir"'
-+ am__tar_='pax -L -x $1 -w "$tardir"'
-+ am__untar='pax -r'
-+ ;;
-+ cpio)
-+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-+ am__untar='cpio -i -H $1 -d'
-+ ;;
-+ none)
-+ am__tar=false
-+ am__tar_=false
-+ am__untar=false
-+ ;;
-+ esac
-+
-+ # If the value was cached, stop now. We just wanted to have am__tar
-+ # and am__untar set.
-+ test -n "${am_cv_prog_tar_$1}" && break
-+
-+ # tar/untar a dummy directory, and stop if the command works
-+ rm -rf conftest.dir
-+ mkdir conftest.dir
-+ echo GrepMe > conftest.dir/file
-+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-+ rm -rf conftest.dir
-+ if test -s conftest.tar; then
-+ AM_RUN_LOG([$am__untar <conftest.tar])
-+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-+ fi
-+done
-+rm -rf conftest.dir
-+
-+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-+AC_SUBST([am__tar])
-+AC_SUBST([am__untar])
-+]) # _AM_PROG_TAR
-+
-+m4_include([macros/ac_pkg_swig.m4])
-+m4_include([macros/as-scrub-include.m4])
-+m4_include([macros/binreloc.m4])
-+m4_include([macros/gnome-guile-checks.m4])
-+m4_include([macros/legacy_macros.m4])
- dnl AM_GCONF_SOURCE_2
- dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
- dnl (i.e. pass to gconftool-2
-@@ -34,8 +886,10 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
- fi
-
-- AC_ARG_WITH(gconf-source,
-- [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
-+ AC_ARG_WITH([gconf-source],
-+ AC_HELP_STRING([--with-gconf-source=sourceaddress],
-+ [Config database for installing schema files.]),
-+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-
- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-@@ -44,8 +898,10 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
- fi
-
-- AC_ARG_WITH(gconf-schema-file-dir,
-- [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
-+ AC_ARG_WITH([gconf-schema-file-dir],
-+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-+ [Directory for installing schema files.]),
-+ [GCONF_SCHEMA_FILE_DIR="$withval"],)
-
- AC_SUBST(GCONF_SCHEMA_FILE_DIR)
- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-@@ -154,8 +1010,9 @@ main ()
- {
- int major, minor, micro;
- char *tmp_version;
-+ int ignored;
-
-- system ("touch conf.glibtest");
-+ ignored = system ("touch conf.glibtest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = g_strdup("$min_glib_version");
-@@ -704,6 +1561,148 @@ sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
- fi])
-
-
-+dnl GNOME_COMPILE_WARNINGS
-+dnl Turn on many useful compiler warnings
-+dnl For now, only works on GCC
-+AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-+ dnl ******************************
-+ dnl More compiler warnings
-+ dnl ******************************
-+
-+ AC_ARG_ENABLE(compile-warnings,
-+ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-+ [Turn on compiler warnings]),,
-+ [enable_compile_warnings="m4_default([$1],[yes])"])
-+
-+ warnCFLAGS=
-+ if test "x$GCC" != xyes; then
-+ enable_compile_warnings=no
-+ fi
-+
-+ warning_flags=
-+ realsave_CFLAGS="$CFLAGS"
-+
-+ case "$enable_compile_warnings" in
-+ no)
-+ warning_flags=
-+ ;;
-+ minimum)
-+ warning_flags="-Wall"
-+ ;;
-+ yes)
-+ warning_flags="-Wall -Wmissing-prototypes"
-+ ;;
-+ maximum|error)
-+ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-+ CFLAGS="$warning_flags $CFLAGS"
-+ for option in -Wno-sign-compare; do
-+ SAVE_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS $option"
-+ AC_MSG_CHECKING([whether gcc understands $option])
-+ AC_TRY_COMPILE([], [],
-+ has_option=yes,
-+ has_option=no,)
-+ CFLAGS="$SAVE_CFLAGS"
-+ AC_MSG_RESULT($has_option)
-+ if test $has_option = yes; then
-+ warning_flags="$warning_flags $option"
-+ fi
-+ unset has_option
-+ unset SAVE_CFLAGS
-+ done
-+ unset option
-+ if test "$enable_compile_warnings" = "error" ; then
-+ warning_flags="$warning_flags -Werror"
-+ fi
-+ ;;
-+ *)
-+ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-+ ;;
-+ esac
-+ CFLAGS="$realsave_CFLAGS"
-+ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-+ AC_MSG_RESULT($warning_flags)
-+
-+ AC_ARG_ENABLE(iso-c,
-+ AC_HELP_STRING([--enable-iso-c],
-+ [Try to warn if code is not ISO C ]),,
-+ [enable_iso_c=no])
-+
-+ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-+ complCFLAGS=
-+ if test "x$enable_iso_c" != "xno"; then
-+ if test "x$GCC" = "xyes"; then
-+ case " $CFLAGS " in
-+ *[\ \ ]-ansi[\ \ ]*) ;;
-+ *) complCFLAGS="$complCFLAGS -ansi" ;;
-+ esac
-+ case " $CFLAGS " in
-+ *[\ \ ]-pedantic[\ \ ]*) ;;
-+ *) complCFLAGS="$complCFLAGS -pedantic" ;;
-+ esac
-+ fi
-+ fi
-+ AC_MSG_RESULT($complCFLAGS)
-+
-+ WARN_CFLAGS="$warning_flags $complCFLAGS"
-+ AC_SUBST(WARN_CFLAGS)
-+])
++#ifdef MAC_INTEGRATION
++static void
++gtk_quartz_set_menu(GncMainWindow* window) {
++ IgeMacMenuGroup *group;
++ GtkWidget *menu;
++ GtkWidget *item;
+
-+dnl For C++, do basically the same thing.
++ menu = gtk_ui_manager_get_widget (window->ui_merge, "/menubar");
++ if (GTK_IS_MENU_ITEM (menu))
++ menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
++ gtk_widget_hide(menu);
++ ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (menu));
+
-+AC_DEFUN([GNOME_CXX_WARNINGS],[
-+ AC_ARG_ENABLE(cxx-warnings,
-+ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-+ [Turn on compiler warnings.]),,
-+ [enable_cxx_warnings="m4_default([$1],[minimum])"])
++ item = gtk_ui_manager_get_widget (window->ui_merge,
++ "/menubar/File/FileQuit");
++ if (GTK_IS_MENU_ITEM (item))
++ ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (item));
+
-+ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-+ warnCXXFLAGS=
-+ if test "x$GXX" != xyes; then
-+ enable_cxx_warnings=no
-+ fi
-+ if test "x$enable_cxx_warnings" != "xno"; then
-+ if test "x$GXX" = "xyes"; then
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-Wall[\ \ ]*) ;;
-+ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-+ esac
++ /* the about group */
++ group = ige_mac_menu_add_app_menu_group ();
+
-+ ## -W is not all that useful. And it cannot be controlled
-+ ## with individual -Wno-xxx flags, unlike -Wall
-+ if test "x$enable_cxx_warnings" = "xyes"; then
-+ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
-+ fi
-+ fi
-+ fi
-+ AC_MSG_RESULT($warnCXXFLAGS)
-+
-+ AC_ARG_ENABLE(iso-cxx,
-+ AC_HELP_STRING([--enable-iso-cxx],
-+ [Try to warn if code is not ISO C++ ]),,
-+ [enable_iso_cxx=no])
-+
-+ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-+ complCXXFLAGS=
-+ if test "x$enable_iso_cxx" != "xno"; then
-+ if test "x$GXX" = "xyes"; then
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-ansi[\ \ ]*) ;;
-+ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-+ esac
-+
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-pedantic[\ \ ]*) ;;
-+ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-+ esac
-+ fi
-+ fi
-+ AC_MSG_RESULT($complCXXFLAGS)
-+
-+ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-+ AC_SUBST(WARN_CXXFLAGS)
-+])
-+
-
-
-
-@@ -869,9 +1868,10 @@ AC_DEFUN([GUILE_MODULE_REQUIRED_EXPORT],
-
-
- dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
--# serial 36 IT_PROG_INTLTOOL
--AC_DEFUN([IT_PROG_INTLTOOL],
--[AC_PREREQ([2.50])dnl
-+# serial 40 IT_PROG_INTLTOOL
-+AC_DEFUN([IT_PROG_INTLTOOL], [
-+AC_PREREQ([2.50])dnl
-+AC_REQUIRE([AM_NLS])dnl
-
- case "$am__api_version" in
- 1.[01234])
-@@ -885,14 +1885,21 @@ if test -n "$1"; then
- AC_MSG_CHECKING([for intltool >= $1])
-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
-+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-+ [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- ]
- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
- fi
-
-+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-+ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-+fi
-+
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-@@ -913,30 +1920,31 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar
- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
--AC_SUBST(INTLTOOL_DESKTOP_RULE)
--AC_SUBST(INTLTOOL_DIRECTORY_RULE)
--AC_SUBST(INTLTOOL_KEYS_RULE)
--AC_SUBST(INTLTOOL_PROP_RULE)
--AC_SUBST(INTLTOOL_OAF_RULE)
--AC_SUBST(INTLTOOL_PONG_RULE)
--AC_SUBST(INTLTOOL_SERVER_RULE)
--AC_SUBST(INTLTOOL_SHEET_RULE)
--AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
--AC_SUBST(INTLTOOL_UI_RULE)
--AC_SUBST(INTLTOOL_XAM_RULE)
--AC_SUBST(INTLTOOL_KBD_RULE)
--AC_SUBST(INTLTOOL_XML_RULE)
--AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
--AC_SUBST(INTLTOOL_CAVES_RULE)
--AC_SUBST(INTLTOOL_SCHEMAS_RULE)
--AC_SUBST(INTLTOOL_THEME_RULE)
--AC_SUBST(INTLTOOL_SERVICE_RULE)
--AC_SUBST(INTLTOOL_POLICY_RULE)
-+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-+_IT_SUBST(INTLTOOL_KEYS_RULE)
-+_IT_SUBST(INTLTOOL_PROP_RULE)
-+_IT_SUBST(INTLTOOL_OAF_RULE)
-+_IT_SUBST(INTLTOOL_PONG_RULE)
-+_IT_SUBST(INTLTOOL_SERVER_RULE)
-+_IT_SUBST(INTLTOOL_SHEET_RULE)
-+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-+_IT_SUBST(INTLTOOL_UI_RULE)
-+_IT_SUBST(INTLTOOL_XAM_RULE)
-+_IT_SUBST(INTLTOOL_KBD_RULE)
-+_IT_SUBST(INTLTOOL_XML_RULE)
-+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-+_IT_SUBST(INTLTOOL_CAVES_RULE)
-+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-+_IT_SUBST(INTLTOOL_THEME_RULE)
-+_IT_SUBST(INTLTOOL_SERVICE_RULE)
-+_IT_SUBST(INTLTOOL_POLICY_RULE)
-
- # Check the gettext tools to make sure they are GNU
- AC_PATH_PROG(XGETTEXT, xgettext)
- AC_PATH_PROG(MSGMERGE, msgmerge)
- AC_PATH_PROG(MSGFMT, msgfmt)
-+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
- if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
- fi
-@@ -947,17 +1955,17 @@ if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
- fi
-
--# Use the tools built into the package, not the ones that are installed.
--AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
--AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
--AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
--
- AC_PATH_PROG(INTLTOOL_PERL, perl)
- if test -z "$INTLTOOL_PERL"; then
-- AC_MSG_ERROR([perl not found; required for intltool])
-+ AC_MSG_ERROR([perl not found])
- fi
--if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-- AC_MSG_ERROR([perl 5.x required for intltool])
-+AC_MSG_CHECKING([for perl >= 5.8.1])
-+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-+if test $? -ne 0; then
-+ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-+else
-+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-+ AC_MSG_RESULT([$IT_PERL_VERSION])
- fi
- if test "x$2" != "xno-xml"; then
- AC_MSG_CHECKING([for XML::Parser])
-@@ -998,42 +2006,6 @@ AC_SUBST(DATADIRNAME)
-
- IT_PO_SUBDIR([po])
-
--dnl The following is very similar to
--dnl
--dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
--dnl
--dnl with the following slight differences:
--dnl - the *.in files are in ac_aux_dir,
--dnl - if the file haven't changed upon reconfigure, it's not touched,
--dnl - the evaluation of the third parameter enables a hack which computes
--dnl the actual value of $libdir,
--dnl - the user sees "executing intltool commands", instead of
--dnl "creating intltool-extract" and such.
--dnl
--dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
--dnl a reason for it.
--
--AC_CONFIG_COMMANDS([intltool], [
--
--for file in intltool-extract intltool-merge intltool-update; do
-- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
-- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
-- < ${ac_aux_dir}/${file}.in > ${file}.out
-- if cmp -s ${file} ${file}.out 2>/dev/null; then
-- rm -f ${file}.out
-- else
-- mv -f ${file}.out ${file}
-- fi
-- chmod ugo+x ${file}
-- chmod u+w ${file}
--done
--
--],
--[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
--prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
--INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
--
- ])
-
-
-@@ -1049,6 +2021,9 @@ dnl The following CONFIG_COMMANDS should be exetuted at the very end
- dnl of config.status.
- AC_CONFIG_COMMANDS_PRE([
- AC_CONFIG_COMMANDS([$1/stamp-it], [
-+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-+ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-+ fi
- rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
- >"$1/stamp-it.tmp"
- [sed '/^#/d
-@@ -1057,21 +2032,27 @@ AC_CONFIG_COMMANDS_PRE([
- '"s|^| $ac_top_srcdir/|" \
- "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
- ]
-- if test ! -f "$1/Makefile"; then
-- AC_MSG_ERROR([$1/Makefile is not ready.])
-- fi
-- mv "$1/Makefile" "$1/Makefile.tmp"
- [sed '/^POTFILES =/,/[^\\]$/ {
- /^POTFILES =/!d
- r $1/POTFILES
- }
-- ' "$1/Makefile.tmp" >"$1/Makefile"]
-+ ' "$1/Makefile.in" >"$1/Makefile"]
- rm -f "$1/Makefile.tmp"
- mv "$1/stamp-it.tmp" "$1/stamp-it"
- ])
- ])dnl
- ])
-
-+# _IT_SUBST(VARIABLE)
-+# -------------------
-+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-+#
-+AC_DEFUN([_IT_SUBST],
-+[
-+AC_SUBST([$1])
-+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-+]
-+)
-
- # deprecated macros
- AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-@@ -1288,14 +2269,6 @@ AC_ARG_WITH([pic],
- [pic_mode=default])
- test -z "$pic_mode" && pic_mode=default
-
--# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
--#
--# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
--# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
--# calls AC_LIBTOOL_CONFIG and creates libtool.
--#
--_LT_VERSION_CHECK
--
- # Use C for the default configuration in the libtool script
- tagname=
- AC_LIBTOOL_LANG_C_CONFIG
-@@ -1303,41 +2276,6 @@ _LT_AC_TAGCONFIG
- ])# AC_LIBTOOL_SETUP
-
-
--# _LT_VERSION_CHECK
--# -----------------
--AC_DEFUN([_LT_VERSION_CHECK],
--[AC_MSG_CHECKING([for correct ltmain.sh version])
--if test "x$ltmain" = "x" ; then
-- AC_MSG_RESULT(no)
-- AC_MSG_ERROR([
--
--*** @<:@Gentoo@:>@ sanity check failed! ***
--*** \$ltmain is not defined, please check the patch for consistency! ***
--])
--fi
--gentoo_lt_version="1.5.26"
--gentoo_ltmain_version=`sed -n '/^[[ ]]*VERSION=/{s/^[[ ]]*VERSION=//;p;q;}' "$ltmain"`
--if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
-- AC_MSG_RESULT(no)
-- AC_MSG_ERROR([
--
--*** @<:@Gentoo@:>@ sanity check failed! ***
--*** libtool.m4 and ltmain.sh have a version mismatch! ***
--*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
--
--Please run:
--
-- libtoolize --copy --force
--
--if appropriate, please contact the maintainer of this
--package (or your distribution) for help.
--])
--else
-- AC_MSG_RESULT(yes)
--fi
--])# _LT_VERSION_CHECK
--
--
- # _LT_AC_SYS_COMPILER
- # -------------------
- AC_DEFUN([_LT_AC_SYS_COMPILER],
-@@ -1748,6 +2686,7 @@ s390*-*linux*|sparc*-*linux*)
- esac
- ;;
- *64-bit*)
-+ libsuff=64
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -2653,14 +3592,7 @@ freebsd* | dragonfly*)
- *) objformat=elf ;;
- esac
- fi
-- # Handle Gentoo/FreeBSD as it was Linux
-- case $host_vendor in
-- gentoo)
-- version_type=linux ;;
-- *)
-- version_type=freebsd-$objformat ;;
-- esac
--
-+ version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -2671,12 +3603,6 @@ freebsd* | dragonfly*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
-- linux)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- need_lib_prefix=no
-- need_version=no
-- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
-@@ -2823,11 +3749,13 @@ linux* | k*bsd*-gnu)
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -7771,6 +8699,38 @@ AC_SUBST([SED])
- AC_MSG_RESULT([$SED])
- ])
-
-+# nls.m4 serial 3 (gettext-0.15)
-+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
-+
-+dnl Authors:
-+dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
-+dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
-+
-+AC_PREREQ(2.50)
-+
-+AC_DEFUN([AM_NLS],
-+[
-+ AC_MSG_CHECKING([whether NLS is requested])
-+ dnl Default is enabled NLS
-+ AC_ARG_ENABLE(nls,
-+ [ --disable-nls do not use Native Language Support],
-+ USE_NLS=$enableval, USE_NLS=yes)
-+ AC_MSG_RESULT($USE_NLS)
-+ AC_SUBST(USE_NLS)
-+])
-+
- # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
- #
- # Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
-@@ -7927,866 +8887,3 @@ else
- fi[]dnl
- ])# PKG_CHECK_MODULES
-
--# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# AM_AUTOMAKE_VERSION(VERSION)
--# ----------------------------
--# Automake X.Y traces this macro to ensure aclocal.m4 has been
--# generated from the m4 files accompanying Automake X.Y.
--# (This private macro should not be called outside this file.)
--AC_DEFUN([AM_AUTOMAKE_VERSION],
--[am__api_version='1.10'
--dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
--dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.10.2], [],
-- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
--])
--
--# _AM_AUTOCONF_VERSION(VERSION)
--# -----------------------------
--# aclocal traces this macro to find the Autoconf version.
--# This is a private macro too. Using m4_define simplifies
--# the logic in aclocal, which can simply ignore this definition.
--m4_define([_AM_AUTOCONF_VERSION], [])
--
--# AM_SET_CURRENT_AUTOMAKE_VERSION
--# -------------------------------
--# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
--# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
--AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.10.2])dnl
--m4_ifndef([AC_AUTOCONF_VERSION],
-- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
--
--# AM_AUX_DIR_EXPAND -*- Autoconf -*-
--
--# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
--# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
--# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
--#
--# Of course, Automake must honor this variable whenever it calls a
--# tool from the auxiliary directory. The problem is that $srcdir (and
--# therefore $ac_aux_dir as well) can be either absolute or relative,
--# depending on how configure is run. This is pretty annoying, since
--# it makes $ac_aux_dir quite unusable in subdirectories: in the top
--# source directory, any form will work fine, but in subdirectories a
--# relative path needs to be adjusted first.
--#
--# $ac_aux_dir/missing
--# fails when called from a subdirectory if $ac_aux_dir is relative
--# $top_srcdir/$ac_aux_dir/missing
--# fails if $ac_aux_dir is absolute,
--# fails when called from a subdirectory in a VPATH build with
--# a relative $ac_aux_dir
--#
--# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
--# are both prefixed by $srcdir. In an in-source build this is usually
--# harmless because $srcdir is `.', but things will broke when you
--# start a VPATH build or use an absolute $srcdir.
--#
--# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
--# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
--# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
--# and then we would define $MISSING as
--# MISSING="\${SHELL} $am_aux_dir/missing"
--# This will work as long as MISSING is not called from configure, because
--# unfortunately $(top_srcdir) has no meaning in configure.
--# However there are other variables, like CC, which are often used in
--# configure, and could therefore not use this "fixed" $ac_aux_dir.
--#
--# Another solution, used here, is to always expand $ac_aux_dir to an
--# absolute PATH. The drawback is that using absolute paths prevent a
--# configured tree to be moved without reconfiguration.
--
--AC_DEFUN([AM_AUX_DIR_EXPAND],
--[dnl Rely on autoconf to set up CDPATH properly.
--AC_PREREQ([2.50])dnl
--# expand $ac_aux_dir to an absolute path
--am_aux_dir=`cd $ac_aux_dir && pwd`
--])
--
--# AM_CONDITIONAL -*- Autoconf -*-
--
--# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 8
--
--# AM_CONDITIONAL(NAME, SHELL-CONDITION)
--# -------------------------------------
--# Define a conditional.
--AC_DEFUN([AM_CONDITIONAL],
--[AC_PREREQ(2.52)dnl
-- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
--AC_SUBST([$1_TRUE])dnl
--AC_SUBST([$1_FALSE])dnl
--_AM_SUBST_NOTMAKE([$1_TRUE])dnl
--_AM_SUBST_NOTMAKE([$1_FALSE])dnl
--if $2; then
-- $1_TRUE=
-- $1_FALSE='#'
--else
-- $1_TRUE='#'
-- $1_FALSE=
--fi
--AC_CONFIG_COMMANDS_PRE(
--[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-- AC_MSG_ERROR([[conditional "$1" was never defined.
--Usually this means the macro was only invoked conditionally.]])
--fi])])
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 9
--
--# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
--# written in clear, in which case automake, when reading aclocal.m4,
--# will think it sees a *use*, and therefore will trigger all it's
--# C support machinery. Also note that it means that autoscan, seeing
--# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
--
--
--# _AM_DEPENDENCIES(NAME)
--# ----------------------
--# See how the compiler implements dependency checking.
--# NAME is "CC", "CXX", "GCJ", or "OBJC".
--# We try a few techniques and use that to set a single cache variable.
--#
--# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
--# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
--# dependency, and given that the user is not expected to run this macro,
--# just rely on AC_PROG_CC.
--AC_DEFUN([_AM_DEPENDENCIES],
--[AC_REQUIRE([AM_SET_DEPDIR])dnl
--AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
--AC_REQUIRE([AM_MAKE_INCLUDE])dnl
--AC_REQUIRE([AM_DEP_TRACK])dnl
--
--ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
-- [$1], CXX, [depcc="$CXX" am_compiler_list=],
-- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-- [$1], UPC, [depcc="$UPC" am_compiler_list=],
-- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
-- [depcc="$$1" am_compiler_list=])
--
--AC_CACHE_CHECK([dependency style of $depcc],
-- [am_cv_$1_dependencies_compiler_type],
--[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-- # We make a subdir and do the tests there. Otherwise we can end up
-- # making bogus files that we don't know about and never remove. For
-- # instance it was reported that on HP-UX the gcc test will end up
-- # making a dummy file named `D' -- because `-MD' means `put the output
-- # in D'.
-- mkdir conftest.dir
-- # Copy depcomp to subdir because otherwise we won't find it if we're
-- # using a relative directory.
-- cp "$am_depcomp" conftest.dir
-- cd conftest.dir
-- # We will build objects and dependencies in a subdirectory because
-- # it helps to detect inapplicable dependency modes. For instance
-- # both Tru64's cc and ICC support -MD to output dependencies as a
-- # side effect of compilation, but ICC will put the dependencies in
-- # the current directory while Tru64 will put them in the object
-- # directory.
-- mkdir sub
--
-- am_cv_$1_dependencies_compiler_type=none
-- if test "$am_compiler_list" = ""; then
-- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-- fi
-- for depmode in $am_compiler_list; do
-- # Setup a source with many dependencies, because some compilers
-- # like to wrap large dependency lists on column 80 (with \), and
-- # we should not choose a depcomp mode which is confused by this.
-- #
-- # We need to recreate these files for each test, as the compiler may
-- # overwrite some of them when testing with obscure command lines.
-- # This happens at least with the AIX C compiler.
-- : > sub/conftest.c
-- for i in 1 2 3 4 5 6; do
-- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-- # Solaris 8's {/usr,}/bin/sh.
-- touch sub/conftst$i.h
-- done
-- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
--
-- case $depmode in
-- nosideeffect)
-- # after this tag, mechanisms are not by side-effect, so they'll
-- # only be used when explicitly requested
-- if test "x$enable_dependency_tracking" = xyes; then
-- continue
-- else
-- break
-- fi
-- ;;
-- none) break ;;
-- esac
-- # We check with `-c' and `-o' for the sake of the "dashmstdout"
-- # mode. It turns out that the SunPro C++ compiler does not properly
-- # handle `-M -o', and we need to detect this.
-- if depmode=$depmode \
-- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-- >/dev/null 2>conftest.err &&
-- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-- # icc doesn't choke on unknown options, it will just issue warnings
-- # or remarks (even with -Werror). So we grep stderr for any message
-- # that says an option was ignored or not supported.
-- # When given -MP, icc 7.0 and 7.1 complain thusly:
-- # icc: Command line warning: ignoring option '-M'; no argument required
-- # The diagnosis changed in icc 8.0:
-- # icc: Command line remark: option '-MP' not supported
-- if (grep 'ignoring option' conftest.err ||
-- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-- am_cv_$1_dependencies_compiler_type=$depmode
-- break
-- fi
-- fi
-- done
--
-- cd ..
-- rm -rf conftest.dir
--else
-- am_cv_$1_dependencies_compiler_type=none
--fi
--])
--AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
--AM_CONDITIONAL([am__fastdep$1], [
-- test "x$enable_dependency_tracking" != xno \
-- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
--])
--
--
--# AM_SET_DEPDIR
--# -------------
--# Choose a directory name for dependency files.
--# This macro is AC_REQUIREd in _AM_DEPENDENCIES
--AC_DEFUN([AM_SET_DEPDIR],
--[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
--])
--
--
--# AM_DEP_TRACK
--# ------------
--AC_DEFUN([AM_DEP_TRACK],
--[AC_ARG_ENABLE(dependency-tracking,
--[ --disable-dependency-tracking speeds up one-time build
-- --enable-dependency-tracking do not reject slow dependency extractors])
--if test "x$enable_dependency_tracking" != xno; then
-- am_depcomp="$ac_aux_dir/depcomp"
-- AMDEPBACKSLASH='\'
--fi
--AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])dnl
--_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
--])
--
--# Generate code to set up dependency tracking. -*- Autoconf -*-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--#serial 4
--
--# _AM_OUTPUT_DEPENDENCY_COMMANDS
--# ------------------------------
--AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[# Autoconf 2.62 quotes --file arguments for eval, but not when files
--# are listed without --file. Let's play safe and only enable the eval
--# if we detect the quoting.
--case $CONFIG_FILES in
--*\'*) eval set x "$CONFIG_FILES" ;;
--*) set x $CONFIG_FILES ;;
--esac
--shift
--for mf
--do
-- # Strip MF so we end up with the name of the file.
-- mf=`echo "$mf" | sed -e 's/:.*$//'`
-- # Check whether this is an Automake generated Makefile or not.
-- # We used to match only the files named `Makefile.in', but
-- # some people rename them; so instead we look at the file content.
-- # Grep'ing the first line is not enough: some people post-process
-- # each Makefile.in and add a new line on top of each file to say so.
-- # Grep'ing the whole file is not good either: AIX grep has a line
-- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-- dirpart=`AS_DIRNAME("$mf")`
-- else
-- continue
-- fi
-- # Extract the definition of DEPDIR, am__include, and am__quote
-- # from the Makefile without running `make'.
-- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-- test -z "$DEPDIR" && continue
-- am__include=`sed -n 's/^am__include = //p' < "$mf"`
-- test -z "am__include" && continue
-- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-- # When using ansi2knr, U may be empty or an underscore; expand it
-- U=`sed -n 's/^U = //p' < "$mf"`
-- # Find all dependency output files, they are included files with
-- # $(DEPDIR) in their names. We invoke sed twice because it is the
-- # simplest approach to changing $(DEPDIR) to its actual value in the
-- # expansion.
-- for file in `sed -n "
-- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-- # Make sure the directory exists.
-- test -f "$dirpart/$file" && continue
-- fdir=`AS_DIRNAME(["$file"])`
-- AS_MKDIR_P([$dirpart/$fdir])
-- # echo "creating $dirpart/$file"
-- echo '# dummy' > "$dirpart/$file"
-- done
--done
--])# _AM_OUTPUT_DEPENDENCY_COMMANDS
--
--
--# AM_OUTPUT_DEPENDENCY_COMMANDS
--# -----------------------------
--# This macro should only be invoked once -- use via AC_REQUIRE.
--#
--# This code is only required when automatic dependency tracking
--# is enabled. FIXME. This creates each `.P' file that we will
--# need in order to bootstrap the dependency handling code.
--AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
--[AC_CONFIG_COMMANDS([depfiles],
-- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
--])
--
--# Do all the work for Automake. -*- Autoconf -*-
--
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006, 2008 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 13
--
--# This macro actually does too much. Some checks are only needed if
--# your package does certain things. But this isn't really a big deal.
--
--# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
--# AM_INIT_AUTOMAKE([OPTIONS])
--# -----------------------------------------------
--# The call with PACKAGE and VERSION arguments is the old style
--# call (pre autoconf-2.50), which is being phased out. PACKAGE
--# and VERSION should now be passed to AC_INIT and removed from
--# the call to AM_INIT_AUTOMAKE.
--# We support both call styles for the transition. After
--# the next Automake release, Autoconf can make the AC_INIT
--# arguments mandatory, and then we can depend on a new Autoconf
--# release and drop the old call support.
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.60])dnl
--dnl Autoconf wants to disallow AM_ names. We explicitly allow
--dnl the ones we care about.
--m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
--AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
--AC_REQUIRE([AC_PROG_INSTALL])dnl
--if test "`cd $srcdir && pwd`" != "`pwd`"; then
-- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-- # is not polluted with repeated "-I."
-- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-- # test to see if srcdir already configured
-- if test -f $srcdir/config.status; then
-- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-- fi
--fi
--
--# test whether we have cygpath
--if test -z "$CYGPATH_W"; then
-- if (cygpath --version) >/dev/null 2>/dev/null; then
-- CYGPATH_W='cygpath -w'
-- else
-- CYGPATH_W=echo
-- fi
--fi
--AC_SUBST([CYGPATH_W])
--
--# Define the identity of the package.
--dnl Distinguish between old-style and new-style calls.
--m4_ifval([$2],
--[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-- AC_SUBST([PACKAGE], [$1])dnl
-- AC_SUBST([VERSION], [$2])],
--[_AM_SET_OPTIONS([$1])dnl
--dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
--m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
--
--_AM_IF_OPTION([no-define],,
--[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
--
--# Some tools Automake needs.
--AC_REQUIRE([AM_SANITY_CHECK])dnl
--AC_REQUIRE([AC_ARG_PROGRAM])dnl
--AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
--AM_MISSING_PROG(AUTOCONF, autoconf)
--AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
--AM_MISSING_PROG(AUTOHEADER, autoheader)
--AM_MISSING_PROG(MAKEINFO, makeinfo)
--AM_PROG_INSTALL_SH
--AM_PROG_INSTALL_STRIP
--AC_REQUIRE([AM_PROG_MKDIR_P])dnl
--# We need awk for the "check" target. The system "awk" is bad on
--# some platforms.
--AC_REQUIRE([AC_PROG_AWK])dnl
--AC_REQUIRE([AC_PROG_MAKE_SET])dnl
--AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-- [_AM_PROG_TAR([v7])])])
--_AM_IF_OPTION([no-dependencies],,
--[AC_PROVIDE_IFELSE([AC_PROG_CC],
-- [_AM_DEPENDENCIES(CC)],
-- [define([AC_PROG_CC],
-- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_CXX],
-- [_AM_DEPENDENCIES(CXX)],
-- [define([AC_PROG_CXX],
-- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-- [_AM_DEPENDENCIES(OBJC)],
-- [define([AC_PROG_OBJC],
-- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
--])
--])
--
--
--# When config.status generates a header, we must update the stamp-h file.
--# This file resides in the same directory as the config header
--# that is generated. The stamp files are numbered to have different names.
--
--# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
--# loop where config.status creates the headers, so we can generate
--# our stamp files there.
--AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
--[# Compute $1's index in $config_headers.
--_am_arg=$1
--_am_stamp_count=1
--for _am_header in $config_headers :; do
-- case $_am_header in
-- $_am_arg | $_am_arg:* )
-- break ;;
-- * )
-- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-- esac
--done
--echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
--
--# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# AM_PROG_INSTALL_SH
--# ------------------
--# Define $install_sh.
--AC_DEFUN([AM_PROG_INSTALL_SH],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
--AC_SUBST(install_sh)])
--
--# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 2
--
--# Check whether the underlying file-system supports filenames
--# with a leading dot. For instance MS-DOS doesn't.
--AC_DEFUN([AM_SET_LEADING_DOT],
--[rm -rf .tst 2>/dev/null
--mkdir .tst 2>/dev/null
--if test -d .tst; then
-- am__leading_dot=.
--else
-- am__leading_dot=_
--fi
--rmdir .tst 2>/dev/null
--AC_SUBST([am__leading_dot])])
--
--# Check to see how 'make' treats includes. -*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 3
--
--# AM_MAKE_INCLUDE()
--# -----------------
--# Check to see how make treats includes.
--AC_DEFUN([AM_MAKE_INCLUDE],
--[am_make=${MAKE-make}
--cat > confinc << 'END'
--am__doit:
-- @echo done
--.PHONY: am__doit
--END
--# If we don't find an include directive, just comment out the code.
--AC_MSG_CHECKING([for style of include used by $am_make])
--am__include="#"
--am__quote=
--_am_result=none
--# First try GNU make style include.
--echo "include confinc" > confmf
--# We grep out `Entering directory' and `Leaving directory'
--# messages which can occur if `w' ends up in MAKEFLAGS.
--# In particular we don't look at `^make:' because GNU make might
--# be invoked under some other name (usually "gmake"), in which
--# case it prints its new name instead of `make'.
--if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-- am__include=include
-- am__quote=
-- _am_result=GNU
--fi
--# Now try BSD make style include.
--if test "$am__include" = "#"; then
-- echo '.include "confinc"' > confmf
-- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-- am__include=.include
-- am__quote="\""
-- _am_result=BSD
-- fi
--fi
--AC_SUBST([am__include])
--AC_SUBST([am__quote])
--AC_MSG_RESULT([$_am_result])
--rm -f confinc confmf
--])
--
--# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
--
--# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 5
--
--# AM_MISSING_PROG(NAME, PROGRAM)
--# ------------------------------
--AC_DEFUN([AM_MISSING_PROG],
--[AC_REQUIRE([AM_MISSING_HAS_RUN])
--$1=${$1-"${am_missing_run}$2"}
--AC_SUBST($1)])
--
--
--# AM_MISSING_HAS_RUN
--# ------------------
--# Define MISSING if not defined so far and test if it supports --run.
--# If it does, set am_missing_run to use it, otherwise, to nothing.
--AC_DEFUN([AM_MISSING_HAS_RUN],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--AC_REQUIRE_AUX_FILE([missing])dnl
--test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
--# Use eval to expand $SHELL
--if eval "$MISSING --run true"; then
-- am_missing_run="$MISSING --run "
--else
-- am_missing_run=
-- AC_MSG_WARN([`missing' script is too old or missing])
--fi
--])
--
--# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# AM_PROG_MKDIR_P
--# ---------------
--# Check for `mkdir -p'.
--AC_DEFUN([AM_PROG_MKDIR_P],
--[AC_PREREQ([2.60])dnl
--AC_REQUIRE([AC_PROG_MKDIR_P])dnl
--dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
--dnl while keeping a definition of mkdir_p for backward compatibility.
--dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
--dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
--dnl Makefile.ins that do not define MKDIR_P, so we do our own
--dnl adjustment using top_builddir (which is defined more often than
--dnl MKDIR_P).
--AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
--case $mkdir_p in
-- [[\\/$]]* | ?:[[\\/]]*) ;;
-- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
--esac
--])
--
--# Helper functions for option handling. -*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 4
--
--# _AM_MANGLE_OPTION(NAME)
--# -----------------------
--AC_DEFUN([_AM_MANGLE_OPTION],
--[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
--
--# _AM_SET_OPTION(NAME)
--# ------------------------------
--# Set option NAME. Presently that only means defining a flag for this option.
--AC_DEFUN([_AM_SET_OPTION],
--[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
--
--# _AM_SET_OPTIONS(OPTIONS)
--# ----------------------------------
--# OPTIONS is a space-separated list of Automake options.
--AC_DEFUN([_AM_SET_OPTIONS],
--[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
--
--# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
--# -------------------------------------------
--# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
--AC_DEFUN([_AM_IF_OPTION],
--[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
--
--# Check to make sure that the build environment is sane. -*- Autoconf -*-
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 4
--
--# AM_SANITY_CHECK
--# ---------------
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftest.file
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments. Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
-- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-- if test "$[*]" = "X"; then
-- # -L didn't work.
-- set X `ls -t $srcdir/configure conftest.file`
-- fi
-- rm -f conftest.file
-- if test "$[*]" != "X $srcdir/configure conftest.file" \
-- && test "$[*]" != "X conftest.file $srcdir/configure"; then
--
-- # If neither matched, then we have a broken ls. This can happen
-- # if, for instance, CONFIG_SHELL is bash and it inherits a
-- # broken ls alias from the environment. This has actually
-- # happened. Such a system could not be considered "sane".
-- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
--alias in your environment])
-- fi
--
-- test "$[2]" = conftest.file
-- )
--then
-- # Ok.
-- :
--else
-- AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--AC_MSG_RESULT(yes)])
--
--# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# AM_PROG_INSTALL_STRIP
--# ---------------------
--# One issue with vendor `install' (even GNU) is that you can't
--# specify the program used to strip binaries. This is especially
--# annoying in cross-compiling environments, where the build's strip
--# is unlikely to handle the host's binaries.
--# Fortunately install-sh will honor a STRIPPROG variable, so we
--# always use install-sh in `make install-strip', and initialize
--# STRIPPROG with the value of the STRIP variable (set by the user).
--AC_DEFUN([AM_PROG_INSTALL_STRIP],
--[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
--# Installed binaries are usually stripped using `strip' when the user
--# run `make install-strip'. However `strip' might not be the right
--# tool to use in cross-compilation environments, therefore Automake
--# will honor the `STRIP' environment variable to overrule this program.
--dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
--if test "$cross_compiling" != no; then
-- AC_CHECK_TOOL([STRIP], [strip], :)
--fi
--INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
--AC_SUBST([INSTALL_STRIP_PROGRAM])])
--
--# Copyright (C) 2006 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# _AM_SUBST_NOTMAKE(VARIABLE)
--# ---------------------------
--# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
--# This macro is traced by Automake.
--AC_DEFUN([_AM_SUBST_NOTMAKE])
--
--# Check how to create a tarball. -*- Autoconf -*-
--
--# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 2
--
--# _AM_PROG_TAR(FORMAT)
--# --------------------
--# Check how to create a tarball in format FORMAT.
--# FORMAT should be one of `v7', `ustar', or `pax'.
--#
--# Substitute a variable $(am__tar) that is a command
--# writing to stdout a FORMAT-tarball containing the directory
--# $tardir.
--# tardir=directory && $(am__tar) > result.tar
--#
--# Substitute a variable $(am__untar) that extract such
--# a tarball read from stdin.
--# $(am__untar) < result.tar
--AC_DEFUN([_AM_PROG_TAR],
--[# Always define AMTAR for backward compatibility.
--AM_MISSING_PROG([AMTAR], [tar])
--m4_if([$1], [v7],
-- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-- [m4_case([$1], [ustar],, [pax],,
-- [m4_fatal([Unknown tar format])])
--AC_MSG_CHECKING([how to create a $1 tar archive])
--# Loop over all known methods to create a tar archive until one works.
--_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
--_am_tools=${am_cv_prog_tar_$1-$_am_tools}
--# Do not fold the above two line into one, because Tru64 sh and
--# Solaris sh will not grok spaces in the rhs of `-'.
--for _am_tool in $_am_tools
--do
-- case $_am_tool in
-- gnutar)
-- for _am_tar in tar gnutar gtar;
-- do
-- AM_RUN_LOG([$_am_tar --version]) && break
-- done
-- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-- am__untar="$_am_tar -xf -"
-- ;;
-- plaintar)
-- # Must skip GNU tar: if it does not support --format= it doesn't create
-- # ustar tarball either.
-- (tar --version) >/dev/null 2>&1 && continue
-- am__tar='tar chf - "$$tardir"'
-- am__tar_='tar chf - "$tardir"'
-- am__untar='tar xf -'
-- ;;
-- pax)
-- am__tar='pax -L -x $1 -w "$$tardir"'
-- am__tar_='pax -L -x $1 -w "$tardir"'
-- am__untar='pax -r'
-- ;;
-- cpio)
-- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-- am__untar='cpio -i -H $1 -d'
-- ;;
-- none)
-- am__tar=false
-- am__tar_=false
-- am__untar=false
-- ;;
-- esac
--
-- # If the value was cached, stop now. We just wanted to have am__tar
-- # and am__untar set.
-- test -n "${am_cv_prog_tar_$1}" && break
--
-- # tar/untar a dummy directory, and stop if the command works
-- rm -rf conftest.dir
-- mkdir conftest.dir
-- echo GrepMe > conftest.dir/file
-- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-- rm -rf conftest.dir
-- if test -s conftest.tar; then
-- AM_RUN_LOG([$am__untar <conftest.tar])
-- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-- fi
--done
--rm -rf conftest.dir
--
--AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
--AC_MSG_RESULT([$am_cv_prog_tar_$1])])
--AC_SUBST([am__tar])
--AC_SUBST([am__untar])
--]) # _AM_PROG_TAR
--
--m4_include([macros/ac_pkg_swig.m4])
--m4_include([macros/as-scrub-include.m4])
--m4_include([macros/binreloc.m4])
--m4_include([macros/compiler-flags.m4])
--m4_include([macros/gnome-guile-checks.m4])
--m4_include([macros/legacy_macros.m4])
--m4_include([macros/pkg.m4])
-diff --git a/checks/Makefile.in b/checks/Makefile.in
-index 439b9d8..e3a96e4 100644
---- a/checks/Makefile.in
-+++ b/checks/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- checksdir = ${GNC_CHECKS_DIR}
-@@ -336,8 +317,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/config.guess b/config.guess
-index 2313a17..f32079a 100755
---- a/config.guess
-+++ b/config.guess
-@@ -139,23 +139,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
- UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
--if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
-- eval $set_cc_for_build
-- cat << EOF > $dummy.c
-- #include <features.h>
-- #ifdef __UCLIBC__
-- # ifdef __UCLIBC_CONFIG_VERSION__
-- LIBC=uclibc __UCLIBC_CONFIG_VERSION__
-- # else
-- LIBC=uclibc
-- # endif
-- #else
-- LIBC=gnu
-- #endif
--EOF
-- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
--fi
--
- # Note: order is significant - the case branches are not exclusive.
-
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -857,31 +840,31 @@ EOF
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_EABI__
- then
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- else
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
- fi
- exit ;;
- avr32*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- cris:Linux:*:*)
-- echo cris-axis-linux-${LIBC}
-+ echo cris-axis-linux-gnu
- exit ;;
- crisv32:Linux:*:*)
-- echo crisv32-axis-linux-${LIBC}
-+ echo crisv32-axis-linux-gnu
- exit ;;
- frv:Linux:*:*)
-- echo frv-unknown-linux-${LIBC}
-+ echo frv-unknown-linux-gnu
- exit ;;
- ia64:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- m32r*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- m68*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- mips:Linux:*:*)
- eval $set_cc_for_build
-@@ -904,7 +887,7 @@ EOF
- s: ::g
- p
- }'`"
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
-+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
- eval $set_cc_for_build
-@@ -927,16 +910,16 @@ EOF
- s: ::g
- p
- }'`"
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
-+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- or32:Linux:*:*)
-- echo or32-unknown-linux-${LIBC}
-+ echo or32-unknown-linux-gnu
- exit ;;
- ppc:Linux:*:*)
-- echo powerpc-unknown-linux-${LIBC}
-+ echo powerpc-unknown-linux-gnu
- exit ;;
- ppc64:Linux:*:*)
-- echo powerpc64-unknown-linux-${LIBC}
-+ echo powerpc64-unknown-linux-gnu
- exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -949,40 +932,40 @@ EOF
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-- *) echo hppa-unknown-linux-${LIBC} ;;
-+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+ *) echo hppa-unknown-linux-gnu ;;
- esac
- exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
-- echo hppa64-unknown-linux-${LIBC}
-+ echo hppa64-unknown-linux-gnu
- exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
- exit ;;
- sh64*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- sh*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- sparc:Linux:*:* | sparc64:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- vax:Linux:*:*)
-- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-dec-linux-gnu
- exit ;;
- x86_64:Linux:*:*)
-- echo x86_64-unknown-linux-${LIBC}
-+ echo x86_64-unknown-linux-gnu
- exit ;;
- xtensa*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
-@@ -997,22 +980,20 @@ EOF
- p'`
- case "$ld_supported_targets" in
- elf32-i386)
-- TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
-+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
- a.out-i386-linux)
-- echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
-+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit ;;
- coff-i386)
-- echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
-+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit ;;
- "")
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
- # one that does not give us useful --help.
-- echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
-+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit ;;
- esac
-- # This should get integrated into the C code below, but now we hack
-- if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
-diff --git a/config.h.in b/config.h.in
-index a1a19ad..6f10214 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -1,8 +1,5 @@
- /* config.h.in. Generated from configure.in by autoheader. */
-
--/* Define if building universal (internal helper macro) */
--#undef AC_APPLE_UNIVERSAL_BUILD
--
- /* Include pthread support for binary relocation? */
- #undef BR_PTHREAD
-
-@@ -297,49 +294,14 @@
- /* We are using EFence */
- #undef USE_EFENCE
-
--/* Enable extensions on AIX 3, Interix. */
--#ifndef _ALL_SOURCE
--# undef _ALL_SOURCE
--#endif
--/* Enable GNU extensions on systems that have them. */
--#ifndef _GNU_SOURCE
--# undef _GNU_SOURCE
--#endif
--/* Enable threading extensions on Solaris. */
--#ifndef _POSIX_PTHREAD_SEMANTICS
--# undef _POSIX_PTHREAD_SEMANTICS
--#endif
--/* Enable extensions on HP NonStop. */
--#ifndef _TANDEM_SOURCE
--# undef _TANDEM_SOURCE
--#endif
--/* Enable general extensions on Solaris. */
--#ifndef __EXTENSIONS__
--# undef __EXTENSIONS__
--#endif
--
--
- /* Version number of package */
- #undef VERSION
-
--/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-- significant byte first (like Motorola and SPARC, unlike Intel). */
--#if defined AC_APPLE_UNIVERSAL_BUILD
--# if defined __BIG_ENDIAN__
--# define WORDS_BIGENDIAN 1
--# endif
--#else
--# ifndef WORDS_BIGENDIAN
--# undef WORDS_BIGENDIAN
--# endif
--#endif
--
--/* Define to 1 if on MINIX. */
--#undef _MINIX
--
--/* Define to 2 if the system does not provide POSIX.1 features except with
-- this defined. */
--#undef _POSIX_1_SOURCE
-+/* Define to 1 if your processor stores words with the most significant byte
-+ first (like Motorola and SPARC, unlike Intel and VAX). */
-+#undef WORDS_BIGENDIAN
-
--/* Define to 1 if you need to in order for `stat' and other things to work. */
--#undef _POSIX_SOURCE
-+/* Enable GNU extensions on systems that have them. */
-+#ifndef _GNU_SOURCE
-+# undef _GNU_SOURCE
-+#endif
-diff --git a/config.sub b/config.sub
-index ba16ebf..6759825 100755
---- a/config.sub
-+++ b/config.sub
-@@ -244,7 +244,7 @@ case $basic_machine in
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | bfin \
- | c4x | clipper \
-- | d10v | d30v | dlx | dsp16xx | dvp \
-+ | d10v | d30v | dlx | dsp16xx \
- | fido | fr30 | frv \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
-@@ -277,7 +277,7 @@ case $basic_machine in
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- | pyramid \
- | score \
-- | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-@@ -358,7 +358,7 @@ case $basic_machine in
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- | pyramid-* \
- | romp-* | rs6000-* \
-- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
-@@ -714,24 +714,6 @@ case $basic_machine in
- basic_machine=m68k-atari
- os=-mint
- ;;
-- mipsEE* | ee | ps2)
-- basic_machine=mips64r5900el-scei
-- case $os in
-- -linux*)
-- ;;
-- *)
-- os=-elf
-- ;;
-- esac
-- ;;
-- iop)
-- basic_machine=mipsel-scei
-- os=-irx
-- ;;
-- dvp)
-- basic_machine=dvp-scei
-- os=-elf
-- ;;
- mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- ;;
-@@ -1276,7 +1258,7 @@ case $os in
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
-+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
-diff --git a/configure b/configure
-index d0a5ad8..b7989cc 100755
---- a/configure
-+++ b/configure
-@@ -1,11 +1,11 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for gnucash 2.2.9.
-+# Generated by GNU Autoconf 2.61 for gnucash 2.2.9.
- #
- # Report bugs to <gnucash-devel at gnucash.org>.
- #
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
-@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
-- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-@@ -39,45 +39,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
-
--as_nl='
--'
--export as_nl
--# Printing a long string crashes Solaris 7 /usr/bin/printf.
--as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
--as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
--as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
--if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-- as_echo='printf %s\n'
-- as_echo_n='printf %s'
--else
-- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-- as_echo_n='/usr/ucb/echo -n'
-- else
-- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-- as_echo_n_body='eval
-- arg=$1;
-- case $arg in
-- *"$as_nl"*)
-- expr "X$arg" : "X\\(.*\\)$as_nl";
-- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-- esac;
-- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-- '
-- export as_echo_n_body
-- as_echo_n='sh -c $as_echo_n_body as_echo'
-- fi
-- export as_echo_body
-- as_echo='sh -c $as_echo_body as_echo'
--fi
--
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
-- PATH_SEPARATOR=:
-- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-- PATH_SEPARATOR=';'
-- }
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
- fi
-
- # Support unset when possible.
-@@ -93,6 +65,8 @@ fi
- # there to prevent editors from complaining about space-tab.
- # (If _AS_PATH_WALK were called with IFS unset, it would disable word
- # splitting by setting IFS to empty value.)
-+as_nl='
-+'
- IFS=" "" $as_nl"
-
- # Find who we are. Look in the path if we contain no directory separator.
-@@ -115,7 +89,7 @@ if test "x$as_myself" = x; then
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
-- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
- fi
-
-@@ -128,10 +102,17 @@ PS2='> '
- PS4='+ '
-
- # NLS nuisances.
--LC_ALL=C
--export LC_ALL
--LANGUAGE=C
--export LANGUAGE
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ fi
-+done
-
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -153,7 +134,7 @@ as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X/"$0" |
-+echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
-@@ -179,7 +160,7 @@ else
- as_have_required=no
- fi
-
-- if test $as_have_required = yes && (eval ":
-+ if test $as_have_required = yes && (eval ":
- (as_func_return () {
- (exit \$1)
- }
-@@ -261,7 +242,7 @@ IFS=$as_save_IFS
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
-- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-@@ -282,7 +263,7 @@ _ASEOF
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
-- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-@@ -362,10 +343,10 @@ fi
-
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
-- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-- done
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ done
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
- fi
-
-
-@@ -434,10 +415,9 @@ fi
-
- test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
-- echo Please tell bug-autoconf at gnu.org about your system,
-- echo including any error possibly output before this message.
-- echo This can help us improve future autoconf versions.
-- echo Configuration will now proceed without shell functions.
-+ echo Please tell autoconf at gnu.org about your system,
-+ echo including any error possibly output before this
-+ echo message
- }
-
-
-@@ -473,7 +453,7 @@ test \$exitcode = 0") || {
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
-- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
-@@ -501,6 +481,7 @@ case `echo -n x` in
- *)
- ECHO_N='-n';;
- esac
-+
- if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-@@ -513,22 +494,19 @@ if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
- else
- rm -f conf$$.dir
-- mkdir conf$$.dir 2>/dev/null
--fi
--if (echo >conf$$.file) 2>/dev/null; then
-- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- as_ln_s='ln -s'
-- # ... but there are two gotchas:
-- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-- # In both cases, we have to default to `cp -p'.
-- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-- as_ln_s='cp -p'
-- elif ln conf$$.file conf$$ 2>/dev/null; then
-- as_ln_s=ln
-- else
-+ mkdir conf$$.dir
-+fi
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s='ln -s'
-+ # ... but there are two gotchas:
-+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+ # In both cases, we have to default to `cp -p'.
-+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
-- fi
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
-@@ -553,10 +531,10 @@ else
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-- test -d "$1/.";
-+ test -d "$1/.";
- else
- case $1 in
-- -*)set "./$1";;
-+ -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
-@@ -791,336 +769,291 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='LTLIBOBJS
--LIBOBJS_SEDSCRIPT
--LC_MESSAGES_ENUM
--LIBOBJS
--EFENCE_LIBS
--GNOME_PRINT_LIBS
--GNOME_PRINT_CFLAGS
--GTKHTML_USES_GTKPRINT_FALSE
--GTKHTML_USES_GTKPRINT_TRUE
--GTKHTML_LIBS
--GTKHTML_CFLAGS
--GOFFICE_LIBS
--GOFFICE_CFLAGS
--GLADE_LIBS
--GLADE_CFLAGS
--GDK_PIXBUF_LIBS
--GDK_PIXBUF_CFLAGS
--GNOME_LIBS
--GNOME_CFLAGS
--HAVE_GTK_2_10_FALSE
--HAVE_GTK_2_10_TRUE
--GTK_LIBS
--GTK_CFLAGS
--cflags_set
--GNUCASH_ENABLE_GUI_FALSE
--GNUCASH_ENABLE_GUI_TRUE
--enable_latex_docs
--enable_html_docs
--enable_dot
--ENABLE_DOXYGEN_FALSE
--ENABLE_DOXYGEN_TRUE
--DOC_FALSE
--DOC_TRUE
--DOT
--DOXYGEN
--PERLINCL
--PERL
--GNC_CTAGS_FILE_FALSE
--GNC_CTAGS_FILE_TRUE
--GNC_CTAGS_FILE
--GNC_ETAGS_FILE_FALSE
--GNC_ETAGS_FILE_TRUE
--GNC_ETAGS_FILE
--GNC_HELPDIR
--AQBANKING_DIR
--AQBANKING_LIBS
--AQBANKING_CFLAGS
--OFX_DIR
--LIBOFX_LIBS
--LIBOFX_CFLAGS
--SQL_DIR
--PGSQL_LIBS
--PGSQL_CFLAGS
--GNC_LIBEXECDIR
--GNC_SHAREDIR
--GNC_SCM_INSTALL_DIR
--GNC_PIXMAP_DIR
--GNC_INCLUDE_DIR
--GNC_UI_DIR
--GNC_GLADE_DIR
--GNC_DOC_INSTALL_DIR
--GNC_CONFIGDIR
--GNC_CHECKS_DIR
--GNC_ACCOUNTS_DIR
--QOF_XML_DIR
--QOF_LIB_DIR
--QOF_PREFIX
--QOF_LIBS
--QOF_CFLAGS
--USE_LIBQOF
--USE_LIBQOF_FALSE
--USE_LIBQOF_TRUE
--LIBQOF_BACKEND_QSF_LIBRARY_VERSION
--LIBQOF_LIBRARY_VERSION
--ZLIB_LIBS
--LIBXML_VERSION
--LIBXML2_LIBS
--LIBXML2_CFLAGS
--GCONFTOOL
--GCONF_LIBS
--GCONF_CFLAGS
--GNC_HAVE_GUILE_WWW_FALSE
--GNC_HAVE_GUILE_WWW_TRUE
--GUILE_TOOLS
--GUILE_CONFIG
--GNC_TEST_SRFI_LOAD_CMD
--GNC_SRFI_LOAD_PATH
--GNC_ADD_ON_SRFIS
--GUILE
--GUILE_FALSE
--GUILE_TRUE
--GUILE_INCS
--GUILE_LIBS
--BUILD_GUILE
--READLINE_LIB
--TERMCAP_LIB
--QTTHREADS_LIB
--DL_LIB
--HAVE_GLIB_2_8_FALSE
--HAVE_GLIB_2_8_TRUE
--GLIB26_LIBS
--GLIB_MKENUMS
--GOBJECT_QUERY
--GLIB_GENMARSHAL
--GLIB_LIBS
--GLIB_CFLAGS
--PKG_CONFIG
--BINRELOC_LIBS
--BINRELOC_CFLAGS
--HAVE_X11_XLIB_H_FALSE
--HAVE_X11_XLIB_H_TRUE
--GNUCASH_SEPARATE_BUILDDIR_FALSE
--GNUCASH_SEPARATE_BUILDDIR_TRUE
--BUILDING_FROM_SVN_FALSE
--BUILDING_FROM_SVN_TRUE
--SWIG
--HTMLHELP_LIBS
--REGEX_LIBS
--PLATFORM_WIN32_FALSE
--PLATFORM_WIN32_TRUE
--OS_WIN32_FALSE
--OS_WIN32_TRUE
--LIBTOOL_DEPS
--LIBTOOL
--ac_ct_F77
--FFLAGS
--F77
--CXXCPP
--am__fastdepCXX_FALSE
--am__fastdepCXX_TRUE
--CXXDEPMODE
--ac_ct_CXX
--CXXFLAGS
--CXX
--OBJDUMP
--AS
--DLLTOOL
--NMEDIT
--DSYMUTIL
--RANLIB
--AR
--ECHO
--LN_S
--SED
--host_os
--host_vendor
--host_cpu
--host
--build_os
--build_vendor
--build_cpu
--build
--MKINSTALLDIRS
--POSUB
--POFILES
--PO_IN_DATADIR_FALSE
--PO_IN_DATADIR_TRUE
--INTLLIBS
--INSTOBJEXT
--GMOFILES
--CATOBJEXT
--CATALOGS
--GMSGFMT
--MSGFMT_OPTS
-+ac_subst_vars='SHELL
-+PATH_SEPARATOR
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+datarootdir
-+datadir
-+sysconfdir
-+sharedstatedir
-+localstatedir
-+includedir
-+oldincludedir
-+docdir
-+infodir
-+htmldir
-+dvidir
-+pdfdir
-+psdir
-+libdir
-+localedir
-+mandir
-+DEFS
-+ECHO_C
-+ECHO_N
-+ECHO_T
-+LIBS
-+build_alias
-+host_alias
-+target_alias
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+am__isrc
-+CYGPATH_W
-+PACKAGE
-+VERSION
-+ACLOCAL
-+AUTOCONF
-+AUTOMAKE
-+AUTOHEADER
-+MAKEINFO
-+install_sh
-+STRIP
-+INSTALL_STRIP_PROGRAM
-+mkdir_p
-+AWK
-+SET_MAKE
-+am__leading_dot
-+AMTAR
-+am__tar
-+am__untar
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+ac_ct_CC
-+EXEEXT
-+OBJEXT
-+DEPDIR
-+am__include
-+am__quote
-+AMDEP_TRUE
-+AMDEP_FALSE
-+AMDEPBACKSLASH
-+CCDEPMODE
-+am__fastdepCC_TRUE
-+am__fastdepCC_FALSE
- USE_NLS
--GETTEXT_PACKAGE
--GNUCASH_MICRO_VERSION
--GNUCASH_MINOR_VERSION
--GNUCASH_MAJOR_VERSION
--GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY
--GCONF_SCHEMAS_INSTALL_FALSE
--GCONF_SCHEMAS_INSTALL_TRUE
--GCONF_SCHEMA_FILE_DIR
--GCONF_SCHEMA_CONFIG_SOURCE
--DATADIRNAME
--ALL_LINGUAS
--INTLTOOL_PERL
- INTLTOOL_UPDATE
- INTLTOOL_MERGE
- INTLTOOL_EXTRACT
--MSGFMT
--MSGMERGE
--XGETTEXT
--INTLTOOL_POLICY_RULE
--INTLTOOL_SERVICE_RULE
--INTLTOOL_THEME_RULE
--INTLTOOL_SCHEMAS_RULE
--INTLTOOL_CAVES_RULE
--INTLTOOL_XML_NOMERGE_RULE
--INTLTOOL_XML_RULE
--INTLTOOL_KBD_RULE
--INTLTOOL_XAM_RULE
--INTLTOOL_UI_RULE
--INTLTOOL_SOUNDLIST_RULE
--INTLTOOL_SHEET_RULE
--INTLTOOL_SERVER_RULE
--INTLTOOL_PONG_RULE
--INTLTOOL_OAF_RULE
--INTLTOOL_PROP_RULE
--INTLTOOL_KEYS_RULE
--INTLTOOL_DIRECTORY_RULE
- INTLTOOL_DESKTOP_RULE
--EGREP
--GREP
-+INTLTOOL_DIRECTORY_RULE
-+INTLTOOL_KEYS_RULE
-+INTLTOOL_PROP_RULE
-+INTLTOOL_OAF_RULE
-+INTLTOOL_PONG_RULE
-+INTLTOOL_SERVER_RULE
-+INTLTOOL_SHEET_RULE
-+INTLTOOL_SOUNDLIST_RULE
-+INTLTOOL_UI_RULE
-+INTLTOOL_XAM_RULE
-+INTLTOOL_KBD_RULE
-+INTLTOOL_XML_RULE
-+INTLTOOL_XML_NOMERGE_RULE
-+INTLTOOL_CAVES_RULE
-+INTLTOOL_SCHEMAS_RULE
-+INTLTOOL_THEME_RULE
-+INTLTOOL_SERVICE_RULE
-+INTLTOOL_POLICY_RULE
-+XGETTEXT
-+MSGMERGE
-+MSGFMT
-+GMSGFMT
-+INTLTOOL_PERL
-+ALL_LINGUAS
-+DATADIRNAME
-+GCONF_SCHEMA_CONFIG_SOURCE
-+GCONF_SCHEMA_FILE_DIR
-+GCONF_SCHEMAS_INSTALL_TRUE
-+GCONF_SCHEMAS_INSTALL_FALSE
-+GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY
-+GNUCASH_MAJOR_VERSION
-+GNUCASH_MINOR_VERSION
-+GNUCASH_MICRO_VERSION
-+GETTEXT_PACKAGE
- CPP
--am__fastdepCC_FALSE
--am__fastdepCC_TRUE
--CCDEPMODE
--AMDEPBACKSLASH
--AMDEP_FALSE
--AMDEP_TRUE
--am__quote
--am__include
--DEPDIR
--OBJEXT
--EXEEXT
--ac_ct_CC
--CPPFLAGS
--LDFLAGS
--CFLAGS
--CC
--am__untar
--am__tar
--AMTAR
--am__leading_dot
--SET_MAKE
--AWK
--mkdir_p
--MKDIR_P
--INSTALL_STRIP_PROGRAM
--STRIP
--install_sh
--MAKEINFO
--AUTOHEADER
--AUTOMAKE
--AUTOCONF
--ACLOCAL
--VERSION
--PACKAGE
--CYGPATH_W
--am__isrc
--INSTALL_DATA
--INSTALL_SCRIPT
--INSTALL_PROGRAM
--target_alias
--host_alias
--build_alias
--LIBS
--ECHO_T
--ECHO_N
--ECHO_C
--DEFS
--mandir
--localedir
--libdir
--psdir
--pdfdir
--dvidir
--htmldir
--infodir
--docdir
--oldincludedir
--includedir
--localstatedir
--sharedstatedir
--sysconfdir
--datadir
--datarootdir
--libexecdir
--sbindir
--bindir
--program_transform_name
--prefix
--exec_prefix
--PACKAGE_BUGREPORT
--PACKAGE_STRING
--PACKAGE_VERSION
--PACKAGE_TARNAME
--PACKAGE_NAME
--PATH_SEPARATOR
--SHELL'
--ac_subst_files=''
--ac_user_opts='
--enable_option_checking
--enable_dependency_tracking
--with_gconf_source
--with_gconf_schema_file_dir
--enable_schemas_install
--enable_static
--enable_shared
--enable_fast_install
--with_gnu_ld
--enable_libtool_lock
--with_pic
--with_tags
--enable_binreloc
--enable_binreloc_threads
--enable_glibtest
--enable_qof
--with_qof
--with_qt3_wizard_package
--enable_debug
--enable_profile
--enable_ref_counts_dumps
--enable_sql
--enable_ofx
--with_ofx_prefix
--enable_mt940
--enable_aqbanking
--enable_hbci
--enable_locale_specific_tax
--with_help_prefix
--enable_etags
--enable_ctags
--with_perl
--with_perl_includes
--enable_doxygen
-+GREP
-+EGREP
-+MSGFMT_OPTS
-+CATALOGS
-+CATOBJEXT
-+GMOFILES
-+INSTOBJEXT
-+INTLLIBS
-+PO_IN_DATADIR_TRUE
-+PO_IN_DATADIR_FALSE
-+POFILES
-+POSUB
-+MKINSTALLDIRS
-+build
-+build_cpu
-+build_vendor
-+build_os
-+host
-+host_cpu
-+host_vendor
-+host_os
-+SED
-+LN_S
-+ECHO
-+AR
-+RANLIB
-+DSYMUTIL
-+NMEDIT
-+DLLTOOL
-+AS
-+OBJDUMP
-+CXX
-+CXXFLAGS
-+ac_ct_CXX
-+CXXDEPMODE
-+am__fastdepCXX_TRUE
-+am__fastdepCXX_FALSE
-+CXXCPP
-+F77
-+FFLAGS
-+ac_ct_F77
-+LIBTOOL
-+LIBTOOL_DEPS
-+OS_WIN32_TRUE
-+OS_WIN32_FALSE
-+PLATFORM_WIN32_TRUE
-+PLATFORM_WIN32_FALSE
-+REGEX_LIBS
-+HTMLHELP_LIBS
-+SWIG
-+BUILDING_FROM_SVN_TRUE
-+BUILDING_FROM_SVN_FALSE
-+GNUCASH_SEPARATE_BUILDDIR_TRUE
-+GNUCASH_SEPARATE_BUILDDIR_FALSE
-+HAVE_X11_XLIB_H_TRUE
-+HAVE_X11_XLIB_H_FALSE
-+BINRELOC_CFLAGS
-+BINRELOC_LIBS
-+PKG_CONFIG
-+GLIB_CFLAGS
-+GLIB_LIBS
-+GLIB_GENMARSHAL
-+GOBJECT_QUERY
-+GLIB_MKENUMS
-+GLIB26_LIBS
-+HAVE_GLIB_2_8_TRUE
-+HAVE_GLIB_2_8_FALSE
-+DL_LIB
-+GDK_TARGET_QUARTZ_TRUE
-+GDK_TARGET_QUARTZ_FALSE
-+IGE_MAC_CFLAGS
-+IGE_MAC_LIBS
-+QTTHREADS_LIB
-+TERMCAP_LIB
-+READLINE_LIB
-+BUILD_GUILE
-+GUILE_LIBS
-+GUILE_INCS
-+GUILE_TRUE
-+GUILE_FALSE
-+GUILE
-+GNC_ADD_ON_SRFIS
-+GNC_SRFI_LOAD_PATH
-+GNC_TEST_SRFI_LOAD_CMD
-+GUILE_CONFIG
-+GUILE_TOOLS
-+GNC_HAVE_GUILE_WWW_TRUE
-+GNC_HAVE_GUILE_WWW_FALSE
-+GCONF_CFLAGS
-+GCONF_LIBS
-+GCONFTOOL
-+LIBXML2_CFLAGS
-+LIBXML2_LIBS
-+LIBXML_VERSION
-+ZLIB_LIBS
-+LIBQOF_LIBRARY_VERSION
-+LIBQOF_BACKEND_QSF_LIBRARY_VERSION
-+USE_LIBQOF_TRUE
-+USE_LIBQOF_FALSE
-+USE_LIBQOF
-+QOF_CFLAGS
-+QOF_LIBS
-+QOF_PREFIX
-+QOF_LIB_DIR
-+QOF_XML_DIR
-+GNC_ACCOUNTS_DIR
-+GNC_CHECKS_DIR
-+GNC_CONFIGDIR
-+GNC_DOC_INSTALL_DIR
-+GNC_GLADE_DIR
-+GNC_UI_DIR
-+GNC_INCLUDE_DIR
-+GNC_PIXMAP_DIR
-+GNC_SCM_INSTALL_DIR
-+GNC_SHAREDIR
-+GNC_LIBEXECDIR
-+PGSQL_CFLAGS
-+PGSQL_LIBS
-+SQL_DIR
-+LIBOFX_CFLAGS
-+LIBOFX_LIBS
-+OFX_DIR
-+AQBANKING_CFLAGS
-+AQBANKING_LIBS
-+AQBANKING_DIR
-+GNC_HELPDIR
-+GNC_ETAGS_FILE
-+GNC_ETAGS_FILE_TRUE
-+GNC_ETAGS_FILE_FALSE
-+GNC_CTAGS_FILE
-+GNC_CTAGS_FILE_TRUE
-+GNC_CTAGS_FILE_FALSE
-+PERL
-+PERLINCL
-+DOXYGEN
-+DOT
-+DOC_TRUE
-+DOC_FALSE
-+ENABLE_DOXYGEN_TRUE
-+ENABLE_DOXYGEN_FALSE
- enable_dot
- enable_html_docs
- enable_latex_docs
--enable_gui
--enable_compile_warnings
--enable_iso_c
--enable_efence
--enable_deprecated_glib
--enable_deprecated_gdk
--enable_deprecated_gtk
--enable_deprecated_gnome
--enable_error_on_warning
--'
-+GNUCASH_ENABLE_GUI_TRUE
-+GNUCASH_ENABLE_GUI_FALSE
-+WARN_CFLAGS
-+GTK_CFLAGS
-+GTK_LIBS
-+HAVE_GTK_2_10_TRUE
-+HAVE_GTK_2_10_FALSE
-+GNOME_CFLAGS
-+GNOME_LIBS
-+GDK_PIXBUF_CFLAGS
-+GDK_PIXBUF_LIBS
-+GLADE_CFLAGS
-+GLADE_LIBS
-+GOFFICE_CFLAGS
-+GOFFICE_LIBS
-+GTKHTML_CFLAGS
-+GTKHTML_LIBS
-+GTKHTML_USES_GTKPRINT_TRUE
-+GTKHTML_USES_GTKPRINT_FALSE
-+GNOME_PRINT_CFLAGS
-+GNOME_PRINT_LIBS
-+EFENCE_LIBS
-+LIBOBJS
-+LC_MESSAGES_ENUM
-+LIBOBJS_SEDSCRIPT
-+LTLIBOBJS'
-+ac_subst_files=''
- ac_precious_vars='build_alias
- host_alias
- target_alias
-@@ -1136,14 +1069,34 @@ CCC
- CXXCPP
- F77
- FFLAGS
--PKG_CONFIG'
-+PKG_CONFIG
-+IGE_MAC_CFLAGS
-+IGE_MAC_LIBS
-+GCONF_CFLAGS
-+GCONF_LIBS
-+LIBXML2_CFLAGS
-+LIBXML2_LIBS
-+AQBANKING_CFLAGS
-+AQBANKING_LIBS
-+GTK_CFLAGS
-+GTK_LIBS
-+GNOME_CFLAGS
-+GNOME_LIBS
-+GDK_PIXBUF_CFLAGS
-+GDK_PIXBUF_LIBS
-+GLADE_CFLAGS
-+GLADE_LIBS
-+GOFFICE_CFLAGS
-+GOFFICE_LIBS
-+GTKHTML_CFLAGS
-+GTKHTML_LIBS
-+GNOME_PRINT_CFLAGS
-+GNOME_PRINT_LIBS'
-
-
- # Initialize some variables set by options.
- ac_init_help=
- ac_init_version=false
--ac_unrecognized_opts=
--ac_unrecognized_sep=
- # The variables have the same names as the options, with
- # dashes changed to underlines.
- cache_file=/dev/null
-@@ -1242,21 +1195,13 @@ do
- datarootdir=$ac_optarg ;;
-
- -disable-* | --disable-*)
-- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
-- ac_useropt_orig=$ac_useropt
-- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-- case $ac_user_opts in
-- *"
--"enable_$ac_useropt"
--"*) ;;
-- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-- ac_unrecognized_sep=', ';;
-- esac
-- eval enable_$ac_useropt=no ;;
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=no ;;
-
- -docdir | --docdir | --docdi | --doc | --do)
- ac_prev=docdir ;;
-@@ -1269,21 +1214,13 @@ do
- dvidir=$ac_optarg ;;
-
- -enable-* | --enable-*)
-- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
-- ac_useropt_orig=$ac_useropt
-- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-- case $ac_user_opts in
-- *"
--"enable_$ac_useropt"
--"*) ;;
-- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-- ac_unrecognized_sep=', ';;
-- esac
-- eval enable_$ac_useropt=\$ac_optarg ;;
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=\$ac_optarg ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -1474,38 +1411,22 @@ do
- ac_init_version=: ;;
-
- -with-* | --with-*)
-- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
-- ac_useropt_orig=$ac_useropt
-- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-- case $ac_user_opts in
-- *"
--"with_$ac_useropt"
--"*) ;;
-- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-- ac_unrecognized_sep=', ';;
-- esac
-- eval with_$ac_useropt=\$ac_optarg ;;
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=\$ac_optarg ;;
-
- -without-* | --without-*)
-- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
-- ac_useropt_orig=$ac_useropt
-- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-- case $ac_user_opts in
-- *"
--"with_$ac_useropt"
--"*) ;;
-- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-- ac_unrecognized_sep=', ';;
-- esac
-- eval with_$ac_useropt=no ;;
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=no ;;
-
- --x)
- # Obsolete; use --with-x.
-@@ -1525,7 +1446,7 @@ do
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries=$ac_optarg ;;
-
-- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-+ -*) { echo "$as_me: error: unrecognized option: $ac_option
- Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
- ;;
-@@ -1534,16 +1455,16 @@ Try \`$0 --help' for more information." >&2
- ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
- # Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
- eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-
- *)
- # FIXME: should be removed in autoconf 3.0.
-- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
- ;;
-
-@@ -1552,38 +1473,22 @@ done
-
- if test -n "$ac_prev"; then
- ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-+ { echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
- fi
-
--if test -n "$ac_unrecognized_opts"; then
-- case $enable_option_checking in
-- no) ;;
-- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-- { (exit 1); exit 1; }; } ;;
-- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-- esac
--fi
--
--# Check all directory arguments for consistency.
-+# Be sure to have absolute directory names.
- for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
- datadir sysconfdir sharedstatedir localstatedir includedir \
- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
- do
- eval ac_val=\$$ac_var
-- # Remove trailing slashes.
-- case $ac_val in
-- */ )
-- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-- eval $ac_var=\$ac_val;;
-- esac
-- # Be sure to have absolute directory names.
- case $ac_val in
- [\\/$]* | ?:[\\/]* ) continue;;
- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
-- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
- done
-
-@@ -1598,7 +1503,7 @@ target=$target_alias
- if test "x$host_alias" != x; then
- if test "x$build_alias" = x; then
- cross_compiling=maybe
-- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
- elif test "x$build_alias" != "x$host_alias"; then
- cross_compiling=yes
-@@ -1614,10 +1519,10 @@ test "$silent" = yes && exec 6>/dev/null
- ac_pwd=`pwd` && test -n "$ac_pwd" &&
- ac_ls_di=`ls -di .` &&
- ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-- { $as_echo "$as_me: error: working directory cannot be determined" >&2
-+ { echo "$as_me: error: Working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
- test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-+ { echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
-
-
-@@ -1625,12 +1530,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
- # Try the directory containing this script, then the parent directory.
-- ac_confdir=`$as_dirname -- "$as_myself" ||
--$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$as_myself" : 'X\(//\)[^/]' \| \
-- X"$as_myself" : 'X\(//\)$' \| \
-- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$as_myself" |
-+ ac_confdir=`$as_dirname -- "$0" ||
-+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$0" : 'X\(//\)[^/]' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$0" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -1657,12 +1562,12 @@ else
- fi
- if test ! -r "$srcdir/$ac_unique_file"; then
- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
- fi
- ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
- ac_abs_confdir=`(
-- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
- pwd)`
- # When building in place, set srcdir=.
-@@ -1711,9 +1616,9 @@ Configuration:
-
- Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
-- [$ac_default_prefix]
-+ [$ac_default_prefix]
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
-- [PREFIX]
-+ [PREFIX]
-
- By default, \`make install' will install all the files in
- \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-@@ -1723,25 +1628,25 @@ for instance \`--prefix=\$HOME'.
- For better control, use the options below.
-
- Fine tuning of the installation directories:
-- --bindir=DIR user executables [EPREFIX/bin]
-- --sbindir=DIR system admin executables [EPREFIX/sbin]
-- --libexecdir=DIR program executables [EPREFIX/libexec]
-- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
-- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
-- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
-- --libdir=DIR object code libraries [EPREFIX/lib]
-- --includedir=DIR C header files [PREFIX/include]
-- --oldincludedir=DIR C header files for non-gcc [/usr/include]
-- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
-- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
-- --infodir=DIR info documentation [DATAROOTDIR/info]
-- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
-- --mandir=DIR man documentation [DATAROOTDIR/man]
-- --docdir=DIR documentation root [DATAROOTDIR/doc/gnucash]
-- --htmldir=DIR html documentation [DOCDIR]
-- --dvidir=DIR dvi documentation [DOCDIR]
-- --pdfdir=DIR pdf documentation [DOCDIR]
-- --psdir=DIR ps documentation [DOCDIR]
-+ --bindir=DIR user executables [EPREFIX/bin]
-+ --sbindir=DIR system admin executables [EPREFIX/sbin]
-+ --libexecdir=DIR program executables [EPREFIX/libexec]
-+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
-+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
-+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
-+ --libdir=DIR object code libraries [EPREFIX/lib]
-+ --includedir=DIR C header files [PREFIX/include]
-+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
-+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
-+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
-+ --infodir=DIR info documentation [DATAROOTDIR/info]
-+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
-+ --mandir=DIR man documentation [DATAROOTDIR/man]
-+ --docdir=DIR documentation root [DATAROOTDIR/doc/gnucash]
-+ --htmldir=DIR html documentation [DOCDIR]
-+ --dvidir=DIR dvi documentation [DOCDIR]
-+ --pdfdir=DIR pdf documentation [DOCDIR]
-+ --psdir=DIR ps documentation [DOCDIR]
- _ACEOF
-
- cat <<\_ACEOF
-@@ -1764,11 +1669,11 @@ if test -n "$ac_init_help"; then
- cat <<\_ACEOF
-
- Optional Features:
-- --disable-option-checking ignore unrecognized --enable/--with options
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
-+ --disable-nls do not use Native Language Support
- --disable-schemas-install Disable the schemas installation
- --enable-static[=PKGS] build static libraries [default=no]
- --enable-shared[=PKGS] build shared libraries [default=yes]
-@@ -1797,7 +1702,8 @@ Optional Features:
- --enable-html-docs enable HTML generation with doxygen (yes)
- --enable-latex-docs enable LaTeX documentation generation with doxygen (no)
- --disable-gui build without the GNOME GUI components of Gnucash
-- --enable-compile-warnings=no/minimum/yes Turn on compiler warnings.
-+ --enable-compile-warnings=[no/minimum/yes/maximum/error]
-+ Turn on compiler warnings
- --enable-iso-c Try to warn if code is not ISO C
- --enable-efence link using efence
- --disable-deprecated-glib don't use deprecated glib functions
-@@ -1809,8 +1715,10 @@ Optional Features:
- Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
-- --with-gconf-source=sourceaddress Config database for installing schema files.
-- --with-gconf-schema-file-dir=dir Directory for installing schema files.
-+ --with-gconf-source=sourceaddress
-+ Config database for installing schema files.
-+ --with-gconf-schema-file-dir=dir
-+ Directory for installing schema files.
- --with-gnu-ld assume the C compiler uses GNU ld [default=no]
- --with-pic try to use only PIC/non-PIC objects [default=use
- both]
-@@ -1837,6 +1745,45 @@ Some influential environment variables:
- F77 Fortran 77 compiler command
- FFLAGS Fortran 77 compiler flags
- PKG_CONFIG path to pkg-config utility
-+ IGE_MAC_CFLAGS
-+ C compiler flags for IGE_MAC, overriding pkg-config
-+ IGE_MAC_LIBS
-+ linker flags for IGE_MAC, overriding pkg-config
-+ GCONF_CFLAGS
-+ C compiler flags for GCONF, overriding pkg-config
-+ GCONF_LIBS linker flags for GCONF, overriding pkg-config
-+ LIBXML2_CFLAGS
-+ C compiler flags for LIBXML2, overriding pkg-config
-+ LIBXML2_LIBS
-+ linker flags for LIBXML2, overriding pkg-config
-+ AQBANKING_CFLAGS
-+ C compiler flags for AQBANKING, overriding pkg-config
-+ AQBANKING_LIBS
-+ linker flags for AQBANKING, overriding pkg-config
-+ GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
-+ GTK_LIBS linker flags for GTK, overriding pkg-config
-+ GNOME_CFLAGS
-+ C compiler flags for GNOME, overriding pkg-config
-+ GNOME_LIBS linker flags for GNOME, overriding pkg-config
-+ GDK_PIXBUF_CFLAGS
-+ C compiler flags for GDK_PIXBUF, overriding pkg-config
-+ GDK_PIXBUF_LIBS
-+ linker flags for GDK_PIXBUF, overriding pkg-config
-+ GLADE_CFLAGS
-+ C compiler flags for GLADE, overriding pkg-config
-+ GLADE_LIBS linker flags for GLADE, overriding pkg-config
-+ GOFFICE_CFLAGS
-+ C compiler flags for GOFFICE, overriding pkg-config
-+ GOFFICE_LIBS
-+ linker flags for GOFFICE, overriding pkg-config
-+ GTKHTML_CFLAGS
-+ C compiler flags for GTKHTML, overriding pkg-config
-+ GTKHTML_LIBS
-+ linker flags for GTKHTML, overriding pkg-config
-+ GNOME_PRINT_CFLAGS
-+ C compiler flags for GNOME_PRINT, overriding pkg-config
-+ GNOME_PRINT_LIBS
-+ linker flags for GNOME_PRINT, overriding pkg-config
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -1849,17 +1796,15 @@ fi
- if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-- test -d "$ac_dir" ||
-- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-- continue
-+ test -d "$ac_dir" || continue
- ac_builddir=.
-
- case "$ac_dir" in
- .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *)
-- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A ".." for each directory in $ac_dir_suffix.
-- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -1895,7 +1840,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- echo &&
- $SHELL "$ac_srcdir/configure" --help=recursive
- else
-- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi || ac_status=$?
- cd "$ac_pwd" || { ac_status=$?; break; }
- done
-@@ -1905,10 +1850,10 @@ test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
- cat <<\_ACEOF
- gnucash configure 2.2.9
--generated by GNU Autoconf 2.63
-+generated by GNU Autoconf 2.61
-
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1919,7 +1864,7 @@ This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by gnucash $as_me 2.2.9, which was
--generated by GNU Autoconf 2.63. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- $ $0 $@
-
-@@ -1955,7 +1900,7 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- $as_echo "PATH: $as_dir"
-+ echo "PATH: $as_dir"
- done
- IFS=$as_save_IFS
-
-@@ -1990,7 +1935,7 @@ do
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
- *\'*)
-- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-@@ -2042,12 +1987,11 @@ _ASBOX
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
-- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
--$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
-- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) $as_unset $ac_var ;;
- esac ;;
- esac
-@@ -2077,9 +2021,9 @@ _ASBOX
- do
- eval ac_val=\$$ac_var
- case $ac_val in
-- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
-- $as_echo "$ac_var='\''$ac_val'\''"
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
-@@ -2094,9 +2038,9 @@ _ASBOX
- do
- eval ac_val=\$$ac_var
- case $ac_val in
-- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
-- $as_echo "$ac_var='\''$ac_val'\''"
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-@@ -2112,8 +2056,8 @@ _ASBOX
- echo
- fi
- test "$ac_signal" != 0 &&
-- $as_echo "$as_me: caught signal $ac_signal"
-- $as_echo "$as_me: exit $exit_status"
-+ echo "$as_me: caught signal $ac_signal"
-+ echo "$as_me: exit $exit_status"
- } >&5
- rm -f core *.core core.conftest.* &&
- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-@@ -2155,24 +2099,21 @@ _ACEOF
-
-
- # Let the site file select an alternate cache file if it wants to.
--# Prefer an explicitly selected file to automatically selected ones.
--ac_site_file1=NONE
--ac_site_file2=NONE
-+# Prefer explicitly selected file to automatically selected ones.
- if test -n "$CONFIG_SITE"; then
-- ac_site_file1=$CONFIG_SITE
-+ set x "$CONFIG_SITE"
- elif test "x$prefix" != xNONE; then
-- ac_site_file1=$prefix/share/config.site
-- ac_site_file2=$prefix/etc/config.site
-+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
- else
-- ac_site_file1=$ac_default_prefix/share/config.site
-- ac_site_file2=$ac_default_prefix/etc/config.site
-+ set x "$ac_default_prefix/share/config.site" \
-+ "$ac_default_prefix/etc/config.site"
- fi
--for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-+shift
-+for ac_site_file
- do
-- test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
-- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
--$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-+echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
- fi
-@@ -2182,16 +2123,16 @@ if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
-- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
--$as_echo "$as_me: loading cache $cache_file" >&6;}
-+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-+echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
- [\\/]* | ?:[\\/]* ) . "$cache_file";;
- *) . "./$cache_file";;
- esac
- fi
- else
-- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
--$as_echo "$as_me: creating cache $cache_file" >&6;}
-+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+echo "$as_me: creating cache $cache_file" >&6;}
- >$cache_file
- fi
-
-@@ -2205,38 +2146,29 @@ for ac_var in $ac_precious_vars; do
- eval ac_new_val=\$ac_env_${ac_var}_value
- case $ac_old_set,$ac_new_set in
- set,)
-- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
--$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,set)
-- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
--$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,);;
- *)
- if test "x$ac_old_val" != "x$ac_new_val"; then
-- # differences in whitespace do not lead to failure.
-- ac_old_val_w=`echo x $ac_old_val`
-- ac_new_val_w=`echo x $ac_new_val`
-- if test "$ac_old_val_w" != "$ac_new_val_w"; then
-- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
--$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-- ac_cache_corrupted=:
-- else
-- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
--$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-- eval $ac_var=\$ac_old_val
-- fi
-- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
--$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
-- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
--$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
-+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-+echo "$as_me: former value: $ac_old_val" >&2;}
-+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-+echo "$as_me: current value: $ac_new_val" >&2;}
-+ ac_cache_corrupted=:
- fi;;
- esac
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
-- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
-@@ -2246,12 +2178,10 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
- fi
- done
- if $ac_cache_corrupted; then
-- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
--$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
--$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -2310,8 +2240,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- fi
- done
- if test -z "$ac_aux_dir"; then
-- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
--$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -2337,12 +2267,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--# Reject install programs that cannot install multiple files.
--{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--$as_echo_n "checking for a BSD-compatible install... " >&6; }
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
-@@ -2371,29 +2300,17 @@ case $as_dir/ in
- # program-specific install script used by HP pwplus--don't use.
- :
- else
-- rm -rf conftest.one conftest.two conftest.dir
-- echo one > conftest.one
-- echo two > conftest.two
-- mkdir conftest.dir
-- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-- test -s conftest.one && test -s conftest.two &&
-- test -s conftest.dir/conftest.one &&
-- test -s conftest.dir/conftest.two
-- then
-- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-- break 3
-- fi
-+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+ break 3
- fi
- fi
- done
- done
- ;;
- esac
--
- done
- IFS=$as_save_IFS
-
--rm -rf conftest.one conftest.two conftest.dir
-
- fi
- if test "${ac_cv_path_install+set}" = set; then
-@@ -2406,8 +2323,8 @@ fi
- INSTALL=$ac_install_sh
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
--$as_echo "$INSTALL" >&6; }
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -2417,8 +2334,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
--{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
--$as_echo_n "checking whether build environment is sane... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
- # Just in case
- sleep 1
- echo timestamp > conftest.file
-@@ -2441,9 +2358,9 @@ if (
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
-- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
- alias in your environment" >&5
--$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
- alias in your environment" >&2;}
- { (exit 1); exit 1; }; }
- fi
-@@ -2454,23 +2371,26 @@ then
- # Ok.
- :
- else
-- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-+ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
- Check your system clock" >&5
--$as_echo "$as_me: error: newly created file is older than distributed files!
-+echo "$as_me: error: newly created file is older than distributed files!
- Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
- fi
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- test "$program_prefix" != NONE &&
- program_transform_name="s&^&$program_prefix&;$program_transform_name"
- # Use a double $ so make ignores it.
- test "$program_suffix" != NONE &&
- program_transform_name="s&\$&$program_suffix&;$program_transform_name"
--# Double any \ or $.
-+# Double any \ or $. echo might interpret backslashes.
- # By default was `s,x,x', remove it if useless.
--ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
--program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-+cat <<\_ACEOF >conftest.sed
-+s/[\\$]/&&/g;s/;s,x,x,$//
-+_ACEOF
-+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-+rm -f conftest.sed
-
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2481,15 +2401,15 @@ if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
- else
- am_missing_run=
-- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
--$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
-
--{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
--$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
- if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-@@ -2524,8 +2444,8 @@ fi
- MKDIR_P="$ac_install_sh -d"
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
--$as_echo "$MKDIR_P" >&6; }
-+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-+echo "${ECHO_T}$MKDIR_P" >&6; }
-
- mkdir_p="$MKDIR_P"
- case $mkdir_p in
-@@ -2537,10 +2457,10 @@ for ac_prog in gawk mawk nawk awk
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AWK+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$AWK"; then
- ac_cv_prog_AWK="$AWK" # Let the user override the test.
-@@ -2553,7 +2473,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AWK="$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2564,23 +2484,22 @@ fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
-- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
--$as_echo "$AWK" >&6; }
-+ { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
- test -n "$AWK" && break
- done
-
--{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
--$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
--set x ${MAKE-make}
--ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
- if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.make <<\_ACEOF
- SHELL = /bin/sh
-@@ -2597,12 +2516,12 @@ esac
- rm -f conftest.make
- fi
- if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- SET_MAKE=
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-
-@@ -2621,8 +2540,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
- am__isrc=' -I$(srcdir)'
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
-- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
--$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-@@ -2677,10 +2596,10 @@ if test "$cross_compiling" != no; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -2693,7 +2612,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2704,11 +2623,11 @@ fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
-- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
--$as_echo "$STRIP" >&6; }
-+ { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -2717,10 +2636,10 @@ if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-@@ -2733,7 +2652,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2744,11 +2663,11 @@ fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--$as_echo "$ac_ct_STRIP" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_STRIP" = x; then
-@@ -2756,8 +2675,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- STRIP=$ac_ct_STRIP
-@@ -2810,10 +2733,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2826,7 +2749,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2837,11 +2760,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
--$as_echo "$CC" >&6; }
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -2850,10 +2773,10 @@ if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -2866,7 +2789,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2877,11 +2800,11 @@ fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--$as_echo "$ac_ct_CC" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_CC" = x; then
-@@ -2889,8 +2812,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- CC=$ac_ct_CC
-@@ -2903,10 +2830,10 @@ if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2919,7 +2846,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2930,11 +2857,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
--$as_echo "$CC" >&6; }
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -2943,10 +2870,10 @@ fi
- if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2964,7 +2891,7 @@ do
- continue
- fi
- ac_cv_prog_CC="cc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2987,11 +2914,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
--$as_echo "$CC" >&6; }
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -3002,10 +2929,10 @@ if test -z "$CC"; then
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3018,7 +2945,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -3029,11 +2956,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
--$as_echo "$CC" >&6; }
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -3046,10 +2973,10 @@ if test -z "$CC"; then
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -3062,7 +2989,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -3073,11 +3000,11 @@ fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--$as_echo "$ac_ct_CC" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -3089,8 +3016,12 @@ done
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- CC=$ac_ct_CC
-@@ -3100,50 +3031,44 @@ fi
- fi
-
-
--test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-+echo "$as_me: error: no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+ { (exit 1); exit 1; }; }
-
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
--set X $ac_compile
--ac_compiler=$2
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- { (ac_try="$ac_compiler -V >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-
- cat >conftest.$ac_ext <<_ACEOF
-@@ -3162,22 +3087,27 @@ main ()
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-+ac_clean_files="$ac_clean_files a.out a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--$as_echo_n "checking for C compiler default output file name... " >&6; }
--ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--
--# The possible output files:
--ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
--
-+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-+#
-+# List of possible output files, starting from the most likely.
-+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-+# only as a last resort. b.out is created by i960 compilers.
-+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-+#
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions. Remove them first so a
-+# subsequent execution test works.
- ac_rmfiles=
- for ac_file in $ac_files
- do
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
- esac
- done
-@@ -3188,11 +3118,10 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link_default") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
- # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-@@ -3203,7 +3132,7 @@ for ac_file in $ac_files ''
- do
- test -f "$ac_file" || continue
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
- ;;
- [ab].out )
- # We found the default executable, but exeext='' is most
-@@ -3230,27 +3159,25 @@ else
- ac_file=''
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
- if test -z "$ac_file"; then
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: C compiler cannot create executables
-+echo "$as_me: error: C compiler cannot create executables
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }; }
-+ { (exit 77); exit 77; }; }
- fi
-
- ac_exeext=$ac_cv_exeext
-
- # Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-@@ -3259,53 +3186,49 @@ if test "$cross_compiling" != yes; then
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run C compiled programs.
-+echo "$as_me: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+ { (exit 1); exit 1; }; }
- fi
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-+rm -f a.out a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
- # Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--$as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
-+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
--$as_echo_n "checking for suffix of executables... " >&6; }
-+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
- if { (ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # If both `conftest.exe' and `conftest' are `present' (well, observable)
- # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-@@ -3314,33 +3237,31 @@ $as_echo "$ac_try_echo") >&5
- for ac_file in conftest.exe conftest conftest.*; do
- test -f "$ac_file" || continue
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- break;;
- * ) break;;
- esac
- done
- else
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+ { (exit 1); exit 1; }; }
- fi
-
- rm -f conftest$ac_cv_exeext
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--$as_echo "$ac_cv_exeext" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
--$as_echo_n "checking for suffix of object files... " >&6; }
-+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
- if test "${ac_cv_objext+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3363,43 +3284,40 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- for ac_file in conftest.o conftest.obj conftest.*; do
- test -f "$ac_file" || continue;
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
- break;;
- esac
- done
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-+echo "$as_me: error: cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+ { (exit 1); exit 1; }; }
- fi
-
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--$as_echo "$ac_cv_objext" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3425,21 +3343,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
-@@ -3449,19 +3366,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--$as_echo "$ac_cv_c_compiler_gnu" >&6; }
--if test $ac_compiler_gnu = yes; then
-- GCC=yes
--else
-- GCC=
--fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-+GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--$as_echo_n "checking whether $CC accepts -g... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
-@@ -3488,21 +3401,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- CFLAGS=""
-@@ -3527,21 +3439,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -3567,21 +3478,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-@@ -3596,8 +3506,8 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--$as_echo "$ac_cv_prog_cc_g" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-@@ -3613,10 +3523,10 @@ else
- CFLAGS=
- fi
- fi
--{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
--$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_c89+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
-@@ -3687,21 +3597,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_c89=$ac_arg
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-@@ -3717,15 +3626,15 @@ fi
- # AC_CACHE_VAL
- case "x$ac_cv_prog_cc_c89" in
- x)
-- { $as_echo "$as_me:$LINENO: result: none needed" >&5
--$as_echo "none needed" >&6; } ;;
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
- xno)
-- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
--$as_echo "unsupported" >&6; } ;;
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
-- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
--$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-
-
-@@ -3746,8 +3655,8 @@ am__doit:
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
--{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
--$as_echo_n "checking for style of include used by $am_make... " >&6; }
-+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
- am__include="#"
- am__quote=
- _am_result=none
-@@ -3774,8 +3683,8 @@ if test "$am__include" = "#"; then
- fi
-
-
--{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
--$as_echo "$_am_result" >&6; }
-+{ echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6; }
- rm -f confinc confmf
-
- # Check whether --enable-dependency-tracking was given.
-@@ -3799,10 +3708,10 @@ fi
-
- depcc="$CC" am_compiler_list=
-
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--$as_echo_n "checking dependency style of $depcc... " >&6; }
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
-@@ -3890,8 +3799,8 @@ else
- fi
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-@@ -3906,20 +3815,798 @@ fi
-
-
-
-+cat >>confdefs.h <<\_ACEOF
-+#define _GNU_SOURCE 1
-+_ACEOF
-+
-+
-+
-+ { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
-+ # Check whether --enable-nls was given.
-+if test "${enable_nls+set}" = set; then
-+ enableval=$enable_nls; USE_NLS=$enableval
-+else
-+ USE_NLS=yes
-+fi
-+
-+ { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-+echo "${ECHO_T}$USE_NLS" >&6; }
-+
-+
-+
-+
-+
-+case "$am__api_version" in
-+ 1.01234)
-+ { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
-+echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
-+ { (exit 1); exit 1; }; }
-+ ;;
-+ *)
-+ ;;
-+esac
-+
-+if test -n ""; then
-+ { echo "$as_me:$LINENO: checking for intltool >= " >&5
-+echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6; }
-+
-+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-+ INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-+
-+ { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-+echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
-+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-+ { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool or later." >&5
-+echo "$as_me: error: Your intltool is too old. You need intltool or later." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+# Extract the first word of "intltool-update", so it can be a program name with args.
-+set dummy intltool-update; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $INTLTOOL_UPDATE in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
-+if test -n "$INTLTOOL_UPDATE"; then
-+ { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
-+echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+# Extract the first word of "intltool-merge", so it can be a program name with args.
-+set dummy intltool-merge; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $INTLTOOL_MERGE in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
-+if test -n "$INTLTOOL_MERGE"; then
-+ { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
-+echo "${ECHO_T}$INTLTOOL_MERGE" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+# Extract the first word of "intltool-extract", so it can be a program name with args.
-+set dummy intltool-extract; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $INTLTOOL_EXTRACT in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
-+if test -n "$INTLTOOL_EXTRACT"; then
-+ { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
-+echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-+ { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
-+echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
-+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+# Check the gettext tools to make sure they are GNU
-+# Extract the first word of "xgettext", so it can be a program name with args.
-+set dummy xgettext; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $XGETTEXT in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+XGETTEXT=$ac_cv_path_XGETTEXT
-+if test -n "$XGETTEXT"; then
-+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+echo "${ECHO_T}$XGETTEXT" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+# Extract the first word of "msgmerge", so it can be a program name with args.
-+set dummy msgmerge; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_MSGMERGE+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $MSGMERGE in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+MSGMERGE=$ac_cv_path_MSGMERGE
-+if test -n "$MSGMERGE"; then
-+ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-+echo "${ECHO_T}$MSGMERGE" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+# Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_MSGFMT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $MSGFMT in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+MSGFMT=$ac_cv_path_MSGFMT
-+if test -n "$MSGFMT"; then
-+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+echo "${ECHO_T}$MSGFMT" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+# Extract the first word of "gmsgfmt", so it can be a program name with args.
-+set dummy gmsgfmt; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GMSGFMT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $GMSGFMT in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-+ ;;
-+esac
-+fi
-+GMSGFMT=$ac_cv_path_GMSGFMT
-+if test -n "$GMSGFMT"; then
-+ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+echo "${ECHO_T}$GMSGFMT" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-+ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-+ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+# Extract the first word of "perl", so it can be a program name with args.
-+set dummy perl; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $INTLTOOL_PERL in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
-+if test -n "$INTLTOOL_PERL"; then
-+ { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
-+echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+if test -z "$INTLTOOL_PERL"; then
-+ { { echo "$as_me:$LINENO: error: perl not found" >&5
-+echo "$as_me: error: perl not found" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+{ echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
-+echo $ECHO_N "checking for perl >= 5.8.1... $ECHO_C" >&6; }
-+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-+if test $? -ne 0; then
-+ { { echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
-+echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-+ { echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
-+echo "${ECHO_T}$IT_PERL_VERSION" >&6; }
-+fi
-+if test "x" != "xno-xml"; then
-+ { echo "$as_me:$LINENO: checking for XML::Parser" >&5
-+echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
-+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-+ { echo "$as_me:$LINENO: result: ok" >&5
-+echo "${ECHO_T}ok" >&6; }
-+ else
-+ { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
-+echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+fi
-+
-+# Substitute ALL_LINGUAS so we can use it in po/Makefile
-+
-+
-+# Set DATADIRNAME correctly if it is not set yet
-+# (copied from glib-gettext.m4)
-+if test -z "$DATADIRNAME"; then
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+extern int _nl_msg_cat_cntr;
-+ return _nl_msg_cat_cntr
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ DATADIRNAME=share
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ case $host in
-+ *-*-solaris*)
-+ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
-+if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char bind_textdomain_codeset (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef bind_textdomain_codeset
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char bind_textdomain_codeset ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return bind_textdomain_codeset ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_func_bind_textdomain_codeset=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_cv_func_bind_textdomain_codeset=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
-+if test $ac_cv_func_bind_textdomain_codeset = yes; then
-+ DATADIRNAME=share
-+else
-+ DATADIRNAME=lib
-+fi
-+
-+ ;;
-+ *)
-+ DATADIRNAME=lib
-+ ;;
-+ esac
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+
-+
-+
-+
-+
-+
-+
-+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+ else
-+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+ fi
-+
-+
-+# Check whether --with-gconf-source was given.
-+if test "${with_gconf_source+set}" = set; then
-+ withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
-+fi
-+
-+
-+
-+ { echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
-+echo "${ECHO_T}Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
-+
-+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+ fi
-+
-+
-+# Check whether --with-gconf-schema-file-dir was given.
-+if test "${with_gconf_schema_file_dir+set}" = set; then
-+ withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
-+fi
-+
-+
-+
-+ { echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
-+echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
-+
-+ # Check whether --enable-schemas-install was given.
-+if test "${enable_schemas_install+set}" = set; then
-+ enableval=$enable_schemas_install; case ${enableval} in
-+ yes|no) ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
-+echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+fi
-+
-+ if test "$enable_schemas_install" != no; then
-+ GCONF_SCHEMAS_INSTALL_TRUE=
-+ GCONF_SCHEMAS_INSTALL_FALSE='#'
-+else
-+ GCONF_SCHEMAS_INSTALL_TRUE='#'
-+ GCONF_SCHEMAS_INSTALL_FALSE=
-+fi
-+
-+
-+
-+# Override gconf default install locations. The default is to always
-+# put them into /etc. This change puts them into $(prefix)/etc.
-+if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+ GCONF_SCHEMA_CONFIG_SOURCE="xml::${sysconfdir}/gconf/gconf.xml.defaults"
-+fi
-+GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY=`echo $GCONF_SCHEMA_CONFIG_SOURCE | cut -d ':' -f 3`
-+
-+
-+
-+
-+
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define GNUCASH_MAJOR_VERSION $GNUCASH_MAJOR_VERSION
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define GNUCASH_MINOR_VERSION $GNUCASH_MINOR_VERSION
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define GNUCASH_MICRO_VERSION $GNUCASH_MICRO_VERSION
-+_ACEOF
-+
-+
-+ALL_LINGUAS="ca cs da de de_CH el en_GB es_NI es eu fi fr he hu it ja nb ne nl pl pt_BR pt ro ru rw sk sv ta tr uk vi zh_CN zh_TW"
-+
-+GETTEXT_PACKAGE=gnucash
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
-+_ACEOF
-+
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--$as_echo_n "checking how to run the C preprocessor... " >&6; }
-+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
- fi
- if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -3951,21 +4638,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-@@ -3989,14 +4675,13 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
-@@ -4004,7 +4689,7 @@ $as_echo "$ac_try_echo") >&5
- # Broken: success on invalid input.
- continue
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-@@ -4029,8 +4714,8 @@ fi
- else
- ac_cv_prog_CPP=$CPP
- fi
--{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
--$as_echo "$CPP" >&6; }
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-@@ -4058,21 +4743,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-@@ -4096,14 +4780,13 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
-@@ -4111,7 +4794,7 @@ $as_echo "$ac_try_echo") >&5
- # Broken: success on invalid input.
- continue
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-@@ -4127,13 +4810,11 @@ rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then
- :
- else
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+ { (exit 1); exit 1; }; }
- fi
-
- ac_ext=c
-@@ -4143,37 +4824,42 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
--$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
- if test "${ac_cv_path_GREP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test -z "$GREP"; then
- ac_path_GREP_found=false
-- # Loop through the user's path and test for each of PROGNAME-LIST
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
--# Check for GNU ac_path_GREP and select it if it is found.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-+ # Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
- case `"$ac_path_GREP" --version 2>&1` in
- *GNU*)
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
- *)
- ac_count=0
-- $as_echo_n 0123456789 >"conftest.in"
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
-- $as_echo 'GREP' >> "conftest.nl"
-+ echo 'GREP' >> "conftest.nl"
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
-@@ -4188,60 +4874,74 @@ case `"$ac_path_GREP" --version 2>&1` in
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
- esac
-
-- $ac_path_GREP_found && break 3
-- done
-+
-+ $ac_path_GREP_found && break 3
- done
- done
-+
-+done
- IFS=$as_save_IFS
-- if test -z "$ac_cv_path_GREP"; then
-- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
--$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+
-+
-+fi
-+
-+GREP="$ac_cv_path_GREP"
-+if test -z "$GREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-+fi
-+
- else
- ac_cv_path_GREP=$GREP
- fi
-
-+
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
--$as_echo "$ac_cv_path_GREP" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
--{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
--$as_echo_n "checking for egrep... " >&6; }
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
- if test "${ac_cv_path_EGREP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
-- if test -z "$EGREP"; then
-+ # Extract the first word of "egrep" to use in msg output
-+if test -z "$EGREP"; then
-+set dummy egrep; ac_prog_name=$2
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- ac_path_EGREP_found=false
-- # Loop through the user's path and test for each of PROGNAME-LIST
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
--# Check for GNU ac_path_EGREP and select it if it is found.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-+ # Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
- case `"$ac_path_EGREP" --version 2>&1` in
- *GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
- *)
- ac_count=0
-- $as_echo_n 0123456789 >"conftest.in"
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
-- $as_echo 'EGREP' >> "conftest.nl"
-+ echo 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
-@@ -4256,31 +4956,40 @@ case `"$ac_path_EGREP" --version 2>&1` in
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
- esac
-
-- $ac_path_EGREP_found && break 3
-- done
-+
-+ $ac_path_EGREP_found && break 3
- done
- done
-+
-+done
- IFS=$as_save_IFS
-- if test -z "$ac_cv_path_EGREP"; then
-- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
--$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+
-+
-+fi
-+
-+EGREP="$ac_cv_path_EGREP"
-+if test -z "$EGREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-+fi
-+
- else
- ac_cv_path_EGREP=$EGREP
- fi
-
-+
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
--$as_echo "$ac_cv_path_EGREP" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
--{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--$as_echo_n "checking for ANSI C header files... " >&6; }
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -4307,21 +5016,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_stdc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
-@@ -4413,40 +5121,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
- else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-
-
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--$as_echo "$ac_cv_header_stdc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -4468,11 +5173,11 @@ fi
- for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
- do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -4490,21 +5195,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-@@ -4512,802 +5216,37 @@ fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--
-- if test "${ac_cv_header_minix_config_h+set}" = set; then
-- { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
--$as_echo_n "checking for minix/config.h... " >&6; }
--if test "${ac_cv_header_minix_config_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
--$as_echo "$ac_cv_header_minix_config_h" >&6; }
--else
-- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
--$as_echo_n "checking minix/config.h usability... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--#include <minix/config.h>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_header_compiler=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_compiler=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
--$as_echo_n "checking minix/config.h presence... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <minix/config.h>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- }; then
-- ac_header_preproc=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_preproc=no
--fi
--
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
--
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
-- ( cat <<\_ASBOX
--## ---------------------------------------- ##
--## Report this to gnucash-devel at gnucash.org ##
--## ---------------------------------------- ##
--_ASBOX
-- ) | sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
--{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
--$as_echo_n "checking for minix/config.h... " >&6; }
--if test "${ac_cv_header_minix_config_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_cv_header_minix_config_h=$ac_header_preproc
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
--$as_echo "$ac_cv_header_minix_config_h" >&6; }
--
--fi
--if test "x$ac_cv_header_minix_config_h" = x""yes; then
-- MINIX=yes
--else
-- MINIX=
--fi
--
--
-- if test "$MINIX" = yes; then
--
--cat >>confdefs.h <<\_ACEOF
--#define _POSIX_SOURCE 1
--_ACEOF
--
--
--cat >>confdefs.h <<\_ACEOF
--#define _POSIX_1_SOURCE 2
--_ACEOF
--
--
--cat >>confdefs.h <<\_ACEOF
--#define _MINIX 1
--_ACEOF
--
-- fi
--
--
--
-- { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
--$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
--if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--# define __EXTENSIONS__ 1
-- $ac_includes_default
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_safe_to_define___extensions__=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_safe_to_define___extensions__=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
--$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-- test $ac_cv_safe_to_define___extensions__ = yes &&
-- cat >>confdefs.h <<\_ACEOF
--#define __EXTENSIONS__ 1
--_ACEOF
--
-- cat >>confdefs.h <<\_ACEOF
--#define _ALL_SOURCE 1
--_ACEOF
--
-- cat >>confdefs.h <<\_ACEOF
--#define _GNU_SOURCE 1
--_ACEOF
--
-- cat >>confdefs.h <<\_ACEOF
--#define _POSIX_PTHREAD_SEMANTICS 1
--_ACEOF
--
-- cat >>confdefs.h <<\_ACEOF
--#define _TANDEM_SOURCE 1
--_ACEOF
--
--
--
--case "$am__api_version" in
-- 1.01234)
-- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
--$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
-- { (exit 1); exit 1; }; }
-- ;;
-- *)
-- ;;
--esac
--
--if test -n ""; then
-- { $as_echo "$as_me:$LINENO: checking for intltool >= " >&5
--$as_echo_n "checking for intltool >= ... " >&6; }
--
-- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-- INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
--
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
--$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
-- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool or later." >&5
--$as_echo "$as_me: error: Your intltool is too old. You need intltool or later." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
-- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
--INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
--INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
-- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--# Check the gettext tools to make sure they are GNU
--# Extract the first word of "xgettext", so it can be a program name with args.
--set dummy xgettext; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_XGETTEXT+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $XGETTEXT in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--XGETTEXT=$ac_cv_path_XGETTEXT
--if test -n "$XGETTEXT"; then
-- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
--$as_echo "$XGETTEXT" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--# Extract the first word of "msgmerge", so it can be a program name with args.
--set dummy msgmerge; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGMERGE+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $MSGMERGE in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--MSGMERGE=$ac_cv_path_MSGMERGE
--if test -n "$MSGMERGE"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
--$as_echo "$MSGMERGE" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--# Extract the first word of "msgfmt", so it can be a program name with args.
--set dummy msgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGFMT+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $MSGFMT in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
-
-- ;;
--esac
- fi
--MSGFMT=$ac_cv_path_MSGFMT
--if test -n "$MSGFMT"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
--$as_echo "$MSGFMT" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
--mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
--mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
--if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--# Use the tools built into the package, not the ones that are installed.
--INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
--
--INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-
--INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
--
--
--# Extract the first word of "perl", so it can be a program name with args.
--set dummy perl; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $INTLTOOL_PERL in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
- done
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
--if test -n "$INTLTOOL_PERL"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
--$as_echo "$INTLTOOL_PERL" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--if test -z "$INTLTOOL_PERL"; then
-- { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
--$as_echo "$as_me: error: perl not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-- { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
--$as_echo "$as_me: error: perl 5.x required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test "x" != "xno-xml"; then
-- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
--$as_echo_n "checking for XML::Parser... " >&6; }
-- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-- { $as_echo "$as_me:$LINENO: result: ok" >&5
--$as_echo "ok" >&6; }
-- else
-- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
--$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
--fi
--
--# Substitute ALL_LINGUAS so we can use it in po/Makefile
--
--
--# Set DATADIRNAME correctly if it is not set yet
--# (copied from glib-gettext.m4)
--if test -z "$DATADIRNAME"; then
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--extern int _nl_msg_cat_cntr;
-- return _nl_msg_cat_cntr
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- DATADIRNAME=share
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- case $host in
-- *-*-solaris*)
-- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
--if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char bind_textdomain_codeset (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef bind_textdomain_codeset
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char bind_textdomain_codeset ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
--choke me
--#endif
--
--int
--main ()
--{
--return bind_textdomain_codeset ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_bind_textdomain_codeset=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_bind_textdomain_codeset=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
--$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
--if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-- DATADIRNAME=share
--else
-- DATADIRNAME=lib
--fi
--
-- ;;
-- *)
-- DATADIRNAME=lib
-- ;;
-- esac
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--
--
--
--
--
--ac_config_commands="$ac_config_commands intltool"
--
--
--
--
--
-- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-- else
-- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-- fi
--
--
--# Check whether --with-gconf-source was given.
--if test "${with_gconf_source+set}" = set; then
-- withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
--fi
--
--
--
-- { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
--$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
--
-- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-- fi
--
--
--# Check whether --with-gconf-schema-file-dir was given.
--if test "${with_gconf_schema_file_dir+set}" = set; then
-- withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
--fi
--
--
--
-- { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
--$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
--
-- # Check whether --enable-schemas-install was given.
--if test "${enable_schemas_install+set}" = set; then
-- enableval=$enable_schemas_install; case ${enableval} in
-- yes|no) ;;
-- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
--$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
-- { (exit 1); exit 1; }; } ;;
-- esac
--fi
--
-- if test "$enable_schemas_install" != no; then
-- GCONF_SCHEMAS_INSTALL_TRUE=
-- GCONF_SCHEMAS_INSTALL_FALSE='#'
--else
-- GCONF_SCHEMAS_INSTALL_TRUE='#'
-- GCONF_SCHEMAS_INSTALL_FALSE=
--fi
--
--
--
--# Override gconf default install locations. The default is to always
--# put them into /etc. This change puts them into $(prefix)/etc.
--if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-- GCONF_SCHEMA_CONFIG_SOURCE="xml::${sysconfdir}/gconf/gconf.xml.defaults"
--fi
--GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY=`echo $GCONF_SCHEMA_CONFIG_SOURCE | cut -d ':' -f 3`
--
--
--
--
--
--
--
--
--cat >>confdefs.h <<_ACEOF
--#define GNUCASH_MAJOR_VERSION $GNUCASH_MAJOR_VERSION
--_ACEOF
--
--
--cat >>confdefs.h <<_ACEOF
--#define GNUCASH_MINOR_VERSION $GNUCASH_MINOR_VERSION
--_ACEOF
--
--
--cat >>confdefs.h <<_ACEOF
--#define GNUCASH_MICRO_VERSION $GNUCASH_MICRO_VERSION
--_ACEOF
--
--
--ALL_LINGUAS="ca cs da de de_CH el en_GB es_NI es eu fi fr he hu it ja nb ne nl pl pt_BR pt ro ru rw sk sv ta tr uk vi zh_CN zh_TW"
--
--GETTEXT_PACKAGE=gnucash
--
--
--cat >>confdefs.h <<_ACEOF
--#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
--_ACEOF
-
-
-
-
- for ac_header in locale.h
- do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5323,33 +5262,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5363,52 +5301,51 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
-
- rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
- ## ---------------------------------------- ##
- ## Report this to gnucash-devel at gnucash.org ##
-@@ -5417,24 +5354,21 @@ _ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -5442,10 +5376,10 @@ fi
- done
-
- if test $ac_cv_header_locale_h = yes; then
-- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
--$as_echo_n "checking for LC_MESSAGES... " >&6; }
-+ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
- if test "${am_cv_val_LC_MESSAGES+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -5468,35 +5402,31 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- am_cv_val_LC_MESSAGES=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- am_cv_val_LC_MESSAGES=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
--$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
-+{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
- if test $am_cv_val_LC_MESSAGES = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -5515,17 +5445,17 @@ _ACEOF
- INTLLIBS=
-
- if test "${ac_cv_header_libintl_h+set}" = set; then
-- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
--$as_echo_n "checking for libintl.h... " >&6; }
-+ { echo "$as_me:$LINENO: checking for libintl.h" >&5
-+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_libintl_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
--$as_echo "$ac_cv_header_libintl_h" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
- else
- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
--$as_echo_n "checking libintl.h usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
-+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5541,33 +5471,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
--$as_echo_n "checking libintl.h presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
-+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5581,52 +5510,51 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
-
- rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
- ## ---------------------------------------- ##
- ## Report this to gnucash-devel at gnucash.org ##
-@@ -5635,28 +5563,28 @@ _ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
--$as_echo_n "checking for libintl.h... " >&6; }
-+{ echo "$as_me:$LINENO: checking for libintl.h" >&5
-+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_libintl_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_libintl_h=$ac_header_preproc
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
--$as_echo "$ac_cv_header_libintl_h" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
-
- fi
--if test "x$ac_cv_header_libintl_h" = x""yes; then
-+if test $ac_cv_header_libintl_h = yes; then
- gt_cv_func_dgettext_libintl="no"
- libintl_extra_libs=""
-
- #
- # First check in libc
- #
-- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
--$as_echo_n "checking for ngettext in libc... " >&6; }
-+ { echo "$as_me:$LINENO: checking for ngettext in libc" >&5
-+echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }
- if test "${gt_cv_func_ngettext_libc+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -5681,42 +5609,38 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- gt_cv_func_ngettext_libc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_func_ngettext_libc=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
--$as_echo "$gt_cv_func_ngettext_libc" >&6; }
-+{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
-+echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
--$as_echo_n "checking for dgettext in libc... " >&6; }
-+ { echo "$as_me:$LINENO: checking for dgettext in libc" >&5
-+echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
- if test "${gt_cv_func_dgettext_libc+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -5741,47 +5665,43 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- gt_cv_func_dgettext_libc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_func_dgettext_libc=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
--$as_echo "$gt_cv_func_dgettext_libc" >&6; }
-+{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
-+echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
- fi
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-
- for ac_func in bind_textdomain_codeset
- do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -5834,42 +5754,35 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -5884,10 +5797,10 @@ done
- || test "$gt_cv_func_ngettext_libc" != "yes" \
- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-
-- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
--$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-+ { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-+echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
-@@ -5919,41 +5832,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_intl_bindtextdomain=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_intl_bindtextdomain=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
--$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
--if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
--$as_echo_n "checking for ngettext in -lintl... " >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
-+if test $ac_cv_lib_intl_bindtextdomain = yes; then
-+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_intl_ngettext+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
-@@ -5985,41 +5894,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_intl_ngettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_intl_ngettext=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
--$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
--if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
--$as_echo_n "checking for dgettext in -lintl... " >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
-+if test $ac_cv_lib_intl_ngettext = yes; then
-+ { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
-+echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_intl_dgettext+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
-@@ -6051,37 +5956,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_intl_dgettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_intl_dgettext=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
--$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
--if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }
-+if test $ac_cv_lib_intl_dgettext = yes; then
- gt_cv_func_dgettext_libintl=yes
- fi
-
-@@ -6091,14 +5992,14 @@ fi
-
-
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
--$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
-- { $as_echo "$as_me:$LINENO: result: " >&5
--$as_echo "" >&6; }
-- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
--$as_echo_n "checking for ngettext in -lintl... " >&6; }
-+ { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
-+echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: result: " >&5
-+echo "${ECHO_T}" >&6; }
-+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_intl_ngettext+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
-@@ -6130,41 +6031,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_intl_ngettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_intl_ngettext=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
--$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
--if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
--$as_echo_n "checking for dcgettext in -lintl... " >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
-+if test $ac_cv_lib_intl_ngettext = yes; then
-+ { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
-+echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
-@@ -6196,37 +6093,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_intl_dcgettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_intl_dcgettext=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
--$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
--if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }
-+if test $ac_cv_lib_intl_dcgettext = yes; then
- gt_cv_func_dgettext_libintl=yes
- libintl_extra_libs=-liconv
- else
-@@ -6251,11 +6144,11 @@ fi
-
- for ac_func in bind_textdomain_codeset
- do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -6308,42 +6201,35 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -6379,10 +6265,10 @@ _ACEOF
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_MSGFMT+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case "$MSGFMT" in
- /*)
-@@ -6406,11 +6292,11 @@ esac
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test "$MSGFMT" != "no"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
--$as_echo "$MSGFMT" >&6; }
-+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+echo "${ECHO_T}$MSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- if test "$MSGFMT" != "no"; then
- glib_save_LIBS="$LIBS"
-@@ -6418,11 +6304,11 @@ fi
-
- for ac_func in dcgettext
- do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -6475,50 +6361,43 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- fi
- done
-
- MSGFMT_OPTS=
-- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
--$as_echo_n "checking if msgfmt accepts -c... " >&6; }
-+ { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
-+echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
- cat >conftest.foo <<_ACEOF
-
- msgid ""
-@@ -6532,25 +6411,25 @@ msgstr ""
- "Content-Transfer-Encoding: 8bit\n"
-
- _ACEOF
--if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
-+if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
- ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--else { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- echo "$as_me: failed input was:" >&5
- sed 's/^/| /' conftest.foo >&5
- fi
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GMSGFMT+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $GMSGFMT in
- [\\/]* | ?:[\\/]*)
-@@ -6565,7 +6444,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -6578,20 +6457,20 @@ esac
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
- if test -n "$GMSGFMT"; then
-- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
--$as_echo "$GMSGFMT" >&6; }
-+ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+echo "${ECHO_T}$GMSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
- # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_XGETTEXT+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case "$XGETTEXT" in
- /*)
-@@ -6615,11 +6494,11 @@ esac
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
- if test "$XGETTEXT" != ":"; then
-- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
--$as_echo "$XGETTEXT" >&6; }
-+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+echo "${ECHO_T}$XGETTEXT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6644,33 +6523,30 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- CATOBJEXT=.gmo
- DATADIRNAME=share
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- case $host in
- *-*-solaris*)
-- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
-+ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
- if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -6723,36 +6599,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_bind_textdomain_codeset=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_bind_textdomain_codeset=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
--$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
--if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
-+if test $ac_cv_func_bind_textdomain_codeset = yes; then
- CATOBJEXT=.gmo
- DATADIRNAME=share
- else
-@@ -6768,7 +6640,6 @@ fi
- esac
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$glib_save_LIBS"
-@@ -6794,8 +6665,8 @@ _ACEOF
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
-- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
--$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
-+ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
- XGETTEXT=":"
- fi
- fi
-@@ -6827,8 +6698,8 @@ $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
-- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
--$as_echo_n "checking for catalogs to be installed... " >&6; }
-+ { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
-+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
- NEW_LINGUAS=
- for presentlang in $ALL_LINGUAS; do
- useit=no
-@@ -6852,8 +6723,8 @@ $as_echo_n "checking for catalogs to be installed... " >&6; }
- fi
- done
- LINGUAS=$NEW_LINGUAS
-- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
--$as_echo "$LINGUAS" >&6; }
-+ { echo "$as_me:$LINENO: result: $LINGUAS" >&5
-+echo "${ECHO_T}$LINGUAS" >&6; }
- fi
-
- if test -n "$LINGUAS"; then
-@@ -6904,12 +6775,11 @@ $as_echo "$LINGUAS" >&6; }
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--# Reject install programs that cannot install multiple files.
--{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--$as_echo_n "checking for a BSD-compatible install... " >&6; }
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
-@@ -6938,29 +6808,17 @@ case $as_dir/ in
- # program-specific install script used by HP pwplus--don't use.
- :
- else
-- rm -rf conftest.one conftest.two conftest.dir
-- echo one > conftest.one
-- echo two > conftest.two
-- mkdir conftest.dir
-- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-- test -s conftest.one && test -s conftest.two &&
-- test -s conftest.dir/conftest.one &&
-- test -s conftest.dir/conftest.two
-- then
-- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-- break 3
-- fi
-+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+ break 3
- fi
- fi
- done
- done
- ;;
- esac
--
- done
- IFS=$as_save_IFS
-
--rm -rf conftest.one conftest.two conftest.dir
-
- fi
- if test "${ac_cv_path_install+set}" = set; then
-@@ -6973,8 +6831,8 @@ fi
- INSTALL=$ac_install_sh
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
--$as_echo "$INSTALL" >&6; }
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -7064,34 +6922,34 @@ fi
-
- # Make sure we can run config.sub.
- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
--$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
-
--{ $as_echo "$as_me:$LINENO: checking build system type" >&5
--$as_echo_n "checking build system type... " >&6; }
-+{ echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
- if test "${ac_cv_build+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_build_alias=$build_alias
- test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
- test "x$ac_build_alias" = x &&
-- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
--$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
- ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
--$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--$as_echo "$ac_cv_build" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
- case $ac_cv_build in
- *-*-*) ;;
--*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
--$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
- { (exit 1); exit 1; }; };;
- esac
- build=$ac_cv_build
-@@ -7108,27 +6966,27 @@ IFS=$ac_save_IFS
- case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
--{ $as_echo "$as_me:$LINENO: checking host system type" >&5
--$as_echo_n "checking host system type... " >&6; }
-+{ echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
- if test "${ac_cv_host+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
- else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
--$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--$as_echo "$ac_cv_host" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
- case $ac_cv_host in
- *-*-*) ;;
--*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
--$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
- { (exit 1); exit 1; }; };;
- esac
- host=$ac_cv_host
-@@ -7145,10 +7003,10 @@ IFS=$ac_save_IFS
- case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
--{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
--$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
- if test "${lt_cv_path_SED+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # Loop through the user's path and test for sed and gsed.
- # Then use that list of sed's as ones to test for truncation.
-@@ -7201,8 +7059,8 @@ fi
-
- SED=$lt_cv_path_SED
-
--{ $as_echo "$as_me:$LINENO: result: $SED" >&5
--$as_echo "$SED" >&6; }
-+{ echo "$as_me:$LINENO: result: $SED" >&5
-+echo "${ECHO_T}$SED" >&6; }
-
-
- # Check whether --with-gnu-ld was given.
-@@ -7215,8 +7073,8 @@ fi
- ac_prog=ld
- if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
-- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--$as_echo_n "checking for ld used by $CC... " >&6; }
-+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
-@@ -7245,14 +7103,14 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
- ;;
- esac
- elif test "$with_gnu_ld" = yes; then
-- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
--$as_echo_n "checking for GNU ld... " >&6; }
-+ { echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--$as_echo_n "checking for non-GNU ld... " >&6; }
-+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -7282,19 +7140,19 @@ fi
-
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
-- { $as_echo "$as_me:$LINENO: result: $LD" >&5
--$as_echo "$LD" >&6; }
-+ { echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
--$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
--{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
-@@ -7306,20 +7164,20 @@ case `$LD -v 2>&1 </dev/null` in
- ;;
- esac
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
--{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
--$as_echo_n "checking for $LD option to reload object files... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
- if test "${lt_cv_ld_reload_flag+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_ld_reload_flag='-r'
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
--$as_echo "$lt_cv_ld_reload_flag" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
- reload_flag=$lt_cv_ld_reload_flag
- case $reload_flag in
- "" | " "*) ;;
-@@ -7336,10 +7194,10 @@ case $host_os in
- ;;
- esac
-
--{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
--$as_echo_n "checking for BSD-compatible nm... " >&6; }
-+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
- if test "${lt_cv_path_NM+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$NM"; then
- # Let the user override the test.
-@@ -7385,25 +7243,25 @@ else
- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
--$as_echo "$lt_cv_path_NM" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
- NM="$lt_cv_path_NM"
-
--{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
--$as_echo_n "checking whether ln -s works... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--$as_echo "no, using $LN_S" >&6; }
-+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6; }
- fi
-
--{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
--$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
- if test "${lt_cv_deplibs_check_method+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_file_magic_cmd='$MAGIC_CMD'
- lt_cv_file_magic_test_file=
-@@ -7586,8 +7444,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- esac
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
--$as_echo "$lt_cv_deplibs_check_method" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -7620,7 +7478,7 @@ ia64-*-hpux*)
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *ELF-32*)
-@@ -7635,11 +7493,11 @@ ia64-*-hpux*)
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 7638 "configure"' > conftest.$ac_ext
-+ echo '#line 7496 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- if test "$lt_cv_prog_gnu_ld" = yes; then
- case `/usr/bin/file conftest.$ac_objext` in
-@@ -7677,7 +7535,7 @@ s390*-*linux*|sparc*-*linux*)
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.o` in
- *32-bit*)
-@@ -7700,6 +7558,7 @@ s390*-*linux*|sparc*-*linux*)
- esac
- ;;
- *64-bit*)
-+ libsuff=64
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -7727,10 +7586,10 @@ s390*-*linux*|sparc*-*linux*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
-- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
--$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
- if test "${lt_cv_cc_needs_belf+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -7759,30 +7618,26 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- lt_cv_cc_needs_belf=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- lt_cv_cc_needs_belf=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- ac_ext=c
-@@ -7792,8 +7647,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
--$as_echo "$lt_cv_cc_needs_belf" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
-@@ -7805,7 +7660,7 @@ sparc*-*solaris*)
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.o` in
- *64-bit*)
-@@ -7827,10 +7682,10 @@ sparc*-*solaris*)
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
- set dummy ${ac_tool_prefix}dlltool; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_DLLTOOL+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$DLLTOOL"; then
- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-@@ -7843,7 +7698,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7854,11 +7709,11 @@ fi
- fi
- DLLTOOL=$ac_cv_prog_DLLTOOL
- if test -n "$DLLTOOL"; then
-- { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
--$as_echo "$DLLTOOL" >&6; }
-+ { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-+echo "${ECHO_T}$DLLTOOL" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -7867,10 +7722,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
- ac_ct_DLLTOOL=$DLLTOOL
- # Extract the first word of "dlltool", so it can be a program name with args.
- set dummy dlltool; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_DLLTOOL"; then
- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-@@ -7883,7 +7738,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7894,11 +7749,11 @@ fi
- fi
- ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
- if test -n "$ac_ct_DLLTOOL"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
--$as_echo "$ac_ct_DLLTOOL" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-+echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_DLLTOOL" = x; then
-@@ -7906,8 +7761,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- DLLTOOL=$ac_ct_DLLTOOL
-@@ -7919,10 +7778,10 @@ fi
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
- set dummy ${ac_tool_prefix}as; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AS+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$AS"; then
- ac_cv_prog_AS="$AS" # Let the user override the test.
-@@ -7935,7 +7794,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AS="${ac_tool_prefix}as"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7946,11 +7805,11 @@ fi
- fi
- AS=$ac_cv_prog_AS
- if test -n "$AS"; then
-- { $as_echo "$as_me:$LINENO: result: $AS" >&5
--$as_echo "$AS" >&6; }
-+ { echo "$as_me:$LINENO: result: $AS" >&5
-+echo "${ECHO_T}$AS" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -7959,10 +7818,10 @@ if test -z "$ac_cv_prog_AS"; then
- ac_ct_AS=$AS
- # Extract the first word of "as", so it can be a program name with args.
- set dummy as; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_AS"; then
- ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
-@@ -7975,7 +7834,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AS="as"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7986,11 +7845,11 @@ fi
- fi
- ac_ct_AS=$ac_cv_prog_ac_ct_AS
- if test -n "$ac_ct_AS"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
--$as_echo "$ac_ct_AS" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-+echo "${ECHO_T}$ac_ct_AS" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_AS" = x; then
-@@ -7998,8 +7857,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- AS=$ac_ct_AS
-@@ -8011,10 +7874,10 @@ fi
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
- set dummy ${ac_tool_prefix}objdump; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_OBJDUMP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$OBJDUMP"; then
- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-@@ -8027,7 +7890,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -8038,11 +7901,11 @@ fi
- fi
- OBJDUMP=$ac_cv_prog_OBJDUMP
- if test -n "$OBJDUMP"; then
-- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
--$as_echo "$OBJDUMP" >&6; }
-+ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-+echo "${ECHO_T}$OBJDUMP" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -8051,10 +7914,10 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
- ac_ct_OBJDUMP=$OBJDUMP
- # Extract the first word of "objdump", so it can be a program name with args.
- set dummy objdump; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_OBJDUMP"; then
- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-@@ -8067,7 +7930,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_OBJDUMP="objdump"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -8078,11 +7941,11 @@ fi
- fi
- ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
- if test -n "$ac_ct_OBJDUMP"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
--$as_echo "$ac_ct_OBJDUMP" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-+echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_OBJDUMP" = x; then
-@@ -8090,8 +7953,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- OBJDUMP=$ac_ct_OBJDUMP
-@@ -8110,21 +7977,20 @@ need_locks="$enable_libtool_lock"
-
- for ac_header in dlfcn.h
- do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -8140,33 +8006,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -8180,52 +8045,51 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
-
- rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
- ## ---------------------------------------- ##
- ## Report this to gnucash-devel at gnucash.org ##
-@@ -8234,24 +8098,21 @@ _ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -8272,10 +8133,10 @@ if test -z "$CXX"; then
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CXX+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$CXX"; then
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -8288,7 +8149,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -8299,11 +8160,11 @@ fi
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
-- { $as_echo "$as_me:$LINENO: result: $CXX" >&5
--$as_echo "$CXX" >&6; }
-+ { echo "$as_me:$LINENO: result: $CXX" >&5
-+echo "${ECHO_T}$CXX" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -8316,10 +8177,10 @@ if test -z "$CXX"; then
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_CXX"; then
- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-@@ -8332,7 +8193,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CXX="$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -8343,11 +8204,11 @@ fi
- fi
- ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
- if test -n "$ac_ct_CXX"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
--$as_echo "$ac_ct_CXX" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-+echo "${ECHO_T}$ac_ct_CXX" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -8359,8 +8220,12 @@ done
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- CXX=$ac_ct_CXX
-@@ -8370,47 +8235,43 @@ fi
- fi
- fi
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
--set X $ac_compile
--ac_compiler=$2
-+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- { (ac_try="$ac_compiler -V >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
--$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
- if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -8436,21 +8297,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
-@@ -8460,19 +8320,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
--$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
--if test $ac_compiler_gnu = yes; then
-- GXX=yes
--else
-- GXX=
--fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-+GXX=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CXXFLAGS=${CXXFLAGS+set}
- ac_save_CXXFLAGS=$CXXFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
--$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cxx_g+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_save_cxx_werror_flag=$ac_cxx_werror_flag
- ac_cxx_werror_flag=yes
-@@ -8499,21 +8355,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cxx_g=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- CXXFLAGS=""
-@@ -8538,21 +8393,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-@@ -8578,21 +8432,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cxx_g=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-@@ -8607,8 +8460,8 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
--$as_echo "$ac_cv_prog_cxx_g" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
- if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
- elif test $ac_cv_prog_cxx_g = yes; then
-@@ -8632,10 +8485,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- depcc="$CXX" am_compiler_list=
-
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--$as_echo_n "checking dependency style of $depcc... " >&6; }
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
-@@ -8723,8 +8576,8 @@ else
- fi
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
--$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
-@@ -8748,11 +8601,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
--$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
- if test -z "$CXXCPP"; then
- if test "${ac_cv_prog_CXXCPP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # Double quotes because CXXCPP needs to be expanded
- for CXXCPP in "$CXX -E" "/lib/cpp"
-@@ -8784,21 +8637,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-@@ -8822,14 +8674,13 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
-@@ -8837,7 +8688,7 @@ $as_echo "$ac_try_echo") >&5
- # Broken: success on invalid input.
- continue
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-@@ -8862,8 +8713,8 @@ fi
- else
- ac_cv_prog_CXXCPP=$CXXCPP
- fi
--{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
--$as_echo "$CXXCPP" >&6; }
-+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+echo "${ECHO_T}$CXXCPP" >&6; }
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
- do
-@@ -8891,21 +8742,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-@@ -8929,14 +8779,13 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
-@@ -8944,7 +8793,7 @@ $as_echo "$ac_try_echo") >&5
- # Broken: success on invalid input.
- continue
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-@@ -8960,13 +8809,11 @@ rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then
- :
- else
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+ { (exit 1); exit 1; }; }
- fi
-
- ac_ext=cpp
-@@ -8987,10 +8834,10 @@ if test -n "$ac_tool_prefix"; then
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_F77+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$F77"; then
- ac_cv_prog_F77="$F77" # Let the user override the test.
-@@ -9003,7 +8850,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -9014,11 +8861,11 @@ fi
- fi
- F77=$ac_cv_prog_F77
- if test -n "$F77"; then
-- { $as_echo "$as_me:$LINENO: result: $F77" >&5
--$as_echo "$F77" >&6; }
-+ { echo "$as_me:$LINENO: result: $F77" >&5
-+echo "${ECHO_T}$F77" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -9031,10 +8878,10 @@ if test -z "$F77"; then
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_F77"; then
- ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-@@ -9047,7 +8894,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_F77="$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -9058,11 +8905,11 @@ fi
- fi
- ac_ct_F77=$ac_cv_prog_ac_ct_F77
- if test -n "$ac_ct_F77"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
--$as_echo "$ac_ct_F77" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-+echo "${ECHO_T}$ac_ct_F77" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -9074,8 +8921,12 @@ done
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- F77=$ac_ct_F77
-@@ -9084,41 +8935,37 @@ fi
-
-
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
--set X $ac_compile
--ac_compiler=$2
-+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- { (ac_try="$ac_compiler -V >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- rm -f a.out
-
-@@ -9126,10 +8973,10 @@ rm -f a.out
- # input file. (Note that this only needs to work for GNU compilers.)
- ac_save_ext=$ac_ext
- ac_ext=F
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
--$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
- if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- program main
-@@ -9145,21 +8992,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
-@@ -9169,16 +9015,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
--$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
- ac_ext=$ac_save_ext
- ac_test_FFLAGS=${FFLAGS+set}
- ac_save_FFLAGS=$FFLAGS
- FFLAGS=
--{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
--$as_echo_n "checking whether $F77 accepts -g... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_f77_g+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- FFLAGS=-g
- cat >conftest.$ac_ext <<_ACEOF
-@@ -9192,21 +9038,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_f77_g=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_prog_f77_g=no
-@@ -9215,8 +9060,8 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
--$as_echo "$ac_cv_prog_f77_g" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
- if test "$ac_test_FFLAGS" = set; then
- FFLAGS=$ac_save_FFLAGS
- elif test $ac_cv_prog_f77_g = yes; then
-@@ -9233,11 +9078,7 @@ else
- fi
- fi
-
--if test $ac_compiler_gnu = yes; then
-- G77=yes
--else
-- G77=
--fi
-+G77=`test $ac_compiler_gnu = yes && echo yes`
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -9248,10 +9089,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
- # find the maximum length of command line arguments
--{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
--$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
- if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- i=0
- teststring="ABCD"
-@@ -9360,11 +9201,11 @@ else
- fi
-
- if test -n $lt_cv_sys_max_cmd_len ; then
-- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
--$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-+ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: none" >&5
--$as_echo "none" >&6; }
-+ { echo "$as_me:$LINENO: result: none" >&5
-+echo "${ECHO_T}none" >&6; }
- fi
-
-
-@@ -9372,10 +9213,10 @@ fi
-
-
- # Check for command to grab the raw symbol name followed by C symbol from nm.
--{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
--$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
- if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-
- # These are sane defaults that work on at least a few old systems.
-@@ -9480,14 +9321,14 @@ EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # Now try to grab the symbols.
- nlist=conftest.nm
- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s "$nlist"; then
- # Try sorting and uniquifying the output.
- if sort "$nlist" | uniq > "$nlist"T; then
-@@ -9542,7 +9383,7 @@ EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
-@@ -9577,17 +9418,17 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
- lt_cv_sys_global_symbol_to_cdecl=
- fi
- if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-- { $as_echo "$as_me:$LINENO: result: failed" >&5
--$as_echo "failed" >&6; }
-+ { echo "$as_me:$LINENO: result: failed" >&5
-+echo "${ECHO_T}failed" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: ok" >&5
--$as_echo "ok" >&6; }
-+ { echo "$as_me:$LINENO: result: ok" >&5
-+echo "${ECHO_T}ok" >&6; }
- fi
-
--{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
--$as_echo_n "checking for objdir... " >&6; }
-+{ echo "$as_me:$LINENO: checking for objdir" >&5
-+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
- if test "${lt_cv_objdir+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- rm -f .libs 2>/dev/null
- mkdir .libs 2>/dev/null
-@@ -9599,8 +9440,8 @@ else
- fi
- rmdir .libs 2>/dev/null
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
--$as_echo "$lt_cv_objdir" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-+echo "${ECHO_T}$lt_cv_objdir" >&6; }
- objdir=$lt_cv_objdir
-
-
-@@ -9651,10 +9492,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AR+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$AR"; then
- ac_cv_prog_AR="$AR" # Let the user override the test.
-@@ -9667,7 +9508,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AR="${ac_tool_prefix}ar"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -9678,11 +9519,11 @@ fi
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
-- { $as_echo "$as_me:$LINENO: result: $AR" >&5
--$as_echo "$AR" >&6; }
-+ { echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -9691,10 +9532,10 @@ if test -z "$ac_cv_prog_AR"; then
- ac_ct_AR=$AR
- # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_AR"; then
- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-@@ -9707,7 +9548,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AR="ar"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -9718,11 +9559,11 @@ fi
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--$as_echo "$ac_ct_AR" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_AR" = x; then
-@@ -9730,8 +9571,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- AR=$ac_ct_AR
-@@ -9743,10 +9588,10 @@ fi
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_RANLIB+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -9759,7 +9604,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -9770,11 +9615,11 @@ fi
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
-- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
--$as_echo "$RANLIB" >&6; }
-+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -9783,10 +9628,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_RANLIB"; then
- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-@@ -9799,7 +9644,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -9810,11 +9655,11 @@ fi
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
--$as_echo "$ac_ct_RANLIB" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_RANLIB" = x; then
-@@ -9822,8 +9667,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- RANLIB=$ac_ct_RANLIB
-@@ -9835,10 +9684,10 @@ fi
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -9851,7 +9700,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -9862,11 +9711,11 @@ fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
-- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
--$as_echo "$STRIP" >&6; }
-+ { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -9875,10 +9724,10 @@ if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-@@ -9891,7 +9740,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -9902,11 +9751,11 @@ fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--$as_echo "$ac_ct_STRIP" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_STRIP" = x; then
-@@ -9914,8 +9763,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- STRIP=$ac_ct_STRIP
-@@ -9978,10 +9831,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- case $deplibs_check_method in
- file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
--$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-+ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $MAGIC_CMD in
- [\\/*] | ?:[\\/]*)
-@@ -10031,19 +9884,19 @@ fi
-
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
-- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--$as_echo "$MAGIC_CMD" >&6; }
-+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test -z "$lt_cv_path_MAGIC_CMD"; then
- if test -n "$ac_tool_prefix"; then
-- { $as_echo "$as_me:$LINENO: checking for file" >&5
--$as_echo_n "checking for file... " >&6; }
-+ { echo "$as_me:$LINENO: checking for file" >&5
-+echo $ECHO_N "checking for file... $ECHO_C" >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $MAGIC_CMD in
- [\\/*] | ?:[\\/]*)
-@@ -10093,11 +9946,11 @@ fi
-
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
-- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--$as_echo "$MAGIC_CMD" >&6; }
-+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- else
-@@ -10115,10 +9968,10 @@ esac
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
- set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$DSYMUTIL"; then
- ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-@@ -10131,7 +9984,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -10142,11 +9995,11 @@ fi
- fi
- DSYMUTIL=$ac_cv_prog_DSYMUTIL
- if test -n "$DSYMUTIL"; then
-- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
--$as_echo "$DSYMUTIL" >&6; }
-+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-+echo "${ECHO_T}$DSYMUTIL" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -10155,10 +10008,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
- ac_ct_DSYMUTIL=$DSYMUTIL
- # Extract the first word of "dsymutil", so it can be a program name with args.
- set dummy dsymutil; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_DSYMUTIL"; then
- ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-@@ -10171,7 +10024,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -10182,11 +10035,11 @@ fi
- fi
- ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
- if test -n "$ac_ct_DSYMUTIL"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
--$as_echo "$ac_ct_DSYMUTIL" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_DSYMUTIL" = x; then
-@@ -10194,8 +10047,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- DSYMUTIL=$ac_ct_DSYMUTIL
-@@ -10207,10 +10064,10 @@ fi
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
- set dummy ${ac_tool_prefix}nmedit; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_NMEDIT+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$NMEDIT"; then
- ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-@@ -10223,7 +10080,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -10234,11 +10091,11 @@ fi
- fi
- NMEDIT=$ac_cv_prog_NMEDIT
- if test -n "$NMEDIT"; then
-- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
--$as_echo "$NMEDIT" >&6; }
-+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-+echo "${ECHO_T}$NMEDIT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -10247,10 +10104,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then
- ac_ct_NMEDIT=$NMEDIT
- # Extract the first word of "nmedit", so it can be a program name with args.
- set dummy nmedit; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_NMEDIT"; then
- ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-@@ -10263,7 +10120,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_NMEDIT="nmedit"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -10274,11 +10131,11 @@ fi
- fi
- ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
- if test -n "$ac_ct_NMEDIT"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
--$as_echo "$ac_ct_NMEDIT" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_NMEDIT" = x; then
-@@ -10286,8 +10143,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- NMEDIT=$ac_ct_NMEDIT
-@@ -10297,10 +10158,10 @@ else
- fi
-
-
-- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
--$as_echo_n "checking for -single_module linker flag... " >&6; }
-+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
- if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
-@@ -10318,12 +10179,12 @@ else
- rm conftest.c
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
--$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
--$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
-+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
- if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_ld_exported_symbols_list=no
- save_LDFLAGS=$LDFLAGS
-@@ -10350,37 +10211,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- lt_cv_ld_exported_symbols_list=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- lt_cv_ld_exported_symbols_list=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
--$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
- case $host_os in
- rhapsody* | darwin1.[0123])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -10437,67 +10294,6 @@ fi
-
- test -z "$pic_mode" && pic_mode=default
-
--# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
--#
--# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
--# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
--# calls AC_LIBTOOL_CONFIG and creates libtool.
--#
--{ $as_echo "$as_me:$LINENO: checking for correct ltmain.sh version" >&5
--$as_echo_n "checking for correct ltmain.sh version... " >&6; }
--if test "x$ltmain" = "x" ; then
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- { { $as_echo "$as_me:$LINENO: error:
--
--*** [Gentoo] sanity check failed! ***
--*** \$ltmain is not defined, please check the patch for consistency! ***
--" >&5
--$as_echo "$as_me: error:
--
--*** [Gentoo] sanity check failed! ***
--*** \$ltmain is not defined, please check the patch for consistency! ***
--" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--gentoo_lt_version="1.5.26"
--gentoo_ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' "$ltmain"`
--if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- { { $as_echo "$as_me:$LINENO: error:
--
--*** [Gentoo] sanity check failed! ***
--*** libtool.m4 and ltmain.sh have a version mismatch! ***
--*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
--
--Please run:
--
-- libtoolize --copy --force
--
--if appropriate, please contact the maintainer of this
--package (or your distribution) for help.
--" >&5
--$as_echo "$as_me: error:
--
--*** [Gentoo] sanity check failed! ***
--*** libtool.m4 and ltmain.sh have a version mismatch! ***
--*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
--
--Please run:
--
-- libtoolize --copy --force
--
--if appropriate, please contact the maintainer of this
--package (or your distribution) for help.
--" >&2;}
-- { (exit 1); exit 1; }; }
--else
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--fi
--
--
- # Use C for the default configuration in the libtool script
- tagname=
- lt_save_CC="$CC"
-@@ -10553,10 +10349,10 @@ if test "$GCC" = yes; then
- lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
--$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
-@@ -10571,11 +10367,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:10574: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10370: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:10578: \$? = $ac_status" >&5
-+ echo "$as_me:10374: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -10588,8 +10384,8 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
- if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
- lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -10603,8 +10399,8 @@ lt_prog_compiler_wl=
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
-
--{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl='-Wl,'
-@@ -10835,18 +10631,18 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- esac
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
--$as_echo "$lt_prog_compiler_pic" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
-
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic"; then
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
--$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_pic_works=no
- ac_outfile=conftest.$ac_objext
-@@ -10861,11 +10657,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:10864: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10660: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:10868: \$? = $ac_status" >&5
-+ echo "$as_me:10664: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -10878,8 +10674,8 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
--$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
-
- if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
- case $lt_prog_compiler_pic in
-@@ -10906,10 +10702,10 @@ esac
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
--{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_static_works+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
-@@ -10934,8 +10730,8 @@ else
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
--$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
-
- if test x"$lt_cv_prog_compiler_static_works" = xyes; then
- :
-@@ -10944,10 +10740,10 @@ else
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_c_o=no
- $rm -r conftest 2>/dev/null
-@@ -10965,11 +10761,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:10968: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10764: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:10972: \$? = $ac_status" >&5
-+ echo "$as_me:10768: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -10991,34 +10787,34 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
--$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
-
-
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
-- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--$as_echo_n "checking if we can lock with hard links... " >&6; }
-+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
- hard_links=yes
- $rm conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
-- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
--$as_echo "$hard_links" >&6; }
-+ { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
- if test "$hard_links" = no; then
-- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
- need_locks=warn
- fi
- else
- need_locks=no
- fi
-
--{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
- runpath_var=
- allow_undefined_flag=
-@@ -11448,21 +11244,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -11477,13 +11270,12 @@ if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -11518,21 +11310,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -11547,13 +11336,12 @@ if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -12005,8 +11793,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- esac
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
--$as_echo "$ld_shlibs" >&6; }
-+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-+echo "${ECHO_T}$ld_shlibs" >&6; }
- test "$ld_shlibs" = no && can_build_shared=no
-
- #
-@@ -12026,15 +11814,15 @@ x|xyes)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
-- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
- soname=conftest
- lib=conftest
-@@ -12052,7 +11840,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- then
- archive_cmds_need_lc=no
-@@ -12064,16 +11852,16 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- cat conftest.err 1>&5
- fi
- $rm conftest*
-- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
--$as_echo "$archive_cmds_need_lc" >&6; }
-+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
- ;;
- esac
- fi
- ;;
- esac
-
--{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--$as_echo_n "checking dynamic linker characteristics... " >&6; }
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -12324,14 +12112,7 @@ freebsd* | dragonfly*)
- *) objformat=elf ;;
- esac
- fi
-- # Handle Gentoo/FreeBSD as it was Linux
-- case $host_vendor in
-- gentoo)
-- version_type=linux ;;
-- *)
-- version_type=freebsd-$objformat ;;
-- esac
--
-+ version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -12342,12 +12123,6 @@ freebsd* | dragonfly*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
-- linux)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- need_lib_prefix=no
-- need_version=no
-- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
-@@ -12494,11 +12269,13 @@ linux* | k*bsd*-gnu)
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12687,19 +12464,19 @@ uts4*)
- dynamic_linker=no
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--$as_echo "$dynamic_linker" >&6; }
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
- if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
- fi
-
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
- fi
-@@ -12711,8 +12488,8 @@ if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
-
--{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action=
- if test -n "$hardcode_libdir_flag_spec" || \
- test -n "$runpath_var" || \
-@@ -12736,8 +12513,8 @@ else
- # directories.
- hardcode_action=unsupported
- fi
--{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
--$as_echo "$hardcode_action" >&6; }
-+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-+echo "${ECHO_T}$hardcode_action" >&6; }
-
- if test "$hardcode_action" = relink; then
- # Fast installation is not supported
-@@ -12750,13 +12527,13 @@ fi
-
- striplib=
- old_striplib=
--{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
- if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
- # FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
-@@ -12764,16 +12541,16 @@ else
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- old_striplib="$STRIP -S"
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- ;;
- *)
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- ;;
- esac
- fi
-@@ -12805,10 +12582,10 @@ else
-
- darwin*)
- # if libdl is installed we need to link against it
-- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
-@@ -12840,37 +12617,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-+if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-
-@@ -12883,10 +12656,10 @@ fi
- ;;
-
- *)
-- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
--$as_echo_n "checking for shl_load... " >&6; }
-+ { echo "$as_me:$LINENO: checking for shl_load" >&5
-+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
- if test "${ac_cv_func_shl_load+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -12939,42 +12712,38 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_shl_load=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_shl_load=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--$as_echo "$ac_cv_func_shl_load" >&6; }
--if test "x$ac_cv_func_shl_load" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-+if test $ac_cv_func_shl_load = yes; then
- lt_cv_dlopen="shl_load"
- else
-- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--$as_echo_n "checking for shl_load in -ldld... " >&6; }
-+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld $LIBS"
-@@ -13006,43 +12775,39 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_shl_load=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_shl_load=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
--if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-+if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
-- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
--$as_echo_n "checking for dlopen... " >&6; }
-+ { echo "$as_me:$LINENO: checking for dlopen" >&5
-+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
- if test "${ac_cv_func_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -13095,42 +12860,38 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_dlopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_dlopen=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--$as_echo "$ac_cv_func_dlopen" >&6; }
--if test "x$ac_cv_func_dlopen" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-+if test $ac_cv_func_dlopen = yes; then
- lt_cv_dlopen="dlopen"
- else
-- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
-@@ -13162,43 +12923,39 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-+if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld $LIBS"
-@@ -13230,43 +12987,39 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_svld_dlopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_svld_dlopen=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
--if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-+if test $ac_cv_lib_svld_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
- else
-- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--$as_echo_n "checking for dld_link in -ldld... " >&6; }
-+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld $LIBS"
-@@ -13298,37 +13051,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_dld_link=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_dld_link=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
--$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
--if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-+if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
- fi
-
-@@ -13367,10 +13116,10 @@ fi
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
-- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
- if test "${lt_cv_dlopen_self+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self=cross
-@@ -13378,7 +13127,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 13381 "configure"
-+#line 13130 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -13444,7 +13193,7 @@ EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
-@@ -13462,15 +13211,15 @@ rm -fr conftest*
-
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--$as_echo "$lt_cv_dlopen_self" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
-
- if test "x$lt_cv_dlopen_self" = xyes; then
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
- if test "${lt_cv_dlopen_self_static+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self_static=cross
-@@ -13478,7 +13227,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 13481 "configure"
-+#line 13230 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -13544,7 +13293,7 @@ EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
-@@ -13562,8 +13311,8 @@ rm -fr conftest*
-
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--$as_echo "$lt_cv_dlopen_self_static" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
- fi
-
- CPPFLAGS="$save_CPPFLAGS"
-@@ -13585,13 +13334,13 @@ fi
-
-
- # Report which library types will actually be built
--{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--$as_echo_n "checking if libtool supports shared libraries... " >&6; }
--{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
--$as_echo "$can_build_shared" >&6; }
-+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+echo "${ECHO_T}$can_build_shared" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--$as_echo_n "checking whether to build shared libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -13611,15 +13360,15 @@ aix[4-9]*)
- fi
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
--$as_echo "$enable_shared" >&6; }
-+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-+echo "${ECHO_T}$enable_shared" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--$as_echo_n "checking whether to build static libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
--{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
--$as_echo "$enable_static" >&6; }
-+{ echo "$as_me:$LINENO: result: $enable_static" >&5
-+echo "${ECHO_T}$enable_static" >&6; }
-
- # The else clause should only fire when bootstrapping the
- # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -13712,8 +13461,8 @@ if test -f "$ltmain"; then
- cfgfile="${ofile}T"
- trap "$rm \"$cfgfile\"; exit 1" 1 2 15
- $rm -f "$cfgfile"
-- { $as_echo "$as_me:$LINENO: creating $ofile" >&5
--$as_echo "$as_me: creating $ofile" >&6;}
-+ { echo "$as_me:$LINENO: creating $ofile" >&5
-+echo "$as_me: creating $ofile" >&6;}
-
- cat <<__EOF__ >> "$cfgfile"
- #! $SHELL
-@@ -14125,18 +13874,18 @@ fi
-
- if test -f "$ltmain" && test -n "$tagnames"; then
- if test ! -f "${ofile}"; then
-- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
--$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-+echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
- fi
-
- if test -z "$LTCC"; then
- eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
- if test -z "$LTCC"; then
-- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
--$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-+echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
- else
-- { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
--$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-+echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
- fi
- fi
- if test -z "$LTCFLAGS"; then
-@@ -14153,16 +13902,16 @@ $as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
- # Check whether tagname contains only valid characters
- case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
- "") ;;
-- *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
--$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
-+ *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-+echo "$as_me: error: invalid tag name: $tagname" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
-
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
- then
-- { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
--$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-+ { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-+echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -14305,8 +14054,8 @@ fi
- ac_prog=ld
- if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
-- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--$as_echo_n "checking for ld used by $CC... " >&6; }
-+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
-@@ -14335,14 +14084,14 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
- ;;
- esac
- elif test "$with_gnu_ld" = yes; then
-- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
--$as_echo_n "checking for GNU ld... " >&6; }
-+ { echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--$as_echo_n "checking for non-GNU ld... " >&6; }
-+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -14372,19 +14121,19 @@ fi
-
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
-- { $as_echo "$as_me:$LINENO: result: $LD" >&5
--$as_echo "$LD" >&6; }
-+ { echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
--$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
--{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
-@@ -14396,8 +14145,8 @@ case `$LD -v 2>&1 </dev/null` in
- ;;
- esac
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-@@ -14447,8 +14196,8 @@ else
- fi
-
- # PORTME: fill in a description of your system's C++ link characteristics
--{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
- ld_shlibs_CXX=yes
- case $host_os in
- aix3*)
-@@ -14565,21 +14314,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -14594,13 +14340,12 @@ if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -14636,21 +14381,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -14665,13 +14407,12 @@ if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -15401,8 +15142,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- ld_shlibs_CXX=no
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--$as_echo "$ld_shlibs_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
-
- GCC_CXX="$GXX"
-@@ -15421,7 +15162,7 @@ EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # Parse the compiler output and extract the necessary
- # objects, libraries and library flags.
-@@ -15577,8 +15318,8 @@ lt_prog_compiler_wl_CXX=
- lt_prog_compiler_pic_CXX=
- lt_prog_compiler_static_CXX=
-
--{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
- # C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
-@@ -15861,18 +15602,18 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- esac
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
--$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
-
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_CXX"; then
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
--$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_pic_works_CXX=no
- ac_outfile=conftest.$ac_objext
-@@ -15887,11 +15628,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15890: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15631: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:15894: \$? = $ac_status" >&5
-+ echo "$as_me:15635: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -15904,8 +15645,8 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
--$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-
- if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
- case $lt_prog_compiler_pic_CXX in
-@@ -15932,10 +15673,10 @@ esac
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
--{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_static_works_CXX=no
- save_LDFLAGS="$LDFLAGS"
-@@ -15960,8 +15701,8 @@ else
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
--$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
-
- if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
- :
-@@ -15970,10 +15711,10 @@ else
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_c_o_CXX=no
- $rm -r conftest 2>/dev/null
-@@ -15991,11 +15732,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15994: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15735: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:15998: \$? = $ac_status" >&5
-+ echo "$as_me:15739: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -16017,34 +15758,34 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
--$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
-
-
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
-- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--$as_echo_n "checking if we can lock with hard links... " >&6; }
-+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
- hard_links=yes
- $rm conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
-- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
--$as_echo "$hard_links" >&6; }
-+ { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
- if test "$hard_links" = no; then
-- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
- need_locks=warn
- fi
- else
- need_locks=no
- fi
-
--{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- case $host_os in
-@@ -16069,8 +15810,8 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
- esac
- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--$as_echo "$ld_shlibs_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
-
- #
-@@ -16090,15 +15831,15 @@ x|xyes)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
-- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
- soname=conftest
- lib=conftest
-@@ -16116,7 +15857,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- then
- archive_cmds_need_lc_CXX=no
-@@ -16128,16 +15869,16 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- cat conftest.err 1>&5
- fi
- $rm conftest*
-- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
--$as_echo "$archive_cmds_need_lc_CXX" >&6; }
-+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
- ;;
- esac
- fi
- ;;
- esac
-
--{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--$as_echo_n "checking dynamic linker characteristics... " >&6; }
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -16336,14 +16077,7 @@ freebsd* | dragonfly*)
- *) objformat=elf ;;
- esac
- fi
-- # Handle Gentoo/FreeBSD as it was Linux
-- case $host_vendor in
-- gentoo)
-- version_type=linux ;;
-- *)
-- version_type=freebsd-$objformat ;;
-- esac
--
-+ version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -16354,12 +16088,6 @@ freebsd* | dragonfly*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
-- linux)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- need_lib_prefix=no
-- need_version=no
-- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
-@@ -16506,11 +16234,13 @@ linux* | k*bsd*-gnu)
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -16699,19 +16429,19 @@ uts4*)
- dynamic_linker=no
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--$as_echo "$dynamic_linker" >&6; }
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
- if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
- fi
-
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
- fi
-@@ -16723,8 +16453,8 @@ if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
-
--{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action_CXX=
- if test -n "$hardcode_libdir_flag_spec_CXX" || \
- test -n "$runpath_var_CXX" || \
-@@ -16748,8 +16478,8 @@ else
- # directories.
- hardcode_action_CXX=unsupported
- fi
--{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
--$as_echo "$hardcode_action_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-+echo "${ECHO_T}$hardcode_action_CXX" >&6; }
-
- if test "$hardcode_action_CXX" = relink; then
- # Fast installation is not supported
-@@ -17287,13 +17017,13 @@ done
- cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
--{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--$as_echo_n "checking if libtool supports shared libraries... " >&6; }
--{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
--$as_echo "$can_build_shared" >&6; }
-+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+echo "${ECHO_T}$can_build_shared" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--$as_echo_n "checking whether to build shared libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -17312,15 +17042,15 @@ aix[4-9]*)
- fi
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
--$as_echo "$enable_shared" >&6; }
-+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-+echo "${ECHO_T}$enable_shared" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--$as_echo_n "checking whether to build static libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
--{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
--$as_echo "$enable_static" >&6; }
-+{ echo "$as_me:$LINENO: result: $enable_static" >&5
-+echo "${ECHO_T}$enable_static" >&6; }
-
- GCC_F77="$G77"
- LD_F77="$LD"
-@@ -17329,8 +17059,8 @@ lt_prog_compiler_wl_F77=
- lt_prog_compiler_pic_F77=
- lt_prog_compiler_static_F77=
-
--{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl_F77='-Wl,'
-@@ -17561,18 +17291,18 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- esac
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
--$as_echo "$lt_prog_compiler_pic_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
-
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_F77"; then
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
--$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_pic_works_F77=no
- ac_outfile=conftest.$ac_objext
-@@ -17587,11 +17317,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17590: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17320: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:17594: \$? = $ac_status" >&5
-+ echo "$as_me:17324: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -17604,8 +17334,8 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
--$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
-
- if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
- case $lt_prog_compiler_pic_F77 in
-@@ -17632,10 +17362,10 @@ esac
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
--{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_static_works_F77=no
- save_LDFLAGS="$LDFLAGS"
-@@ -17660,8 +17390,8 @@ else
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
--$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
-
- if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
- :
-@@ -17670,10 +17400,10 @@ else
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_c_o_F77=no
- $rm -r conftest 2>/dev/null
-@@ -17691,11 +17421,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17694: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17424: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:17698: \$? = $ac_status" >&5
-+ echo "$as_me:17428: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -17717,34 +17447,34 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
--$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
-
-
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
-- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--$as_echo_n "checking if we can lock with hard links... " >&6; }
-+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
- hard_links=yes
- $rm conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
-- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
--$as_echo "$hard_links" >&6; }
-+ { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
- if test "$hard_links" = no; then
-- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
- need_locks=warn
- fi
- else
- need_locks=no
- fi
-
--{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
- runpath_var=
- allow_undefined_flag_F77=
-@@ -18164,21 +17894,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -18193,13 +17920,12 @@ if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18224,21 +17950,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -18253,13 +17976,12 @@ if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18711,8 +18433,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- esac
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
--$as_echo "$ld_shlibs_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-+echo "${ECHO_T}$ld_shlibs_F77" >&6; }
- test "$ld_shlibs_F77" = no && can_build_shared=no
-
- #
-@@ -18732,15 +18454,15 @@ x|xyes)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
-- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
- soname=conftest
- lib=conftest
-@@ -18758,7 +18480,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- then
- archive_cmds_need_lc_F77=no
-@@ -18770,16 +18492,16 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- cat conftest.err 1>&5
- fi
- $rm conftest*
-- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
--$as_echo "$archive_cmds_need_lc_F77" >&6; }
-+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
- ;;
- esac
- fi
- ;;
- esac
-
--{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--$as_echo_n "checking dynamic linker characteristics... " >&6; }
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -18978,14 +18700,7 @@ freebsd* | dragonfly*)
- *) objformat=elf ;;
- esac
- fi
-- # Handle Gentoo/FreeBSD as it was Linux
-- case $host_vendor in
-- gentoo)
-- version_type=linux ;;
-- *)
-- version_type=freebsd-$objformat ;;
-- esac
--
-+ version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -18996,12 +18711,6 @@ freebsd* | dragonfly*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
-- linux)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- need_lib_prefix=no
-- need_version=no
-- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
-@@ -19148,11 +18857,13 @@ linux* | k*bsd*-gnu)
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -19341,19 +19052,19 @@ uts4*)
- dynamic_linker=no
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--$as_echo "$dynamic_linker" >&6; }
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
- if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
- fi
-
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
- fi
-@@ -19365,8 +19076,8 @@ if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
-
--{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action_F77=
- if test -n "$hardcode_libdir_flag_spec_F77" || \
- test -n "$runpath_var_F77" || \
-@@ -19390,8 +19101,8 @@ else
- # directories.
- hardcode_action_F77=unsupported
- fi
--{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
--$as_echo "$hardcode_action_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-+echo "${ECHO_T}$hardcode_action_F77" >&6; }
-
- if test "$hardcode_action_F77" = relink; then
- # Fast installation is not supported
-@@ -19901,10 +19612,10 @@ if test "$GCC" = yes; then
- lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
--$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
-@@ -19919,11 +19630,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:19922: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19633: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:19926: \$? = $ac_status" >&5
-+ echo "$as_me:19637: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -19936,8 +19647,8 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
- if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
- lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -19951,8 +19662,8 @@ lt_prog_compiler_wl_GCJ=
- lt_prog_compiler_pic_GCJ=
- lt_prog_compiler_static_GCJ=
-
--{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -20183,18 +19894,18 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- esac
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
--$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
-
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_GCJ"; then
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
--$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_pic_works_GCJ=no
- ac_outfile=conftest.$ac_objext
-@@ -20209,11 +19920,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:20212: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19923: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:20216: \$? = $ac_status" >&5
-+ echo "$as_me:19927: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -20226,8 +19937,8 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
--$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
-
- if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
- case $lt_prog_compiler_pic_GCJ in
-@@ -20254,10 +19965,10 @@ esac
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
--{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_static_works_GCJ=no
- save_LDFLAGS="$LDFLAGS"
-@@ -20282,8 +19993,8 @@ else
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
--$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
-
- if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
- :
-@@ -20292,10 +20003,10 @@ else
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_c_o_GCJ=no
- $rm -r conftest 2>/dev/null
-@@ -20313,11 +20024,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:20316: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20027: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:20320: \$? = $ac_status" >&5
-+ echo "$as_me:20031: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -20339,34 +20050,34 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
--$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
-
-
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
-- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--$as_echo_n "checking if we can lock with hard links... " >&6; }
-+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
- hard_links=yes
- $rm conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
-- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
--$as_echo "$hard_links" >&6; }
-+ { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
- if test "$hard_links" = no; then
-- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
- need_locks=warn
- fi
- else
- need_locks=no
- fi
-
--{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
- runpath_var=
- allow_undefined_flag_GCJ=
-@@ -20796,21 +20507,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -20825,13 +20533,12 @@ if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -20866,21 +20573,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -20895,13 +20599,12 @@ if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -21353,8 +21056,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- esac
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
--$as_echo "$ld_shlibs_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
- test "$ld_shlibs_GCJ" = no && can_build_shared=no
-
- #
-@@ -21374,15 +21077,15 @@ x|xyes)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
-- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
- soname=conftest
- lib=conftest
-@@ -21400,7 +21103,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- then
- archive_cmds_need_lc_GCJ=no
-@@ -21412,16 +21115,16 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- cat conftest.err 1>&5
- fi
- $rm conftest*
-- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
--$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
-+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
- ;;
- esac
- fi
- ;;
- esac
-
--{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--$as_echo_n "checking dynamic linker characteristics... " >&6; }
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -21620,14 +21323,7 @@ freebsd* | dragonfly*)
- *) objformat=elf ;;
- esac
- fi
-- # Handle Gentoo/FreeBSD as it was Linux
-- case $host_vendor in
-- gentoo)
-- version_type=linux ;;
-- *)
-- version_type=freebsd-$objformat ;;
-- esac
--
-+ version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -21638,12 +21334,6 @@ freebsd* | dragonfly*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
-- linux)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- need_lib_prefix=no
-- need_version=no
-- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
-@@ -21790,11 +21480,13 @@ linux* | k*bsd*-gnu)
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -21983,19 +21675,19 @@ uts4*)
- dynamic_linker=no
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--$as_echo "$dynamic_linker" >&6; }
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
- if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
- fi
-
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
- fi
-@@ -22007,8 +21699,8 @@ if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
-
--{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action_GCJ=
- if test -n "$hardcode_libdir_flag_spec_GCJ" || \
- test -n "$runpath_var_GCJ" || \
-@@ -22032,8 +21724,8 @@ else
- # directories.
- hardcode_action_GCJ=unsupported
- fi
--{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
--$as_echo "$hardcode_action_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
-
- if test "$hardcode_action_GCJ" = relink; then
- # Fast installation is not supported
-@@ -22956,8 +22648,8 @@ CC="$lt_save_CC"
- ;;
-
- *)
-- { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
--$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-+ { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-+echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
-@@ -22976,8 +22668,8 @@ $as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
- chmod +x "$ofile"
- else
- rm -f "${ofile}T"
-- { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
--$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-+ { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-+echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-@@ -23014,10 +22706,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
--{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
--$as_echo_n "checking for library containing strerror... " >&6; }
-+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
-+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
- if test "${ac_cv_search_strerror+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
- cat >conftest.$ac_ext <<_ACEOF
-@@ -23055,30 +22747,26 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_search_strerror=$ac_res
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_strerror+set}" = set; then
-@@ -23093,86 +22781,36 @@ fi
- rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
--$as_echo "$ac_cv_search_strerror" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-+echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
- ac_res=$ac_cv_search_strerror
- if test "$ac_res" != no; then
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-
--
-- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
--$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
- if test "${ac_cv_c_bigendian+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_c_bigendian=unknown
-- # See if we're dealing with a universal compiler.
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#ifndef __APPLE_CC__
-- not a universal capable compiler
-- #endif
-- typedef int dummy;
--
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
--
-- # Check for potential -arch flags. It is not universal unless
-- # there are some -arch flags. Note that *ppc* also matches
-- # ppc64. This check is also rather less than ideal.
-- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
-- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
-- esac
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- if test $ac_cv_c_bigendian = unknown; then
-- # See if sys/param.h defines the BYTE_ORDER macro.
-- cat >conftest.$ac_ext <<_ACEOF
-+ # See if sys/param.h defines the BYTE_ORDER macro.
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <sys/types.h>
-- #include <sys/param.h>
-+#include <sys/param.h>
-
- int
- main ()
- {
--#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-- && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-- && LITTLE_ENDIAN)
-- bogus endian macros
-- #endif
-+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-+ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
-+ bogus endian macros
-+#endif
-
- ;
- return 0;
-@@ -23184,34 +22822,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- # It does; now see whether it defined to BIG_ENDIAN or not.
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <sys/types.h>
-- #include <sys/param.h>
-+#include <sys/param.h>
-
- int
- main ()
- {
- #if BYTE_ORDER != BIG_ENDIAN
-- not big endian
-- #endif
-+ not big endian
-+#endif
-
- ;
- return 0;
-@@ -23223,21 +22860,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_bigendian=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_bigendian=no
-@@ -23245,69 +22881,29 @@ fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- fi
-- if test $ac_cv_c_bigendian = unknown; then
-- # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <limits.h>
--
--int
--main ()
--{
--#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-- bogus endian macros
-- #endif
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- # It does; now see whether it defined to _BIG_ENDIAN or not.
-- cat >conftest.$ac_ext <<_ACEOF
-+ # It does not; compile a test program.
-+if test "$cross_compiling" = yes; then
-+ # try to guess the endianness by grepping values into an object file
-+ ac_cv_c_bigendian=unknown
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <limits.h>
--
-+short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-+short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-+void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
- int
- main ()
- {
--#ifndef _BIG_ENDIAN
-- not big endian
-- #endif
--
-+ _ascii (); _ebcdic ();
- ;
- return 0;
- }
-@@ -23318,101 +22914,30 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
- ac_cv_c_bigendian=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_c_bigendian=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
-+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-+ if test "$ac_cv_c_bigendian" = unknown; then
-+ ac_cv_c_bigendian=no
-+ else
-+ # finding both strings is unlikely to happen, but who knows?
-+ ac_cv_c_bigendian=unknown
-+ fi
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- fi
-- if test $ac_cv_c_bigendian = unknown; then
-- # Compile a test program.
-- if test "$cross_compiling" = yes; then
-- # Try to guess by grepping values from an object file.
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--short int ascii_mm[] =
-- { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-- short int ascii_ii[] =
-- { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-- int use_ascii (int i) {
-- return ascii_mm[i] + ascii_ii[i];
-- }
-- short int ebcdic_ii[] =
-- { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-- short int ebcdic_mm[] =
-- { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-- int use_ebcdic (int i) {
-- return ebcdic_mm[i] + ebcdic_ii[i];
-- }
-- extern int foo;
--
--int
--main ()
--{
--return use_ascii (foo) == use_ebcdic (foo);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-- ac_cv_c_bigendian=yes
-- fi
-- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-- if test "$ac_cv_c_bigendian" = unknown; then
-- ac_cv_c_bigendian=no
-- else
-- # finding both strings is unlikely to happen, but who knows?
-- ac_cv_c_bigendian=unknown
-- fi
-- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-@@ -23431,14 +22956,14 @@ int
- main ()
- {
-
-- /* Are we little or big endian? From Harbison&Steele. */
-- union
-- {
-- long int l;
-- char c[sizeof (long int)];
-- } u;
-- u.l = 1;
-- return u.c[sizeof (long int) - 1] == 1;
-+ /* Are we little or big endian? From Harbison&Steele. */
-+ union
-+ {
-+ long int l;
-+ char c[sizeof (long int)];
-+ } u;
-+ u.l = 1;
-+ return u.c[sizeof (long int) - 1] == 1;
-
- ;
- return 0;
-@@ -23450,69 +22975,61 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_c_bigendian=no
- else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
- ac_cv_c_bigendian=yes
- fi
--rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-
-
-- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
--$as_echo "$ac_cv_c_bigendian" >&6; }
-- case $ac_cv_c_bigendian in #(
-- yes)
-- cat >>confdefs.h <<\_ACEOF
--#define WORDS_BIGENDIAN 1
--_ACEOF
--;; #(
-- no)
-- ;; #(
-- universal)
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-+echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
-+case $ac_cv_c_bigendian in
-+ yes)
-
- cat >>confdefs.h <<\_ACEOF
--#define AC_APPLE_UNIVERSAL_BUILD 1
-+#define WORDS_BIGENDIAN 1
- _ACEOF
--
-- ;; #(
-- *)
-- { { $as_echo "$as_me:$LINENO: error: unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
--$as_echo "$as_me: error: unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-+ ;;
-+ no)
-+ ;;
-+ *)
-+ { { echo "$as_me:$LINENO: error: unknown endianness
-+presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-+echo "$as_me: error: unknown endianness
-+presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
- { (exit 1); exit 1; }; } ;;
-- esac
-+esac
-
--{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
--$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
--set x ${MAKE-make}
--ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
- if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.make <<\_ACEOF
- SHELL = /bin/sh
-@@ -23529,30 +23046,30 @@ esac
- rm -f conftest.make
- fi
- if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- SET_MAKE=
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-
--{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
--$as_echo_n "checking whether ln -s works... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--$as_echo "no, using $LN_S" >&6; }
-+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6; }
- fi
-
--{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--$as_echo_n "checking for ANSI C header files... " >&6; }
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -23579,21 +23096,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_stdc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
-@@ -23685,40 +23201,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
- else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-
-
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--$as_echo "$ac_cv_header_stdc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -23733,21 +23246,20 @@ fi
-
- for ac_header in limits.h sys/times.h sys/wait.h
- do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -23763,33 +23275,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -23803,52 +23314,51 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
-
- rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
- ## ---------------------------------------- ##
- ## Report this to gnucash-devel at gnucash.org ##
-@@ -23857,24 +23367,21 @@ _ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -23887,11 +23394,11 @@ done
-
- for ac_func in stpcpy memcpy timegm towupper
- do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -23944,42 +23451,35 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -23988,11 +23488,11 @@ done
-
- for ac_func in setenv
- do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -24045,42 +23545,35 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- else
-@@ -24088,11 +23581,11 @@ else
-
- for ac_func in putenv
- do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -24145,48 +23638,41 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- else
-
-- { { $as_echo "$as_me:$LINENO: error: Must have one of the setenv or putenv functions." >&5
--$as_echo "$as_me: error: Must have one of the setenv or putenv functions." >&2;}
-+ { { echo "$as_me:$LINENO: error: Must have one of the setenv or putenv functions." >&5
-+echo "$as_me: error: Must have one of the setenv or putenv functions." >&2;}
- { (exit 1); exit 1; }; }
-
- fi
-@@ -24200,8 +23686,8 @@ done
- ##################################################
- # Check for win32 platform
- ##################################################
--{ $as_echo "$as_me:$LINENO: checking for native Win32" >&5
--$as_echo_n "checking for native Win32... " >&6; }
-+{ echo "$as_me:$LINENO: checking for native Win32" >&5
-+echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; }
- case $host in
- *-*-mingw*)
- native_win32=yes
-@@ -24210,8 +23696,8 @@ case $host in
- native_win32=no
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $native_win32" >&5
--$as_echo "$native_win32" >&6; }
-+{ echo "$as_me:$LINENO: result: $native_win32" >&5
-+echo "${ECHO_T}$native_win32" >&6; }
- if test "x$native_win32" = "xyes"; then
- OS_WIN32_TRUE=
- OS_WIN32_FALSE='#'
-@@ -24221,8 +23707,8 @@ else
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking for Win32 platform in general" >&5
--$as_echo_n "checking for Win32 platform in general... " >&6; }
-+{ echo "$as_me:$LINENO: checking for Win32 platform in general" >&5
-+echo $ECHO_N "checking for Win32 platform in general... $ECHO_C" >&6; }
- case $host in
- *-*-mingw*|*-*-cygwin*)
- platform_win32=yes
-@@ -24231,8 +23717,8 @@ case $host in
- platform_win32=no
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5
--$as_echo "$platform_win32" >&6; }
-+{ echo "$as_me:$LINENO: result: $platform_win32" >&5
-+echo "${ECHO_T}$platform_win32" >&6; }
- if test "x$platform_win32" = "xyes"; then
- PLATFORM_WIN32_TRUE=
- PLATFORM_WIN32_FALSE='#'
-@@ -24251,8 +23737,8 @@ fi
-
- if test "x$native_win32" = "xyes" ; then
- HTMLHELP_LIBS=
-- { $as_echo "$as_me:$LINENO: checking for HtmlHelpW" >&5
--$as_echo_n "checking for HtmlHelpW... " >&6; }
-+ { echo "$as_me:$LINENO: checking for HtmlHelpW" >&5
-+echo $ECHO_N "checking for HtmlHelpW... $ECHO_C" >&6; }
- saved_LIBS="${LIBS}"
- LIBS="${LIBS} -lhtmlhelp"
- cat >conftest.$ac_ext <<_ACEOF
-@@ -24277,24 +23763,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- HTMLHELP_LIBS=-lhtmlhelp
-
- cat >>confdefs.h <<\_ACEOF
-@@ -24303,16 +23786,15 @@ _ACEOF
-
-
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="${saved_LIBS}"
-@@ -24321,10 +23803,10 @@ fi
- ##################################################
-
-
-- { $as_echo "$as_me:$LINENO: checking for the tm_gmtoff member of struct tm" >&5
--$as_echo_n "checking for the tm_gmtoff member of struct tm... " >&6; }
-+ { echo "$as_me:$LINENO: checking for the tm_gmtoff member of struct tm" >&5
-+echo $ECHO_N "checking for the tm_gmtoff member of struct tm... $ECHO_C" >&6; }
- if test "${am_cv_struct_tm_gmtoff+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -24352,36 +23834,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- am_cv_struct_tm_gmtoff=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- am_cv_struct_tm_gmtoff=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_struct_tm_gmtoff" >&5
--$as_echo "$am_cv_struct_tm_gmtoff" >&6; }
-+{ echo "$as_me:$LINENO: result: $am_cv_struct_tm_gmtoff" >&5
-+echo "${ECHO_T}$am_cv_struct_tm_gmtoff" >&6; }
- if test $am_cv_struct_tm_gmtoff = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -24391,10 +23869,10 @@ _ACEOF
- fi
-
-
-- { $as_echo "$as_me:$LINENO: checking if scanf supports %lld conversions" >&5
--$as_echo_n "checking if scanf supports %lld conversions... " >&6; }
-+ { echo "$as_me:$LINENO: checking if scanf supports %lld conversions" >&5
-+echo $ECHO_N "checking if scanf supports %lld conversions... $ECHO_C" >&6; }
- if test "${am_cv_scanf_lld+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test "$cross_compiling" = yes; then
-
-@@ -24405,8 +23883,8 @@ else
- am_cv_scanf_lld=no
- ;;
- *)
-- { { $as_echo "$as_me:$LINENO: error: scanf support unknown." >&5
--$as_echo "$as_me: error: scanf support unknown." >&2;}
-+ { { echo "$as_me:$LINENO: error: scanf support unknown." >&5
-+echo "$as_me: error: scanf support unknown." >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
-@@ -24443,39 +23921,36 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- am_cv_scanf_lld=yes
- else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
- am_cv_scanf_lld=no
- fi
--rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_scanf_lld" >&5
--$as_echo "$am_cv_scanf_lld" >&6; }
-+{ echo "$as_me:$LINENO: result: $am_cv_scanf_lld" >&5
-+echo "${ECHO_T}$am_cv_scanf_lld" >&6; }
- if test $am_cv_scanf_lld = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -24486,10 +23961,10 @@ _ACEOF
-
- if test x$am_cv_scanf_lld = "xno"; then
-
-- { $as_echo "$as_me:$LINENO: checking if scanf supports %qd conversions" >&5
--$as_echo_n "checking if scanf supports %qd conversions... " >&6; }
-+ { echo "$as_me:$LINENO: checking if scanf supports %qd conversions" >&5
-+echo $ECHO_N "checking if scanf supports %qd conversions... $ECHO_C" >&6; }
- if test "${am_cv_scanf_qd+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test "$cross_compiling" = yes; then
-
-@@ -24500,8 +23975,8 @@ else
- am_cv_scanf_qd=no
- ;;
- *)
-- { { $as_echo "$as_me:$LINENO: error: scanf support unknown." >&5
--$as_echo "$as_me: error: scanf support unknown." >&2;}
-+ { { echo "$as_me:$LINENO: error: scanf support unknown." >&5
-+echo "$as_me: error: scanf support unknown." >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
-@@ -24538,39 +24013,36 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- am_cv_scanf_qd=yes
- else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
- am_cv_scanf_qd=no
- fi
--rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_scanf_qd" >&5
--$as_echo "$am_cv_scanf_qd" >&6; }
-+{ echo "$as_me:$LINENO: result: $am_cv_scanf_qd" >&5
-+echo "${ECHO_T}$am_cv_scanf_qd" >&6; }
- if test $am_cv_scanf_qd = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -24582,10 +24054,10 @@ _ACEOF
-
- if test x$am_cv_scanf_qd = "xno"; then
-
-- { $as_echo "$as_me:$LINENO: checking if scanf supports %I64d conversions" >&5
--$as_echo_n "checking if scanf supports %I64d conversions... " >&6; }
-+ { echo "$as_me:$LINENO: checking if scanf supports %I64d conversions" >&5
-+echo $ECHO_N "checking if scanf supports %I64d conversions... $ECHO_C" >&6; }
- if test "${am_cv_scanf_i64d+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test "$cross_compiling" = yes; then
-
-@@ -24596,8 +24068,8 @@ else
- am_cv_scanf_i64d=yes
- ;;
- *)
-- { { $as_echo "$as_me:$LINENO: error: scanf support unknown." >&5
--$as_echo "$as_me: error: scanf support unknown." >&2;}
-+ { { echo "$as_me:$LINENO: error: scanf support unknown." >&5
-+echo "$as_me: error: scanf support unknown." >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
-@@ -24634,39 +24106,36 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- am_cv_scanf_i64d=yes
- else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
- am_cv_scanf_i64d=no
- fi
--rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_scanf_i64d" >&5
--$as_echo "$am_cv_scanf_i64d" >&6; }
-+{ echo "$as_me:$LINENO: result: $am_cv_scanf_i64d" >&5
-+echo "${ECHO_T}$am_cv_scanf_i64d" >&6; }
- if test $am_cv_scanf_i64d = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -24676,8 +24145,8 @@ _ACEOF
- fi
-
- if test x$am_cv_scanf_i64d = "xno"; then
-- { { $as_echo "$as_me:$LINENO: error: Cannot continue, no long long conversion support in scanf." >&5
--$as_echo "$as_me: error: Cannot continue, no long long conversion support in scanf." >&2;}
-+ { { echo "$as_me:$LINENO: error: Cannot continue, no long long conversion support in scanf." >&5
-+echo "$as_me: error: Cannot continue, no long long conversion support in scanf." >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-@@ -24693,10 +24162,10 @@ if test $? = 0 ; then
-
- # Extract the first word of "swig", so it can be a program name with args.
- set dummy swig; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_SWIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $SWIG in
- [\\/]* | ?:[\\/]*)
-@@ -24711,7 +24180,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -24723,25 +24192,25 @@ esac
- fi
- SWIG=$ac_cv_path_SWIG
- if test -n "$SWIG"; then
-- { $as_echo "$as_me:$LINENO: result: $SWIG" >&5
--$as_echo "$SWIG" >&6; }
-+ { echo "$as_me:$LINENO: result: $SWIG" >&5
-+echo "${ECHO_T}$SWIG" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
- if test -z "$SWIG" ; then
-- { { $as_echo "$as_me:$LINENO: error: cannot find 'swig' program. You should look at http://www.swig.org" >&5
--$as_echo "$as_me: error: cannot find 'swig' program. You should look at http://www.swig.org" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot find 'swig' program. You should look at http://www.swig.org" >&5
-+echo "$as_me: error: cannot find 'swig' program. You should look at http://www.swig.org" >&2;}
- { (exit 1); exit 1; }; }
- SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false'
- elif test -n "1.3.28" ; then
-- { $as_echo "$as_me:$LINENO: checking for SWIG version" >&5
--$as_echo_n "checking for SWIG version... " >&6; }
-+ { echo "$as_me:$LINENO: checking for SWIG version" >&5
-+echo $ECHO_N "checking for SWIG version... $ECHO_C" >&6; }
- swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`
-- { $as_echo "$as_me:$LINENO: result: $swig_version" >&5
--$as_echo "$swig_version" >&6; }
-+ { echo "$as_me:$LINENO: result: $swig_version" >&5
-+echo "${ECHO_T}$swig_version" >&6; }
- if test -n "$swig_version" ; then
- # Calculate the required version number components
- required=1.3.28
-@@ -24778,17 +24247,17 @@ $as_echo "$swig_version" >&6; }
- if test $available_major -ne $required_major \
- -o $available_minor -ne $required_minor \
- -o $available_patch -lt $required_patch ; then
-- { { $as_echo "$as_me:$LINENO: error: SWIG version >= 1.3.28 is required. You have $swig_version. You should look at http://www.swig.org" >&5
--$as_echo "$as_me: error: SWIG version >= 1.3.28 is required. You have $swig_version. You should look at http://www.swig.org" >&2;}
-+ { { echo "$as_me:$LINENO: error: SWIG version >= 1.3.28 is required. You have $swig_version. You should look at http://www.swig.org" >&5
-+echo "$as_me: error: SWIG version >= 1.3.28 is required. You have $swig_version. You should look at http://www.swig.org" >&2;}
- { (exit 1); exit 1; }; }
- SWIG='echo "Error: SWIG version >= 1.3.28 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false'
- else
-- { $as_echo "$as_me:$LINENO: SWIG executable is '$SWIG'" >&5
--$as_echo "$as_me: SWIG executable is '$SWIG'" >&6;}
-+ { echo "$as_me:$LINENO: SWIG executable is '$SWIG'" >&5
-+echo "$as_me: SWIG executable is '$SWIG'" >&6;}
- fi
- else
-- { { $as_echo "$as_me:$LINENO: error: cannot determine SWIG version" >&5
--$as_echo "$as_me: error: cannot determine SWIG version" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot determine SWIG version" >&5
-+echo "$as_me: error: cannot determine SWIG version" >&2;}
- { (exit 1); exit 1; }; }
- SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false'
- fi
-@@ -24797,15 +24266,15 @@ $as_echo "$as_me: error: cannot determine SWIG version" >&2;}
- else
- BUILDING_FROM_SVN=no
- # Make sure we've got swig-runtime.h and gnc-svninfo.h
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/src/swig-runtime.h" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/src/swig-runtime.h" >&5
--$as_echo_n "checking for ${srcdir}/src/swig-runtime.h... " >&6; }
-+ as_ac_File=`echo "ac_cv_file_${srcdir}/src/swig-runtime.h" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for ${srcdir}/src/swig-runtime.h" >&5
-+echo $ECHO_N "checking for ${srcdir}/src/swig-runtime.h... $ECHO_C" >&6; }
- if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- test "$cross_compiling" = yes &&
-- { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
--$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
- if test -r "${srcdir}/src/swig-runtime.h"; then
- eval "$as_ac_File=yes"
-@@ -24813,16 +24282,13 @@ else
- eval "$as_ac_File=no"
- fi
- fi
--ac_res=`eval 'as_val=${'$as_ac_File'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_File'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_File'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_File'}'` = yes; then
- :
- else
-- { { $as_echo "$as_me:$LINENO: error:
-+ { { echo "$as_me:$LINENO: error:
-
- It looks like you are NOT building from Subversion
- but I cannot find swig-runtime.h. Check your PATH
-@@ -24831,7 +24297,7 @@ Either that or contact gnucash-devel at gnucash.org because
- the tarball you downloaded is broken.
-
- " >&5
--$as_echo "$as_me: error:
-+echo "$as_me: error:
-
- It looks like you are NOT building from Subversion
- but I cannot find swig-runtime.h. Check your PATH
-@@ -24843,15 +24309,15 @@ the tarball you downloaded is broken.
- { (exit 1); exit 1; }; }
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/src/gnome-utils/gnc-svninfo.h" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/src/gnome-utils/gnc-svninfo.h" >&5
--$as_echo_n "checking for ${srcdir}/src/gnome-utils/gnc-svninfo.h... " >&6; }
-+ as_ac_File=`echo "ac_cv_file_${srcdir}/src/gnome-utils/gnc-svninfo.h" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for ${srcdir}/src/gnome-utils/gnc-svninfo.h" >&5
-+echo $ECHO_N "checking for ${srcdir}/src/gnome-utils/gnc-svninfo.h... $ECHO_C" >&6; }
- if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- test "$cross_compiling" = yes &&
-- { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
--$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
- if test -r "${srcdir}/src/gnome-utils/gnc-svninfo.h"; then
- eval "$as_ac_File=yes"
-@@ -24859,16 +24325,13 @@ else
- eval "$as_ac_File=no"
- fi
- fi
--ac_res=`eval 'as_val=${'$as_ac_File'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_File'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_File'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_File'}'` = yes; then
- :
- else
-- { { $as_echo "$as_me:$LINENO: error:
-+ { { echo "$as_me:$LINENO: error:
-
- It looks like you are NOT building from Subversion
- but I cannot find gnc-svninfo.h. Check your PATH
-@@ -24877,7 +24340,7 @@ Either that or contact gnucash-devel at gnucash.org because
- the tarball you downloaded is broken.
-
- " >&5
--$as_echo "$as_me: error:
-+echo "$as_me: error:
-
- It looks like you are NOT building from Subversion
- but I cannot find gnc-svninfo.h. Check your PATH
-@@ -24914,21 +24377,20 @@ fi
-
- for ac_header in X11/Xlib.h glob.h
- do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -24944,33 +24406,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -24984,52 +24445,51 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
-
- rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
- ## ---------------------------------------- ##
- ## Report this to gnucash-devel at gnucash.org ##
-@@ -25038,24 +24498,21 @@ _ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -25078,11 +24535,11 @@ fi
-
- for ac_func in chown gethostname getppid getuid gettimeofday gmtime_r
- do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -25135,42 +24592,35 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -25180,11 +24630,11 @@ done
-
- for ac_func in gethostid link
- do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -25237,42 +24687,35 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -25300,14 +24743,14 @@ fi
- BINRELOC_CFLAGS=
- BINRELOC_LIBS=
- if test "x$enable_binreloc" = "xauto"; then
-- { $as_echo "$as_me:$LINENO: checking for /proc/self/maps" >&5
--$as_echo_n "checking for /proc/self/maps... " >&6; }
-+ { echo "$as_me:$LINENO: checking for /proc/self/maps" >&5
-+echo $ECHO_N "checking for /proc/self/maps... $ECHO_C" >&6; }
- if test "${ac_cv_file__proc_self_maps+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- test "$cross_compiling" = yes &&
-- { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
--$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
- if test -r "/proc/self/maps"; then
- ac_cv_file__proc_self_maps=yes
-@@ -25315,13 +24758,13 @@ else
- ac_cv_file__proc_self_maps=no
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__proc_self_maps" >&5
--$as_echo "$ac_cv_file__proc_self_maps" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_file__proc_self_maps" >&5
-+echo "${ECHO_T}$ac_cv_file__proc_self_maps" >&6; }
-
-- { $as_echo "$as_me:$LINENO: checking whether everything is installed to the same prefix" >&5
--$as_echo_n "checking whether everything is installed to the same prefix... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether everything is installed to the same prefix" >&5
-+echo $ECHO_N "checking whether everything is installed to the same prefix... $ECHO_C" >&6; }
- if test "${br_cv_valid_prefixes+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-
- # datarootdir variables was introduced with autoconf-2.60
-@@ -25336,13 +24779,13 @@ else
- fi
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $br_cv_valid_prefixes" >&5
--$as_echo "$br_cv_valid_prefixes" >&6; }
-+{ echo "$as_me:$LINENO: result: $br_cv_valid_prefixes" >&5
-+echo "${ECHO_T}$br_cv_valid_prefixes" >&6; }
- fi
-- { $as_echo "$as_me:$LINENO: checking whether binary relocation support should be enabled" >&5
--$as_echo_n "checking whether binary relocation support should be enabled... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether binary relocation support should be enabled" >&5
-+echo $ECHO_N "checking whether binary relocation support should be enabled... $ECHO_C" >&6; }
- if test "${br_cv_binreloc+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test "x$enable_binreloc" = "xyes"; then
- br_cv_binreloc=yes
-@@ -25357,22 +24800,22 @@ else
- br_cv_binreloc=no
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $br_cv_binreloc" >&5
--$as_echo "$br_cv_binreloc" >&6; }
-+{ echo "$as_me:$LINENO: result: $br_cv_binreloc" >&5
-+echo "${ECHO_T}$br_cv_binreloc" >&6; }
-
- if test "x$br_cv_binreloc" = "xyes"; then
- BINRELOC_CFLAGS="-DENABLE_BINRELOC"
-
- cat >>confdefs.h <<\_ACEOF
--#define ENABLE_BINRELOC /**/
-+#define ENABLE_BINRELOC
- _ACEOF
-
- if test "x$enable_binreloc_threads" = "xyes"; then
-
--{ $as_echo "$as_me:$LINENO: checking for pthread_getspecific in -lpthread" >&5
--$as_echo_n "checking for pthread_getspecific in -lpthread... " >&6; }
-+{ echo "$as_me:$LINENO: checking for pthread_getspecific in -lpthread" >&5
-+echo $ECHO_N "checking for pthread_getspecific in -lpthread... $ECHO_C" >&6; }
- if test "${ac_cv_lib_pthread_pthread_getspecific+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpthread $LIBS"
-@@ -25404,37 +24847,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_pthread_pthread_getspecific=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_pthread_pthread_getspecific=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_getspecific" >&5
--$as_echo "$ac_cv_lib_pthread_pthread_getspecific" >&6; }
--if test "x$ac_cv_lib_pthread_pthread_getspecific" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_getspecific" >&5
-+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_getspecific" >&6; }
-+if test $ac_cv_lib_pthread_pthread_getspecific = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBPTHREAD 1
- _ACEOF
-@@ -25445,10 +24884,10 @@ fi
-
- fi
-
-- { $as_echo "$as_me:$LINENO: checking whether binary relocation should use threads" >&5
--$as_echo_n "checking whether binary relocation should use threads... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether binary relocation should use threads" >&5
-+echo $ECHO_N "checking whether binary relocation should use threads... $ECHO_C" >&6; }
- if test "${br_cv_binreloc_threads+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test "x$enable_binreloc_threads" = "xyes"; then
- if test "x$ac_cv_lib_pthread_pthread_getspecific" = "xyes"; then
-@@ -25460,8 +24899,8 @@ else
- br_cv_binreloc_threads=no
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $br_cv_binreloc_threads" >&5
--$as_echo "$br_cv_binreloc_threads" >&6; }
-+{ echo "$as_me:$LINENO: result: $br_cv_binreloc_threads" >&5
-+echo "${ECHO_T}$br_cv_binreloc_threads" >&6; }
-
- if test "x$br_cv_binreloc_threads" = "xyes"; then
- BINRELOC_LIBS="-lpthread"
-@@ -25488,10 +24927,10 @@ _ACEOF
-
- # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
-@@ -25506,7 +24945,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -25518,11 +24957,11 @@ esac
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -25530,10 +24969,10 @@ if test "x$PKG_CONFIG" = x; then
- # @*%&$ Ximian programmers renamed this application
- # Extract the first word of "pkgconfig", so it can be a program name with args.
- set dummy pkgconfig; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
-@@ -25548,7 +24987,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -25560,17 +24999,17 @@ esac
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
- if test "x$PKG_CONFIG" = x; then
-- { { $as_echo "$as_me:$LINENO: error: Could not find the pkg-config (or pkgconfig) program." >&5
--$as_echo "$as_me: error: Could not find the pkg-config (or pkgconfig) program." >&2;}
-+ { { echo "$as_me:$LINENO: error: Could not find the pkg-config (or pkgconfig) program." >&5
-+echo "$as_me: error: Could not find the pkg-config (or pkgconfig) program." >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-@@ -25614,10 +25053,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
- set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
-@@ -25632,7 +25071,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -25644,11 +25083,11 @@ esac
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -25657,10 +25096,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
-@@ -25675,7 +25114,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -25687,11 +25126,11 @@ esac
- fi
- ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
- if test -n "$ac_pt_PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
--$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_pt_PKG_CONFIG" = x; then
-@@ -25699,8 +25138,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
-@@ -25712,14 +25155,14 @@ fi
- fi
- if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.16
-- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
--$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- PKG_CONFIG=""
- fi
-
-@@ -25733,8 +25176,8 @@ fi
- fi
-
- min_glib_version=2.6.0
-- { $as_echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
--$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }
-+ { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
-+echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; }
-
- if test x$PKG_CONFIG != xno ; then
- ## don't try to run the test against uninstalled libtool libs
-@@ -25788,8 +25231,9 @@ main ()
- {
- int major, minor, micro;
- char *tmp_version;
-+ int ignored;
-
-- system ("touch conf.glibtest");
-+ ignored = system ("touch conf.glibtest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = g_strdup("$min_glib_version");
-@@ -25857,32 +25301,29 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
- else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
- no_glib=yes
- fi
--rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-
-@@ -25892,12 +25333,12 @@ fi
- fi
- fi
- if test "x$no_glib" = x ; then
-- { $as_echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
--$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }
-+ { echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
-+echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }
- :
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** A new enough version of pkg-config was not found."
- echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-@@ -25934,21 +25375,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GLIB or finding the wrong"
- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-@@ -25959,14 +25397,13 @@ $as_echo "$ac_try_echo") >&5
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- CFLAGS="$ac_save_CFLAGS"
-@@ -25978,11 +25415,11 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- GLIB_GENMARSHAL=""
- GOBJECT_QUERY=""
- GLIB_MKENUMS=""
-- { { $as_echo "$as_me:$LINENO: error:
-+ { { echo "$as_me:$LINENO: error:
- *** GLIB >= 2.6 is required to build Gnucash; please make sure you have the
- *** development headers installed. The latest version of GLIB is
- *** always available at ftp://ftp.gnome.org/pub/gnome/sources/glib/." >&5
--$as_echo "$as_me: error:
-+echo "$as_me: error:
- *** GLIB >= 2.6 is required to build Gnucash; please make sure you have the
- *** development headers installed. The latest version of GLIB is
- *** always available at ftp://ftp.gnome.org/pub/gnome/sources/glib/." >&2;}
-@@ -25998,17 +25435,17 @@ $as_echo "$as_me: error:
-
- if test ${no_glib}x = yesx
- then
-- { { $as_echo "$as_me:$LINENO: error: Cannot find glib. Check config.log" >&5
--$as_echo "$as_me: error: Cannot find glib. Check config.log" >&2;}
-+ { { echo "$as_me:$LINENO: error: Cannot find glib. Check config.log" >&5
-+echo "$as_me: error: Cannot find glib. Check config.log" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
--{ $as_echo "$as_me:$LINENO: checking for GLIB - version >= 2.8.0" >&5
--$as_echo_n "checking for GLIB - version >= 2.8.0... " >&6; }
-+{ echo "$as_me:$LINENO: checking for GLIB - version >= 2.8.0" >&5
-+echo $ECHO_N "checking for GLIB - version >= 2.8.0... $ECHO_C" >&6; }
- if $PKG_CONFIG 'glib-2.0 >= 2.8.0'
- then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GLIB_2_8 1
-@@ -26016,11 +25453,11 @@ _ACEOF
-
- HAVE_GLIB_2_8=yes
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- if test "x${native_win32}" = "xyes"; then
-- { { $as_echo "$as_me:$LINENO: error: *** GLIB >= 2.8 is required to build Gnucash on Windows." >&5
--$as_echo "$as_me: error: *** GLIB >= 2.8 is required to build Gnucash on Windows." >&2;}
-+ { { echo "$as_me:$LINENO: error: *** GLIB >= 2.8 is required to build Gnucash on Windows." >&5
-+echo "$as_me: error: *** GLIB >= 2.8 is required to build Gnucash on Windows." >&2;}
- { (exit 1); exit 1; }; }
- else
- GLIB26_LIBS="$GLIB_LIBS"
-@@ -26038,12 +25475,12 @@ else
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking for GLIB - version >= 2.9.0" >&5
--$as_echo_n "checking for GLIB - version >= 2.9.0... " >&6; }
-+{ echo "$as_me:$LINENO: checking for GLIB - version >= 2.9.0" >&5
-+echo $ECHO_N "checking for GLIB - version >= 2.9.0... $ECHO_C" >&6; }
- if $PKG_CONFIG 'glib-2.0 >= 2.9.0'
- then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GLIB29 1
-@@ -26051,16 +25488,16 @@ _ACEOF
-
- HAVE_GLIB29=yes
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
--{ $as_echo "$as_me:$LINENO: checking for GLIB - version >= 2.12.0" >&5
--$as_echo_n "checking for GLIB - version >= 2.12.0... " >&6; }
-+{ echo "$as_me:$LINENO: checking for GLIB - version >= 2.12.0" >&5
-+echo $ECHO_N "checking for GLIB - version >= 2.12.0... $ECHO_C" >&6; }
- if $PKG_CONFIG 'glib-2.0 >= 2.12.0'
- then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GLIB_2_12 1
-@@ -26068,8 +25505,8 @@ _ACEOF
-
- HAVE_GLIB_2_12=yes
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- if test "x$HAVE_GLIB_2_8" = "xyes"; then
- HAVE_GLIB_2_8_TRUE=
-@@ -26080,16 +25517,16 @@ else
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking for untested GLIB versions (glib >= 2.13.0)" >&5
--$as_echo_n "checking for untested GLIB versions (glib >= 2.13.0)... " >&6; }
-+{ echo "$as_me:$LINENO: checking for untested GLIB versions (glib >= 2.13.0)" >&5
-+echo $ECHO_N "checking for untested GLIB versions (glib >= 2.13.0)... $ECHO_C" >&6; }
- if $PKG_CONFIG 'glib-2.0 >= 2.13.0'
- then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- HAVE_UNTESTED_GLIB=yes
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -26101,21 +25538,20 @@ fi
-
- for ac_header in dlfcn.h dl.h utmp.h locale.h mcheck.h unistd.h wctype.h
- do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -26131,33 +25567,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -26171,52 +25606,51 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
-
- rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
- ## ---------------------------------------- ##
- ## Report this to gnucash-devel at gnucash.org ##
-@@ -26225,24 +25659,21 @@ _ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -26256,11 +25687,11 @@ DL_LIB=
-
- for ac_func in dlsym
- do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -26313,50 +25744,43 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- else
-
-- { $as_echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5
--$as_echo_n "checking for dlsym in -ldl... " >&6; }
-+ { echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5
-+echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlsym+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
-@@ -26388,44 +25812,40 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlsym=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlsym=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
--$as_echo "$ac_cv_lib_dl_dlsym" >&6; }
--if test "x$ac_cv_lib_dl_dlsym" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6; }
-+if test $ac_cv_lib_dl_dlsym = yes; then
- DL_LIB="-ldl"
- else
-
-- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--$as_echo_n "checking for shl_load in -ldld... " >&6; }
-+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld $LIBS"
-@@ -26457,48 +25877,44 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_shl_load=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_shl_load=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
--if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-+if test $ac_cv_lib_dld_shl_load = yes; then
- DL_LIB="-ldld"
- else
-
-
- for ac_func in dlsym
- do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -26551,42 +25967,35 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- DL_LIB=""
- fi
-@@ -26608,11 +26017,11 @@ LIBS="$LIBS $DL_LIB"
-
- for ac_func in dlerror
- do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -26665,42 +26074,35 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -26719,21 +26121,21 @@ LIBS="$oLIBS"
-
-
-
--{ $as_echo "$as_me:$LINENO: checking for darwin" >&5
--$as_echo_n "checking for darwin... " >&6; }
-+{ echo "$as_me:$LINENO: checking for darwin" >&5
-+echo $ECHO_N "checking for darwin... $ECHO_C" >&6; }
- case $host_os in
- rhapsody* | darwin1*)
-- { $as_echo "$as_me:$LINENO: result: yes, but too old" >&5
--$as_echo "yes, but too old" >&6; }
-- { { $as_echo "$as_me:$LINENO: error: This platform is not supported, please
-+ { echo "$as_me:$LINENO: result: yes, but too old" >&5
-+echo "${ECHO_T}yes, but too old" >&6; }
-+ { { echo "$as_me:$LINENO: error: This platform is not supported, please
- update to latest darwin" >&5
--$as_echo "$as_me: error: This platform is not supported, please
-+echo "$as_me: error: This platform is not supported, please
- update to latest darwin" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- darwin*)
-- { $as_echo "$as_me:$LINENO: result: yes, moving on..." >&5
--$as_echo "yes, moving on..." >&6; }
-+ { echo "$as_me:$LINENO: result: yes, moving on..." >&5
-+echo "${ECHO_T}yes, moving on..." >&6; }
- # AC_CHECK_HEADERS(popt.h)
- # AC_MSG_RESULT([yes, patching libtool to always build dylibs])
- # mv libtool libtool.old
-@@ -26744,11 +26146,134 @@ $as_echo "yes, moving on..." >&6; }
- # rm libtool.old
- ;;
- *)
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- ;;
- esac
-
-+### --------------------------------------------------------------------------
-+### Check to see if GDK uses the quartz backend and if we can use
-+### MacOSX integration
-+_gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
-+ if test x$_gdk_tgt = xquartz; then
-+ GDK_TARGET_QUARTZ_TRUE=
-+ GDK_TARGET_QUARTZ_FALSE='#'
-+else
-+ GDK_TARGET_QUARTZ_TRUE='#'
-+ GDK_TARGET_QUARTZ_FALSE=
-+fi
-+
-+if test "x$_gdk_tgt" = xquartz; then
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for IGE_MAC" >&5
-+echo $ECHO_N "checking for IGE_MAC... $ECHO_C" >&6; }
-+
-+if test -n "$IGE_MAC_CFLAGS"; then
-+ pkg_cv_IGE_MAC_CFLAGS="$IGE_MAC_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_IGE_MAC_CFLAGS=`$PKG_CONFIG --cflags "ige-mac-integration" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$IGE_MAC_LIBS"; then
-+ pkg_cv_IGE_MAC_LIBS="$IGE_MAC_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_IGE_MAC_LIBS=`$PKG_CONFIG --libs "ige-mac-integration" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ige-mac-integration" 2>&1`
-+ else
-+ IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ige-mac-integration" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$IGE_MAC_PKG_ERRORS" >&5
-+
-+ { { echo "$as_me:$LINENO: error: Package requirements (ige-mac-integration) were not met:
-+
-+$IGE_MAC_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables IGE_MAC_CFLAGS
-+and IGE_MAC_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (ige-mac-integration) were not met:
-+
-+$IGE_MAC_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables IGE_MAC_CFLAGS
-+and IGE_MAC_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+elif test $pkg_failed = untried; then
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables IGE_MAC_CFLAGS
-+and IGE_MAC_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables IGE_MAC_CFLAGS
-+and IGE_MAC_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ IGE_MAC_CFLAGS=$pkg_cv_IGE_MAC_CFLAGS
-+ IGE_MAC_LIBS=$pkg_cv_IGE_MAC_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ :
-+fi
-+
-+
-+fi
-
- ### --------------------------------------------------------------------------
- ### Guile version checks (should this be something other than the Gnome check?)
-@@ -26767,10 +26292,10 @@ GUILE_LIBS=""
- saved_cppflags="$CPPFLAGS"
- LDFLAGS="$LDFLAGS $GNOME_LIBDIR"
-
-- { $as_echo "$as_me:$LINENO: checking for qt_null in -lqthreads" >&5
--$as_echo_n "checking for qt_null in -lqthreads... " >&6; }
-+ { echo "$as_me:$LINENO: checking for qt_null in -lqthreads" >&5
-+echo $ECHO_N "checking for qt_null in -lqthreads... $ECHO_C" >&6; }
- if test "${ac_cv_lib_qthreads_qt_null+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lqthreads $LIBS $LIBS"
-@@ -26802,46 +26327,42 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_qthreads_qt_null=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_qthreads_qt_null=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_qthreads_qt_null" >&5
--$as_echo "$ac_cv_lib_qthreads_qt_null" >&6; }
--if test "x$ac_cv_lib_qthreads_qt_null" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_qthreads_qt_null" >&5
-+echo "${ECHO_T}$ac_cv_lib_qthreads_qt_null" >&6; }
-+if test $ac_cv_lib_qthreads_qt_null = yes; then
-
- QTTHREADS_LIB="-lqthreads"
-
- else
-
-- { $as_echo "$as_me:$LINENO: checking for qt_null in -lqt" >&5
--$as_echo_n "checking for qt_null in -lqt... " >&6; }
-+ { echo "$as_me:$LINENO: checking for qt_null in -lqt" >&5
-+echo $ECHO_N "checking for qt_null in -lqt... $ECHO_C" >&6; }
- if test "${ac_cv_lib_qt_qt_null+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lqt $LIBS"
-@@ -26873,37 +26394,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_qt_qt_null=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_qt_qt_null=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_qt_qt_null" >&5
--$as_echo "$ac_cv_lib_qt_qt_null" >&6; }
--if test "x$ac_cv_lib_qt_qt_null" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_qt_qt_null" >&5
-+echo "${ECHO_T}$ac_cv_lib_qt_qt_null" >&6; }
-+if test $ac_cv_lib_qt_qt_null = yes; then
- QTTHREADS_LIB="-lqt"
- fi
-
-@@ -26912,10 +26429,10 @@ fi
-
-
-
-- { $as_echo "$as_me:$LINENO: checking for main in -ltermcap" >&5
--$as_echo_n "checking for main in -ltermcap... " >&6; }
-+ { echo "$as_me:$LINENO: checking for main in -ltermcap" >&5
-+echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6; }
- if test "${ac_cv_lib_termcap_main+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ltermcap $LIBS"
-@@ -26941,44 +26458,40 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_termcap_main=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_termcap_main=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5
--$as_echo "$ac_cv_lib_termcap_main" >&6; }
--if test "x$ac_cv_lib_termcap_main" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6; }
-+if test $ac_cv_lib_termcap_main = yes; then
- TERMCAP_LIB="-ltermcap"
- fi
-
-- { $as_echo "$as_me:$LINENO: checking for main in -lreadline" >&5
--$as_echo_n "checking for main in -lreadline... " >&6; }
-+ { echo "$as_me:$LINENO: checking for main in -lreadline" >&5
-+echo $ECHO_N "checking for main in -lreadline... $ECHO_C" >&6; }
- if test "${ac_cv_lib_readline_main+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lreadline $TERMCAP_LIB $LIBS"
-@@ -27004,37 +26517,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_readline_main=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_readline_main=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_main" >&5
--$as_echo "$ac_cv_lib_readline_main" >&6; }
--if test "x$ac_cv_lib_readline_main" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_readline_main" >&6; }
-+if test $ac_cv_lib_readline_main = yes; then
- READLINE_LIB="-lreadline"
- fi
-
-@@ -27050,10 +26559,10 @@ fi
-
- # Extract the first word of "$name_build_guile", so it can be a program name with args.
- set dummy $name_build_guile; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_BUILD_GUILE+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$BUILD_GUILE"; then
- ac_cv_prog_BUILD_GUILE="$BUILD_GUILE" # Let the user override the test.
-@@ -27066,7 +26575,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_BUILD_GUILE="yes"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -27078,24 +26587,24 @@ fi
- fi
- BUILD_GUILE=$ac_cv_prog_BUILD_GUILE
- if test -n "$BUILD_GUILE"; then
-- { $as_echo "$as_me:$LINENO: result: $BUILD_GUILE" >&5
--$as_echo "$BUILD_GUILE" >&6; }
-+ { echo "$as_me:$LINENO: result: $BUILD_GUILE" >&5
-+echo "${ECHO_T}$BUILD_GUILE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-
- if test "x$BUILD_GUILE" = "xyes"; then
-- { $as_echo "$as_me:$LINENO: checking whether $name_build_guile works" >&5
--$as_echo_n "checking whether $name_build_guile works... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether $name_build_guile works" >&5
-+echo $ECHO_N "checking whether $name_build_guile works... $ECHO_C" >&6; }
- if test x`$name_build_guile --version >/dev/null 2>&1 || \
- echo no` = xno; then
- BUILD_GUILE=no
- fi
-- { $as_echo "$as_me:$LINENO: result: $BUILD_GUILE" >&5
--$as_echo "$BUILD_GUILE" >&6; }
-+ { echo "$as_me:$LINENO: result: $BUILD_GUILE" >&5
-+echo "${ECHO_T}$BUILD_GUILE" >&6; }
- else
-
- if test "x$cross_compiling" = "xyes" ; then
-@@ -27106,10 +26615,10 @@ $as_echo "$BUILD_GUILE" >&6; }
-
- # Extract the first word of "$name_build_guile", so it can be a program name with args.
- set dummy $name_build_guile; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_BUILD_GUILE+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$BUILD_GUILE"; then
- ac_cv_prog_BUILD_GUILE="$BUILD_GUILE" # Let the user override the test.
-@@ -27122,7 +26631,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_BUILD_GUILE="yes"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -27134,32 +26643,32 @@ fi
- fi
- BUILD_GUILE=$ac_cv_prog_BUILD_GUILE
- if test -n "$BUILD_GUILE"; then
-- { $as_echo "$as_me:$LINENO: result: $BUILD_GUILE" >&5
--$as_echo "$BUILD_GUILE" >&6; }
-+ { echo "$as_me:$LINENO: result: $BUILD_GUILE" >&5
-+echo "${ECHO_T}$BUILD_GUILE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-
- if test "x$BUILD_GUILE" = "xyes"; then
-- { $as_echo "$as_me:$LINENO: checking whether $name_build_guile works" >&5
--$as_echo_n "checking whether $name_build_guile works... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether $name_build_guile works" >&5
-+echo $ECHO_N "checking whether $name_build_guile works... $ECHO_C" >&6; }
- if test x`$name_build_guile --version >/dev/null 2>&1 || \
- echo no` = xno; then
- BUILD_GUILE=no
- fi
-- { $as_echo "$as_me:$LINENO: result: $BUILD_GUILE" >&5
--$as_echo "$BUILD_GUILE" >&6; }
-+ { echo "$as_me:$LINENO: result: $BUILD_GUILE" >&5
-+echo "${ECHO_T}$BUILD_GUILE" >&6; }
- fi
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking for sin in -lm" >&5
--$as_echo_n "checking for sin in -lm... " >&6; }
-+{ echo "$as_me:$LINENO: checking for sin in -lm" >&5
-+echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6; }
- if test "${ac_cv_lib_m_sin+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lm $LIBS"
-@@ -27191,37 +26700,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_m_sin=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_m_sin=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sin" >&5
--$as_echo "$ac_cv_lib_m_sin" >&6; }
--if test "x$ac_cv_lib_m_sin" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_sin" >&5
-+echo "${ECHO_T}$ac_cv_lib_m_sin" >&6; }
-+if test $ac_cv_lib_m_sin = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBM 1
- _ACEOF
-@@ -27232,23 +26737,23 @@ fi
-
-
- if test "x$BUILD_GUILE" = "xyes"; then
-- { $as_echo "$as_me:$LINENO: checking for guile libraries" >&5
--$as_echo_n "checking for guile libraries... " >&6; }
-+ { echo "$as_me:$LINENO: checking for guile libraries" >&5
-+echo $ECHO_N "checking for guile libraries... $ECHO_C" >&6; }
- GUILE_LIBS="`$name_build_guile link`"
-- { $as_echo "$as_me:$LINENO: result: $GUILE_LIBS" >&5
--$as_echo "$GUILE_LIBS" >&6; }
-- { $as_echo "$as_me:$LINENO: checking for guile headers" >&5
--$as_echo_n "checking for guile headers... " >&6; }
-+ { echo "$as_me:$LINENO: result: $GUILE_LIBS" >&5
-+echo "${ECHO_T}$GUILE_LIBS" >&6; }
-+ { echo "$as_me:$LINENO: checking for guile headers" >&5
-+echo $ECHO_N "checking for guile headers... $ECHO_C" >&6; }
- GUILE_INCS="`$name_build_guile compile`"
-- { $as_echo "$as_me:$LINENO: result: $GUILE_INCS" >&5
--$as_echo "$GUILE_INCS" >&6; }
-+ { echo "$as_me:$LINENO: result: $GUILE_INCS" >&5
-+echo "${ECHO_T}$GUILE_INCS" >&6; }
- else
- GUILE_LIBS="$GNOME_LIBDIR"
- GUILE_INCS="$GNOME_INCLUDEDIR"
-- { $as_echo "$as_me:$LINENO: checking for main in -lrx" >&5
--$as_echo_n "checking for main in -lrx... " >&6; }
-+ { echo "$as_me:$LINENO: checking for main in -lrx" >&5
-+echo $ECHO_N "checking for main in -lrx... $ECHO_C" >&6; }
- if test "${ac_cv_lib_rx_main+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lrx $LIBS"
-@@ -27274,44 +26779,40 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_rx_main=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_rx_main=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rx_main" >&5
--$as_echo "$ac_cv_lib_rx_main" >&6; }
--if test "x$ac_cv_lib_rx_main" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_rx_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_rx_main" >&6; }
-+if test $ac_cv_lib_rx_main = yes; then
- GUILE_LIBS="-lrx $GUILE_LIBS"
- fi
-
-- { $as_echo "$as_me:$LINENO: checking for qt_null in -lqt" >&5
--$as_echo_n "checking for qt_null in -lqt... " >&6; }
-+ { echo "$as_me:$LINENO: checking for qt_null in -lqt" >&5
-+echo $ECHO_N "checking for qt_null in -lqt... $ECHO_C" >&6; }
- if test "${ac_cv_lib_qt_qt_null+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lqt $LIBS"
-@@ -27343,44 +26844,40 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_qt_qt_null=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_qt_qt_null=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_qt_qt_null" >&5
--$as_echo "$ac_cv_lib_qt_qt_null" >&6; }
--if test "x$ac_cv_lib_qt_qt_null" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_qt_qt_null" >&5
-+echo "${ECHO_T}$ac_cv_lib_qt_qt_null" >&6; }
-+if test $ac_cv_lib_qt_qt_null = yes; then
- GUILE_LIBS="-lqt $GUILE_LIBS"
- fi
-
-- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
-@@ -27412,44 +26909,40 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-+if test $ac_cv_lib_dl_dlopen = yes; then
- GUILE_LIBS="-ldl $GUILE_LIBS"
- fi
-
-- { $as_echo "$as_me:$LINENO: checking for t_accept in -lnsl" >&5
--$as_echo_n "checking for t_accept in -lnsl... " >&6; }
-+ { echo "$as_me:$LINENO: checking for t_accept in -lnsl" >&5
-+echo $ECHO_N "checking for t_accept in -lnsl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nsl_t_accept+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl $LIBS"
-@@ -27481,44 +26974,40 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_nsl_t_accept=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_nsl_t_accept=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_t_accept" >&5
--$as_echo "$ac_cv_lib_nsl_t_accept" >&6; }
--if test "x$ac_cv_lib_nsl_t_accept" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_t_accept" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_t_accept" >&6; }
-+if test $ac_cv_lib_nsl_t_accept = yes; then
- GUILE_LIBS="$GUILE_LIBS -lnsl"
- fi
-
-- { $as_echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
--$as_echo_n "checking for socket in -lsocket... " >&6; }
-+ { echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
-+echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; }
- if test "${ac_cv_lib_socket_socket+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $LIBS"
-@@ -27550,37 +27039,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_socket_socket=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_socket_socket=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
--$as_echo "$ac_cv_lib_socket_socket" >&6; }
--if test "x$ac_cv_lib_socket_socket" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; }
-+if test $ac_cv_lib_socket_socket = yes; then
- GUILE_LIBS="$GUILE_LIBS -lsocket"
- fi
-
-@@ -27594,8 +27079,8 @@ fi
- LIBS="$LIBS $GUILE_LIBS"
- CPPFLAGS="$saved_cppflags $GUILE_INCS"
-
-- { $as_echo "$as_me:$LINENO: checking whether guile works" >&5
--$as_echo_n "checking whether guile works... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether guile works" >&5
-+echo $ECHO_N "checking whether guile works... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -27623,21 +27108,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- ac_cv_guile_found=yes
-
-@@ -27647,7 +27129,7 @@ _ACEOF
-
-
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-@@ -27655,20 +27137,19 @@ sed 's/^/| /' conftest.$ac_ext >&5
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-- { $as_echo "$as_me:$LINENO: result: $ac_cv_guile_found" >&5
--$as_echo "$ac_cv_guile_found" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_cv_guile_found" >&5
-+echo "${ECHO_T}$ac_cv_guile_found" >&6; }
-
- if test x$ac_cv_guile_found = xno ; then
- if test x = xfail ; then
-- { { $as_echo "$as_me:$LINENO: error: Can not find Guile on this system" >&5
--$as_echo "$as_me: error: Can not find Guile on this system" >&2;}
-+ { { echo "$as_me:$LINENO: error: Can not find Guile on this system" >&5
-+echo "$as_me: error: Can not find Guile on this system" >&2;}
- { (exit 1); exit 1; }; }
- else
-- { $as_echo "$as_me:$LINENO: WARNING: Can not find Guile on this system" >&5
--$as_echo "$as_me: WARNING: Can not find Guile on this system" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: Can not find Guile on this system" >&5
-+echo "$as_me: WARNING: Can not find Guile on this system" >&2;}
- fi
- ac_cv_guile_found=no
- GUILE_LIBS= GUILE_INCS=
-@@ -27713,10 +27194,10 @@ fi
- if test x${GUILE} = x ; then
- # Extract the first word of "guile", so it can be a program name with args.
- set dummy guile; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GUILE+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $GUILE in
- [\\/]* | ?:[\\/]*)
-@@ -27731,7 +27212,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GUILE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -27744,11 +27225,11 @@ esac
- fi
- GUILE=$ac_cv_path_GUILE
- if test -n "$GUILE"; then
-- { $as_echo "$as_me:$LINENO: result: $GUILE" >&5
--$as_echo "$GUILE" >&6; }
-+ { echo "$as_me:$LINENO: result: $GUILE" >&5
-+echo "${ECHO_T}$GUILE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -27759,8 +27240,8 @@ version_ok=
- min_guile_version=1.6.0
- max_guile_version=99.99.99
-
--{ $as_echo "$as_me:$LINENO: checking for guile - ${min_guile_version} <= version < ${max_guile_version}" >&5
--$as_echo_n "checking for guile - ${min_guile_version} <= version < ${max_guile_version}... " >&6; }
-+{ echo "$as_me:$LINENO: checking for guile - ${min_guile_version} <= version < ${max_guile_version}" >&5
-+echo $ECHO_N "checking for guile - ${min_guile_version} <= version < ${max_guile_version}... $ECHO_C" >&6; }
-
- if test "x${BUILD_GUILE}" != x -a "x${BUILD_GUILE}" != xno ; then
- guile_version=`${name_build_guile} --version 2>&1`
-@@ -27806,22 +27287,22 @@ if test "x${BUILD_GUILE}" != x -a "x${BUILD_GUILE}" != xno ; then
- fi
-
- if test -n "$version_ok"; then
-- { $as_echo "$as_me:$LINENO: result: yes: $guile_vers_string" >&5
--$as_echo "yes: $guile_vers_string" >&6; }
-+ { echo "$as_me:$LINENO: result: yes: $guile_vers_string" >&5
-+echo "${ECHO_T}yes: $guile_vers_string" >&6; }
- true
-
- else
-- { $as_echo "$as_me:$LINENO: result: no: $guile_vers_string" >&5
--$as_echo "no: $guile_vers_string" >&6; }
-- { $as_echo "$as_me:$LINENO: WARNING: guile version check failed" >&5
--$as_echo "$as_me: WARNING: guile version check failed" >&2;}
-- { { $as_echo "$as_me:$LINENO: error:
-+ { echo "$as_me:$LINENO: result: no: $guile_vers_string" >&5
-+echo "${ECHO_T}no: $guile_vers_string" >&6; }
-+ { echo "$as_me:$LINENO: WARNING: guile version check failed" >&5
-+echo "$as_me: WARNING: guile version check failed" >&2;}
-+ { { echo "$as_me:$LINENO: error:
-
- guile does not appear to be installed correctly, or is not in the
- correct version range. Perhaps you have not installed the guile
- development packages? Gnucash requires at least version 1.6 to build.
- " >&5
--$as_echo "$as_me: error:
-+echo "$as_me: error:
-
- guile does not appear to be installed correctly, or is not in the
- correct version range. Perhaps you have not installed the guile
-@@ -27852,10 +27333,10 @@ _ACEOF
- if test x${GUILE} = x ; then
- # Extract the first word of "guile", so it can be a program name with args.
- set dummy guile; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GUILE+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $GUILE in
- [\\/]* | ?:[\\/]*)
-@@ -27870,7 +27351,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GUILE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -27883,11 +27364,11 @@ esac
- fi
- GUILE=$ac_cv_path_GUILE
- if test -n "$GUILE"; then
-- { $as_echo "$as_me:$LINENO: result: $GUILE" >&5
--$as_echo "$GUILE" >&6; }
-+ { echo "$as_me:$LINENO: result: $GUILE" >&5
-+echo "${ECHO_T}$GUILE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -27898,8 +27379,8 @@ version_ok=
- min_guile_version=1.8.0
- max_guile_version=99.99.99
-
--{ $as_echo "$as_me:$LINENO: checking for guile - ${min_guile_version} <= version < ${max_guile_version}" >&5
--$as_echo_n "checking for guile - ${min_guile_version} <= version < ${max_guile_version}... " >&6; }
-+{ echo "$as_me:$LINENO: checking for guile - ${min_guile_version} <= version < ${max_guile_version}" >&5
-+echo $ECHO_N "checking for guile - ${min_guile_version} <= version < ${max_guile_version}... $ECHO_C" >&6; }
-
- if test "x${BUILD_GUILE}" != x -a "x${BUILD_GUILE}" != xno ; then
- guile_version=`${name_build_guile} --version 2>&1`
-@@ -27945,8 +27426,8 @@ if test "x${BUILD_GUILE}" != x -a "x${BUILD_GUILE}" != xno ; then
- fi
-
- if test -n "$version_ok"; then
-- { $as_echo "$as_me:$LINENO: result: yes: $guile_vers_string" >&5
--$as_echo "yes: $guile_vers_string" >&6; }
-+ { echo "$as_me:$LINENO: result: yes: $guile_vers_string" >&5
-+echo "${ECHO_T}yes: $guile_vers_string" >&6; }
-
-
- cat >>confdefs.h <<\_ACEOF
-@@ -27956,8 +27437,8 @@ _ACEOF
-
-
- else
-- { $as_echo "$as_me:$LINENO: result: no: $guile_vers_string" >&5
--$as_echo "no: $guile_vers_string" >&6; }
-+ { echo "$as_me:$LINENO: result: no: $guile_vers_string" >&5
-+echo "${ECHO_T}no: $guile_vers_string" >&6; }
- true
- fi
-
-@@ -27972,21 +27453,21 @@ fi
- CFLAGS=$GIVEN_CFLAGS
-
-
--{ $as_echo "$as_me:$LINENO: checking for SLIB support" >&5
--$as_echo_n "checking for SLIB support... " >&6; }
-+{ echo "$as_me:$LINENO: checking for SLIB support" >&5
-+echo $ECHO_N "checking for SLIB support... $ECHO_C" >&6; }
- if ${GUILE} -c "(use-modules (ice-9 slib)) (require 'printf)" > /dev/null 2>&1
- then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- { { $as_echo "$as_me:$LINENO: error:
-+ { { echo "$as_me:$LINENO: error:
-
- Cannot find SLIB. Are you sure you have it installed?
- See http://bugzilla.gnome.org/show_bug.cgi?id=347922
- and http://bugzilla.gnome.org/show_bug.cgi?id=483631
-
- " >&5
--$as_echo "$as_me: error:
-+echo "$as_me: error:
-
- Cannot find SLIB. Are you sure you have it installed?
- See http://bugzilla.gnome.org/show_bug.cgi?id=347922
-@@ -27997,20 +27478,20 @@ $as_echo "$as_me: error:
- fi
-
- ### Check size of long_long - some guile's are broken.
--{ $as_echo "$as_me:$LINENO: checking if guile long_long is at least as big as gint64" >&5
--$as_echo_n "checking if guile long_long is at least as big as gint64... " >&6; }
-+{ echo "$as_me:$LINENO: checking if guile long_long is at least as big as gint64" >&5
-+echo $ECHO_N "checking if guile long_long is at least as big as gint64... $ECHO_C" >&6; }
- GNC_OLDCFLAGS="$CFLAGS"
- GNC_OLDLDFLAGS="$LDFLAGS"
- CFLAGS="${GNOME_CFLAGS} ${GUILE_INCS} ${CFLAGS} ${GLIB_CFLAGS}"
- LDFLAGS="${LDFLAGS} ${GLIB_LIBS}"
- if test "$cross_compiling" = yes; then
-
-- { $as_echo "$as_me:$LINENO: result: assuming yes" >&5
--$as_echo "assuming yes" >&6; }
-- { $as_echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
--$as_echo_n "checking for scm_long_long2num in -lguile... " >&6; }
-+ { echo "$as_me:$LINENO: result: assuming yes" >&5
-+echo "${ECHO_T}assuming yes" >&6; }
-+ { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
-+echo $ECHO_N "checking for scm_long_long2num in -lguile... $ECHO_C" >&6; }
- if test "${ac_cv_lib_guile_scm_long_long2num+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lguile $LIBS"
-@@ -28042,37 +27523,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_guile_scm_long_long2num=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_guile_scm_long_long2num=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_guile_scm_long_long2num" >&5
--$as_echo "$ac_cv_lib_guile_scm_long_long2num" >&6; }
--if test "x$ac_cv_lib_guile_scm_long_long2num" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_guile_scm_long_long2num" >&5
-+echo "${ECHO_T}$ac_cv_lib_guile_scm_long_long2num" >&6; }
-+if test $ac_cv_lib_guile_scm_long_long2num = yes; then
-
- cat >>confdefs.h <<\_ACEOF
- #define GUILE_LONG_LONG_OK 1
-@@ -28102,29 +27579,27 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- { $as_echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
--$as_echo_n "checking for scm_long_long2num in -lguile... " >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
-+echo $ECHO_N "checking for scm_long_long2num in -lguile... $ECHO_C" >&6; }
- if test "${ac_cv_lib_guile_scm_long_long2num+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lguile $LIBS"
-@@ -28156,37 +27631,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_guile_scm_long_long2num=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_guile_scm_long_long2num=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_guile_scm_long_long2num" >&5
--$as_echo "$ac_cv_lib_guile_scm_long_long2num" >&6; }
--if test "x$ac_cv_lib_guile_scm_long_long2num" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_guile_scm_long_long2num" >&5
-+echo "${ECHO_T}$ac_cv_lib_guile_scm_long_long2num" >&6; }
-+if test $ac_cv_lib_guile_scm_long_long2num = yes; then
-
- cat >>confdefs.h <<\_ACEOF
- #define GUILE_LONG_LONG_OK 1
-@@ -28196,17 +27667,16 @@ fi
-
-
- else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
- fi
--rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-
-@@ -28217,16 +27687,16 @@ LDFLAGS="$GNC_OLDLDFLAGS"
- # One of the places this is critical is in gnc_scm_to_gint64 and inverse.
- # However, I'm sure we require this elsewhere, so don't remove this test
- # unless you've done sufficient code review/testing.
--{ $as_echo "$as_me:$LINENO: checking if unsigned long is at least as big as guint32" >&5
--$as_echo_n "checking if unsigned long is at least as big as guint32... " >&6; }
-+{ echo "$as_me:$LINENO: checking if unsigned long is at least as big as guint32" >&5
-+echo $ECHO_N "checking if unsigned long is at least as big as guint32... $ECHO_C" >&6; }
- GNC_OLDCFLAGS="$CFLAGS"
- GNC_OLDLDFLAGS="$LDFLAGS"
- CFLAGS="${GNOME_CFLAGS} ${GUILE_INCS} ${CFLAGS} ${GLIB_CFLAGS}"
- LDFLAGS="${LDFLAGS} ${GLIB_LIBS}"
- if test "$cross_compiling" = yes; then
-
-- { $as_echo "$as_me:$LINENO: result: assuming yes" >&5
--$as_echo "assuming yes" >&6; }
-+ { echo "$as_me:$LINENO: result: assuming yes" >&5
-+echo "${ECHO_T}assuming yes" >&6; }
-
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -28248,41 +27718,38 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- { { $as_echo "$as_me:$LINENO: error: cannot continue" >&5
--$as_echo "$as_me: error: cannot continue" >&2;}
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ { { echo "$as_me:$LINENO: error: cannot continue" >&5
-+echo "$as_me: error: cannot continue" >&2;}
- { (exit size of unsigned long too small.); exit size of unsigned long too small.; }; }
-
- fi
--rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-
-@@ -28299,16 +27766,16 @@ GNC_ADD_ON_SRFIS=""
- for f in ${srcdir}/lib/srfi/srfi-*.scm
- do
- srfi=`echo $f | sed 's%.*/%%' | sed 's/.scm//'`
-- { $as_echo "$as_me:$LINENO: checking if guile needs our copy of ${srfi}" >&5
--$as_echo_n "checking if guile needs our copy of ${srfi}... " >&6; }
-+ { echo "$as_me:$LINENO: checking if guile needs our copy of ${srfi}" >&5
-+echo $ECHO_N "checking if guile needs our copy of ${srfi}... $ECHO_C" >&6; }
- if ${GUILE} -c "(use-modules (srfi ${srfi}))" > /dev/null 2>&1
- then
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- else
- GNC_ADD_ON_SRFIS="${GNC_ADD_ON_SRFIS} ${srfi}.scm"
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- fi
- done
-
-@@ -28329,14 +27796,14 @@ fi
-
- gnc_have_guile_www=no
-
--{ $as_echo "$as_me:$LINENO: checking if guile needs our copy of (guile www)" >&5
--$as_echo_n "checking if guile needs our copy of (guile www)... " >&6; }
-+{ echo "$as_me:$LINENO: checking if guile needs our copy of (guile www)" >&5
-+echo $ECHO_N "checking if guile needs our copy of (guile www)... $ECHO_C" >&6; }
- # Extract the first word of "guile", so it can be a program name with args.
- set dummy guile; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GUILE+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $GUILE in
- [\\/]* | ?:[\\/]*)
-@@ -28351,7 +27818,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GUILE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -28363,26 +27830,26 @@ esac
- fi
- GUILE=$ac_cv_path_GUILE
- if test -n "$GUILE"; then
-- { $as_echo "$as_me:$LINENO: result: $GUILE" >&5
--$as_echo "$GUILE" >&6; }
-+ { echo "$as_me:$LINENO: result: $GUILE" >&5
-+echo "${ECHO_T}$GUILE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
- if test "$GUILE" = "" ; then
-- { { $as_echo "$as_me:$LINENO: error: guile required but not found" >&5
--$as_echo "$as_me: error: guile required but not found" >&2;}
-+ { { echo "$as_me:$LINENO: error: guile required but not found" >&5
-+echo "$as_me: error: guile required but not found" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- # Extract the first word of "guile-config", so it can be a program name with args.
- set dummy guile-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GUILE_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $GUILE_CONFIG in
- [\\/]* | ?:[\\/]*)
-@@ -28397,7 +27864,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GUILE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -28409,26 +27876,26 @@ esac
- fi
- GUILE_CONFIG=$ac_cv_path_GUILE_CONFIG
- if test -n "$GUILE_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $GUILE_CONFIG" >&5
--$as_echo "$GUILE_CONFIG" >&6; }
-+ { echo "$as_me:$LINENO: result: $GUILE_CONFIG" >&5
-+echo "${ECHO_T}$GUILE_CONFIG" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
- if test "$GUILE_CONFIG" = "" ; then
-- { { $as_echo "$as_me:$LINENO: error: guile-config required but not found" >&5
--$as_echo "$as_me: error: guile-config required but not found" >&2;}
-+ { { echo "$as_me:$LINENO: error: guile-config required but not found" >&5
-+echo "$as_me: error: guile-config required but not found" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- # Extract the first word of "guile-tools", so it can be a program name with args.
- set dummy guile-tools; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GUILE_TOOLS+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $GUILE_TOOLS in
- [\\/]* | ?:[\\/]*)
-@@ -28443,7 +27910,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GUILE_TOOLS="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -28455,25 +27922,25 @@ esac
- fi
- GUILE_TOOLS=$ac_cv_path_GUILE_TOOLS
- if test -n "$GUILE_TOOLS"; then
-- { $as_echo "$as_me:$LINENO: result: $GUILE_TOOLS" >&5
--$as_echo "$GUILE_TOOLS" >&6; }
-+ { echo "$as_me:$LINENO: result: $GUILE_TOOLS" >&5
-+echo "${ECHO_T}$GUILE_TOOLS" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-
-
--{ $as_echo "$as_me:$LINENO: checking if (www main) is available" >&5
--$as_echo_n "checking if (www main) is available... " >&6; }
-+{ echo "$as_me:$LINENO: checking if (www main) is available" >&5
-+echo $ECHO_N "checking if (www main) is available... $ECHO_C" >&6; }
-
- $GUILE -c "(use-modules (www main)) (exit ((lambda () 0)))" > /dev/null 2>&1
- gnc_have_guile_www=$?
-
- if test "$gnc_have_guile_www" = "0" ; then gnc_have_guile_www=yes ; else gnc_have_guile_www=no ; fi
-- { $as_echo "$as_me:$LINENO: result: $gnc_have_guile_www" >&5
--$as_echo "$gnc_have_guile_www" >&6; }
-+ { echo "$as_me:$LINENO: result: $gnc_have_guile_www" >&5
-+echo "${ECHO_T}$gnc_have_guile_www" >&6; }
-
-
-
-@@ -28490,113 +27957,119 @@ fi
- ### look for gconf
-
-
-- succeeded=no
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GCONF" >&5
-+echo $ECHO_N "checking for GCONF... $ECHO_C" >&6; }
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+if test -n "$GCONF_CFLAGS"; then
-+ pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \"2.0\"\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= "2.0"") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= "2.0"" 2>/dev/null`
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ pkg_failed=yes
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GCONF_LIBS"; then
-+ pkg_cv_GCONF_LIBS="$GCONF_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \"2.0\"\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= "2.0"") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= "2.0"" 2>/dev/null`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
- fi
-
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for gconf-2.0 >= \"2.0\"" >&5
--$as_echo_n "checking for gconf-2.0 >= \"2.0\"... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "gconf-2.0 >= "2.0"" ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5
--$as_echo_n "checking GCONF_CFLAGS... " >&6; }
-- GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= "2.0""`
-- { $as_echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5
--$as_echo "$GCONF_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GCONF_LIBS" >&5
--$as_echo_n "checking GCONF_LIBS... " >&6; }
-- GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= "2.0""`
-- { $as_echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5
--$as_echo "$GCONF_LIBS" >&6; }
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0 >= "2.0"" 2>&1`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GCONF_CFLAGS=""
-- GCONF_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0 >= "2.0"" 2>&1`
-- echo $GCONF_PKG_ERRORS
-+ GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0 >= "2.0"" 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GCONF_PKG_ERRORS" >&5
-
-+ { { echo "$as_me:$LINENO: error: Package requirements (gconf-2.0 >= \"2.0\") were not met:
-
-+$GCONF_PKG_ERRORS
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-- if test $succeeded = yes; then
-- :
-- else
-- { { $as_echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 >= \"2.0\") not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
--$as_echo "$as_me: error: Library requirements (gconf-2.0 >= \"2.0\") not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+Alternatively, you may set the environment variables GCONF_CFLAGS
-+and GCONF_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (gconf-2.0 >= \"2.0\") were not met:
-+
-+$GCONF_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables GCONF_CFLAGS
-+and GCONF_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-+elif test $pkg_failed = untried; then
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables GCONF_CFLAGS
-+and GCONF_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables GCONF_CFLAGS
-+and GCONF_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
-+ GCONF_LIBS=$pkg_cv_GCONF_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ :
-+fi
- # Look up gconftool-2
- # Extract the first word of "gconftool-2", so it can be a program name with args.
- set dummy gconftool-2; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GCONFTOOL+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $GCONFTOOL in
- [\\/]* | ?:[\\/]*)
-@@ -28611,7 +28084,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -28623,11 +28096,11 @@ esac
- fi
- GCONFTOOL=$ac_cv_path_GCONFTOOL
- if test -n "$GCONFTOOL"; then
-- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
--$as_echo "$GCONFTOOL" >&6; }
-+ { echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
-+echo "${ECHO_T}$GCONFTOOL" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -28640,106 +28113,112 @@ fi
-
- LIBXML2_REQUIRED=2.5.10
-
-- succeeded=no
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for LIBXML2" >&5
-+echo $ECHO_N "checking for LIBXML2... $ECHO_C" >&6; }
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+if test -n "$LIBXML2_CFLAGS"; then
-+ pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML2_REQUIRED\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= $LIBXML2_REQUIRED" 2>/dev/null`
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ pkg_failed=yes
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$LIBXML2_LIBS"; then
-+ pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML2_REQUIRED\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= $LIBXML2_REQUIRED" 2>/dev/null`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
- fi
-
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for libxml-2.0 >= $LIBXML2_REQUIRED" >&5
--$as_echo_n "checking for libxml-2.0 >= $LIBXML2_REQUIRED... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "libxml-2.0 >= $LIBXML2_REQUIRED" ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking LIBXML2_CFLAGS" >&5
--$as_echo_n "checking LIBXML2_CFLAGS... " >&6; }
-- LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= $LIBXML2_REQUIRED"`
-- { $as_echo "$as_me:$LINENO: result: $LIBXML2_CFLAGS" >&5
--$as_echo "$LIBXML2_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking LIBXML2_LIBS" >&5
--$as_echo_n "checking LIBXML2_LIBS... " >&6; }
-- LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= $LIBXML2_REQUIRED"`
-- { $as_echo "$as_me:$LINENO: result: $LIBXML2_LIBS" >&5
--$as_echo "$LIBXML2_LIBS" >&6; }
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- LIBXML2_CFLAGS=""
-- LIBXML2_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- LIBXML2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
-- echo $LIBXML2_PKG_ERRORS
-+ LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$LIBXML2_PKG_ERRORS" >&5
-
-+ { { echo "$as_me:$LINENO: error: Package requirements (libxml-2.0 >= $LIBXML2_REQUIRED) were not met:
-
-+$LIBXML2_PKG_ERRORS
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-- if test $succeeded = yes; then
-- :
-- else
-- { { $as_echo "$as_me:$LINENO: error: Library requirements (libxml-2.0 >= $LIBXML2_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
--$as_echo "$as_me: error: Library requirements (libxml-2.0 >= $LIBXML2_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+Alternatively, you may set the environment variables LIBXML2_CFLAGS
-+and LIBXML2_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (libxml-2.0 >= $LIBXML2_REQUIRED) were not met:
-+
-+$LIBXML2_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables LIBXML2_CFLAGS
-+and LIBXML2_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-+elif test $pkg_failed = untried; then
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-
-+Alternatively, you may set the environment variables LIBXML2_CFLAGS
-+and LIBXML2_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables LIBXML2_CFLAGS
-+and LIBXML2_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
-+ LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ :
-+fi
- LIBXML_VERSION=`$PKG_CONFIG --version xml`
-
- GIVEN_CFLAGS=$LIBXML2_CFLAGS
-@@ -28759,10 +28238,10 @@ oLIBS="$LIBS"
- LIBS="$LIBS $LIBXML2_LIBS"
-
- # Compile a test program to verify that the xml2 library works.
--{ $as_echo "$as_me:$LINENO: checking for xmlElemDump in -lxml2" >&5
--$as_echo_n "checking for xmlElemDump in -lxml2... " >&6; }
-+{ echo "$as_me:$LINENO: checking for xmlElemDump in -lxml2" >&5
-+echo $ECHO_N "checking for xmlElemDump in -lxml2... $ECHO_C" >&6; }
- if test "${ac_cv_lib_xml2_xmlElemDump+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lxml2 $LIBS"
-@@ -28794,42 +28273,38 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_xml2_xmlElemDump=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_xml2_xmlElemDump=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlElemDump" >&5
--$as_echo "$ac_cv_lib_xml2_xmlElemDump" >&6; }
--if test "x$ac_cv_lib_xml2_xmlElemDump" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlElemDump" >&5
-+echo "${ECHO_T}$ac_cv_lib_xml2_xmlElemDump" >&6; }
-+if test $ac_cv_lib_xml2_xmlElemDump = yes; then
- :
- else
-
-- { { $as_echo "$as_me:$LINENO: error: libxml2 is required for GnuCash" >&5
--$as_echo "$as_me: error: libxml2 is required for GnuCash" >&2;}
-+ { { echo "$as_me:$LINENO: error: libxml2 is required for GnuCash" >&5
-+echo "$as_me: error: libxml2 is required for GnuCash" >&2;}
- { (exit 1); exit 1; }; }
-
- fi
-@@ -28844,10 +28319,10 @@ ZLIB_LIBS=-lz
-
- oLIBS="$LIBS"
- LIBS="$LIBS $ZLIB_LIBS"
--{ $as_echo "$as_me:$LINENO: checking for gzopen in -lz" >&5
--$as_echo_n "checking for gzopen in -lz... " >&6; }
-+{ echo "$as_me:$LINENO: checking for gzopen in -lz" >&5
-+echo $ECHO_N "checking for gzopen in -lz... $ECHO_C" >&6; }
- if test "${ac_cv_lib_z_gzopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lz $LIBS"
-@@ -28879,42 +28354,38 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_z_gzopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_z_gzopen=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzopen" >&5
--$as_echo "$ac_cv_lib_z_gzopen" >&6; }
--if test "x$ac_cv_lib_z_gzopen" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_z_gzopen" >&6; }
-+if test $ac_cv_lib_z_gzopen = yes; then
- :
- else
-
-- { { $as_echo "$as_me:$LINENO: error: zlib is required for GnuCash" >&5
--$as_echo "$as_me: error: zlib is required for GnuCash" >&2;}
-+ { { echo "$as_me:$LINENO: error: zlib is required for GnuCash" >&5
-+echo "$as_me: error: zlib is required for GnuCash" >&2;}
- { (exit 1); exit 1; }; }
-
- fi
-@@ -28927,14 +28398,14 @@ LIBS="$oLIBS"
-
- # Check whether --enable-qof was given.
- if test "${enable_qof+set}" = set; then
-- enableval=$enable_qof; { { $as_echo "$as_me:$LINENO: error: GnuCash has disabled use of external QOF." >&5
--$as_echo "$as_me: error: GnuCash has disabled use of external QOF." >&2;}
-+ enableval=$enable_qof; { { echo "$as_me:$LINENO: error: GnuCash has disabled use of external QOF." >&5
-+echo "$as_me: error: GnuCash has disabled use of external QOF." >&2;}
- { (exit 1); exit 1; }; }
- case "${enableval}" in
- yes) gnc_enable_qof=true ;;
- no) gnc_enable_qof=false ;;
-- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-qof" >&5
--$as_echo "$as_me: error: bad value ${enableval} for --enable-qof" >&2;}
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-qof" >&5
-+echo "$as_me: error: bad value ${enableval} for --enable-qof" >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
- else
-@@ -28969,8 +28440,8 @@ QOF_REQUIRED=0.6.4
- # Can't use external qof until it supports "alternate dirty mode"
- QOF_REQUIRED=99.99.99
- if test "$gnc_enable_qof" = true ; then
-- { $as_echo "$as_me:$LINENO: checking for QOF, version >= $QOF_REQUIRED" >&5
--$as_echo_n "checking for QOF, version >= $QOF_REQUIRED... " >&6; }
-+ { echo "$as_me:$LINENO: checking for QOF, version >= $QOF_REQUIRED" >&5
-+echo $ECHO_N "checking for QOF, version >= $QOF_REQUIRED... $ECHO_C" >&6; }
- 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`
-@@ -28989,15 +28460,15 @@ $as_echo_n "checking for QOF, version >= $QOF_REQUIRED... " >&6; }
- QOF_XML_DIR=`$PKG_CONFIG --silence-errors --variable=xmldir qof-1`
- fi
- if test x$QOF_XML_DIR = x; then
-- { $as_echo "$as_me:$LINENO: result: no, will use internal QOF code" >&5
--$as_echo "no, will use internal QOF code" >&6; }
-+ { echo "$as_me:$LINENO: result: no, will use internal QOF code" >&5
-+echo "${ECHO_T}no, will use internal QOF code" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- fi
- else
-- { $as_echo "$as_me:$LINENO: External QOF Disabled. Using Internal QOF Code." >&5
--$as_echo "$as_me: External QOF Disabled. Using Internal QOF Code." >&6;}
-+ { echo "$as_me:$LINENO: External QOF Disabled. Using Internal QOF Code." >&5
-+echo "$as_me: External QOF Disabled. Using Internal QOF Code." >&6;}
- fi
- if test x$QOF_XML_DIR = x; then
- QOF_LIB_DIR='${pkglibdir}'
-@@ -29012,7 +28483,7 @@ if test x$QOF_XML_DIR = x; then
-
-
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBQOF /**/
-+#define HAVE_LIBQOF
- _ACEOF
-
- HAVE_LIBQOF="use_internal"
-@@ -29171,21 +28642,20 @@ if test "${enable_sql+set}" = set; then
-
- for ac_header in pgsql/libpq-fe.h postgresql/libpq-fe.h libpq-fe.h
- do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -29201,33 +28671,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -29241,52 +28710,51 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
-
- rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
- ## ---------------------------------------- ##
- ## Report this to gnucash-devel at gnucash.org ##
-@@ -29295,24 +28763,21 @@ _ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -29320,8 +28785,8 @@ fi
- done
-
- if test "x$ac_cv_header_pgsql_libpq_fe_h$ac_cv_header_postgresql_libpq_fe_h$ac_cv_header_libpq_fe_h" = xnonono; then
-- { { $as_echo "$as_me:$LINENO: error: Cannot find PostgreSQL headers; won't build sql backend" >&5
--$as_echo "$as_me: error: Cannot find PostgreSQL headers; won't build sql backend" >&2;}
-+ { { echo "$as_me:$LINENO: error: Cannot find PostgreSQL headers; won't build sql backend" >&5
-+echo "$as_me: error: Cannot find PostgreSQL headers; won't build sql backend" >&2;}
- { (exit 1); exit 1; }; }
- else
- master_dirs="/usr/include /usr/local/include"
-@@ -29359,8 +28824,8 @@ $as_echo "$as_me: error: Cannot find PostgreSQL headers; won't build sql backend
-
- saved_LIBS="$LIBS"
- LIBS="${PGSQL_LIBS} -lpq $LIBS"
-- { $as_echo "$as_me:$LINENO: checking for libpq" >&5
--$as_echo_n "checking for libpq... " >&6; }
-+ { echo "$as_me:$LINENO: checking for libpq" >&5
-+echo $ECHO_N "checking for libpq... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -29386,39 +28851,35 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- SQL_DIR=postgres
-
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-- { { $as_echo "$as_me:$LINENO: error: Cannot find PostgreSQL libraries; will not build sql backend" >&5
--$as_echo "$as_me: error: Cannot find PostgreSQL libraries; will not build sql backend" >&2;}
-+ { { echo "$as_me:$LINENO: error: Cannot find PostgreSQL libraries; will not build sql backend" >&5
-+echo "$as_me: error: Cannot find PostgreSQL libraries; will not build sql backend" >&2;}
- { (exit 1); exit 1; }; }
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$saved_LIBS"
-@@ -29450,15 +28911,15 @@ if test "${enable_ofx+set}" = set; then
- esac
- fi
-
--{ $as_echo "$as_me:$LINENO: checking whether to use OFX" >&5
--$as_echo_n "checking whether to use OFX... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether to use OFX" >&5
-+echo $ECHO_N "checking whether to use OFX... $ECHO_C" >&6; }
- case "${want_ofx}" in
-- yes) { $as_echo "$as_me:$LINENO: result: yes -- failure is fatal" >&5
--$as_echo "yes -- failure is fatal" >&6; } ;;
-- no) { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; } ;;
-- auto) { $as_echo "$as_me:$LINENO: result: yes -- automatic test" >&5
--$as_echo "yes -- automatic test" >&6; } ;;
-+ yes) { echo "$as_me:$LINENO: result: yes -- failure is fatal" >&5
-+echo "${ECHO_T}yes -- failure is fatal" >&6; } ;;
-+ no) { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; } ;;
-+ auto) { echo "$as_me:$LINENO: result: yes -- automatic test" >&5
-+echo "${ECHO_T}yes -- automatic test" >&6; } ;;
- esac
- if test x${want_ofx} != xno ;
- then
-@@ -29476,8 +28937,8 @@ fi
-
- if test "x${want_ofx}" != xno ; then
- # Version number verified. Now check header files.
-- { $as_echo "$as_me:$LINENO: checking for libofx/libofx.h" >&5
--$as_echo_n "checking for libofx/libofx.h... " >&6; }
-+ { echo "$as_me:$LINENO: checking for libofx/libofx.h" >&5
-+echo $ECHO_N "checking for libofx/libofx.h... $ECHO_C" >&6; }
-
- GIVEN_CFLAGS=$LIBOFX_CFLAGS
- INCLUDE_DIRS=`echo | cpp -v 2>&1`
-@@ -29503,22 +28964,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- OFXfound=no
-@@ -29554,31 +29014,30 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
-- { $as_echo "$as_me:$LINENO: result: yes (in /usr/local)" >&5
--$as_echo "yes (in /usr/local)" >&6; }
-+ { echo "$as_me:$LINENO: result: yes (in /usr/local)" >&5
-+echo "${ECHO_T}yes (in /usr/local)" >&6; }
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- if test "x${want_ofx}" = xyes ; then
-- { { $as_echo "$as_me:$LINENO: error: cannot find libofx header, needed for OFX support." >&5
--$as_echo "$as_me: error: cannot find libofx header, needed for OFX support." >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot find libofx header, needed for OFX support." >&5
-+echo "$as_me: error: cannot find libofx header, needed for OFX support." >&2;}
- { (exit 1); exit 1; }; }
- else
-- { $as_echo "$as_me:$LINENO: result: cannot find libofx header, needed for OFX support." >&5
--$as_echo "cannot find libofx header, needed for OFX support." >&6; }
-+ { echo "$as_me:$LINENO: result: cannot find libofx header, needed for OFX support." >&5
-+echo "${ECHO_T}cannot find libofx header, needed for OFX support." >&6; }
- want_ofx=no
- fi
-
-@@ -29589,8 +29048,8 @@ rm -f conftest.err conftest.$ac_ext
-
- if test "x${want_ofx}" != xno ; then
- LIBOFX_LIBS="${LIBOFX_LIBS} -lofx"
-- { $as_echo "$as_me:$LINENO: checking for libofx" >&5
--$as_echo_n "checking for libofx... " >&6; }
-+ { echo "$as_me:$LINENO: checking for libofx" >&5
-+echo $ECHO_N "checking for libofx... $ECHO_C" >&6; }
- save_LIBS="${LIBS}"
- LIBS="${LIBS} ${LIBOFX_LIBS}"
- cat >conftest.$ac_ext <<_ACEOF
-@@ -29619,40 +29078,36 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- if test "x${want_ofx}" = xyes ; then
-- { { $as_echo "$as_me:$LINENO: error: *** Cannot compile test program for libofx library. Please check config.log for the exact error." >&5
--$as_echo "$as_me: error: *** Cannot compile test program for libofx library. Please check config.log for the exact error." >&2;}
-+ { { echo "$as_me:$LINENO: error: *** Cannot compile test program for libofx library. Please check config.log for the exact error." >&5
-+echo "$as_me: error: *** Cannot compile test program for libofx library. Please check config.log for the exact error." >&2;}
- { (exit 1); exit 1; }; }
- else
-- { $as_echo "$as_me:$LINENO: result: *** Cannot compile test program for libofx library. Please check config.log for the exact error." >&5
--$as_echo "*** Cannot compile test program for libofx library. Please check config.log for the exact error." >&6; }
-+ { echo "$as_me:$LINENO: result: *** Cannot compile test program for libofx library. Please check config.log for the exact error." >&5
-+echo "${ECHO_T}*** Cannot compile test program for libofx library. Please check config.log for the exact error." >&6; }
- want_ofx=no
- fi
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
-@@ -29673,8 +29128,8 @@ fi
- # Check whether --enable-mt940 was given.
- if test "${enable_mt940+set}" = set; then
- enableval=$enable_mt940; if test "x$enableval" != "xno" ; then
-- { { $as_echo "$as_me:$LINENO: error: --enable-mt940 is obsolete -- all functionality is already included in --enable-aqbanking" >&5
--$as_echo "$as_me: error: --enable-mt940 is obsolete -- all functionality is already included in --enable-aqbanking" >&2;}
-+ { { echo "$as_me:$LINENO: error: --enable-mt940 is obsolete -- all functionality is already included in --enable-aqbanking" >&5
-+echo "$as_me: error: --enable-mt940 is obsolete -- all functionality is already included in --enable-aqbanking" >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-@@ -29703,228 +29158,243 @@ then
- # aqbanking-1.6.1 was released on 2005-11-04; aqbanking ships with
- # a pkg-config file since 1.6.1.
-
-- succeeded=no
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for AQBANKING" >&5
-+echo $ECHO_N "checking for AQBANKING... $ECHO_C" >&6; }
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+if test -n "$AQBANKING_CFLAGS"; then
-+ pkg_cv_AQBANKING_CFLAGS="$AQBANKING_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"aqbanking >= 3.0.0 gwenhywfar\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "aqbanking >= 3.0.0 gwenhywfar") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_AQBANKING_CFLAGS=`$PKG_CONFIG --cflags "aqbanking >= 3.0.0 gwenhywfar" 2>/dev/null`
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ pkg_failed=yes
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$AQBANKING_LIBS"; then
-+ pkg_cv_AQBANKING_LIBS="$AQBANKING_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"aqbanking >= 3.0.0 gwenhywfar\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "aqbanking >= 3.0.0 gwenhywfar") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_AQBANKING_LIBS=`$PKG_CONFIG --libs "aqbanking >= 3.0.0 gwenhywfar" 2>/dev/null`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
- fi
-
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for aqbanking >= 3.0.0 gwenhywfar" >&5
--$as_echo_n "checking for aqbanking >= 3.0.0 gwenhywfar... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "aqbanking >= 3.0.0 gwenhywfar" ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking AQBANKING_CFLAGS" >&5
--$as_echo_n "checking AQBANKING_CFLAGS... " >&6; }
-- AQBANKING_CFLAGS=`$PKG_CONFIG --cflags "aqbanking >= 3.0.0 gwenhywfar"`
-- { $as_echo "$as_me:$LINENO: result: $AQBANKING_CFLAGS" >&5
--$as_echo "$AQBANKING_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking AQBANKING_LIBS" >&5
--$as_echo_n "checking AQBANKING_LIBS... " >&6; }
-- AQBANKING_LIBS=`$PKG_CONFIG --libs "aqbanking >= 3.0.0 gwenhywfar"`
-- { $as_echo "$as_me:$LINENO: result: $AQBANKING_LIBS" >&5
--$as_echo "$AQBANKING_LIBS" >&6; }
-- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- AQBANKING_CFLAGS=""
-- AQBANKING_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- AQBANKING_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "aqbanking >= 3.0.0 gwenhywfar" 2>&1`
-+if test $pkg_failed = yes; then
-
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ AQBANKING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "aqbanking >= 3.0.0 gwenhywfar" 2>&1`
-+ else
-+ AQBANKING_PKG_ERRORS=`$PKG_CONFIG --print-errors "aqbanking >= 3.0.0 gwenhywfar" 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$AQBANKING_PKG_ERRORS" >&5
-
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for AQBANKING" >&5
-+echo $ECHO_N "checking for AQBANKING... $ECHO_C" >&6; }
-
-- if test $succeeded = yes; then
-- AQBANKING_DIR=aqbanking
-- else
-+if test -n "$AQBANKING_CFLAGS"; then
-+ pkg_cv_AQBANKING_CFLAGS="$AQBANKING_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_AQBANKING_CFLAGS=`$PKG_CONFIG --cflags "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$AQBANKING_LIBS"; then
-+ pkg_cv_AQBANKING_LIBS="$AQBANKING_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_AQBANKING_LIBS=`$PKG_CONFIG --libs "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-
-
-- succeeded=no
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
-+if test $pkg_failed = yes; then
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ if test $_pkg_short_errors_supported = yes; then
-+ AQBANKING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>&1`
-+ else
-+ AQBANKING_PKG_ERRORS=`$PKG_CONFIG --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$AQBANKING_PKG_ERRORS" >&5
-+
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+ { { echo "$as_me:$LINENO: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&5
-+echo "$as_me: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+elif test $pkg_failed = untried; then
-+
-+ { { echo "$as_me:$LINENO: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&5
-+echo "$as_me: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&2;}
-+ { (exit 1); exit 1; }; }
-+
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ AQBANKING_CFLAGS=$pkg_cv_AQBANKING_CFLAGS
-+ AQBANKING_LIBS=$pkg_cv_AQBANKING_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ AQBANKING_DIR=hbci
- fi
-
-+elif test $pkg_failed = untried; then
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" >&5
--$as_echo_n "checking for aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking AQBANKING_CFLAGS" >&5
--$as_echo_n "checking AQBANKING_CFLAGS... " >&6; }
-- AQBANKING_CFLAGS=`$PKG_CONFIG --cflags "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar"`
-- { $as_echo "$as_me:$LINENO: result: $AQBANKING_CFLAGS" >&5
--$as_echo "$AQBANKING_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking AQBANKING_LIBS" >&5
--$as_echo_n "checking AQBANKING_LIBS... " >&6; }
-- AQBANKING_LIBS=`$PKG_CONFIG --libs "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar"`
-- { $as_echo "$as_me:$LINENO: result: $AQBANKING_LIBS" >&5
--$as_echo "$AQBANKING_LIBS" >&6; }
-- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- AQBANKING_CFLAGS=""
-- AQBANKING_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- AQBANKING_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>&1`
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for AQBANKING" >&5
-+echo $ECHO_N "checking for AQBANKING... $ECHO_C" >&6; }
-
-- fi
-+if test -n "$AQBANKING_CFLAGS"; then
-+ pkg_cv_AQBANKING_CFLAGS="$AQBANKING_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_AQBANKING_CFLAGS=`$PKG_CONFIG --cflags "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$AQBANKING_LIBS"; then
-+ pkg_cv_AQBANKING_LIBS="$AQBANKING_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_AQBANKING_LIBS=`$PKG_CONFIG --libs "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-
-
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+if test $pkg_failed = yes; then
-
-- if test $succeeded = yes; then
-- AQBANKING_DIR=hbci
-- else
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ AQBANKING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>&1`
-+ else
-+ AQBANKING_PKG_ERRORS=`$PKG_CONFIG --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$AQBANKING_PKG_ERRORS" >&5
-+
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
-- { { $as_echo "$as_me:$LINENO: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&5
--$as_echo "$as_me: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&2;}
-+ { { echo "$as_me:$LINENO: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&5
-+echo "$as_me: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&2;}
- { (exit 1); exit 1; }; }
-
-- fi
-+elif test $pkg_failed = untried; then
-
-+ { { echo "$as_me:$LINENO: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&5
-+echo "$as_me: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&2;}
-+ { (exit 1); exit 1; }; }
-
-- fi
-+else
-+ AQBANKING_CFLAGS=$pkg_cv_AQBANKING_CFLAGS
-+ AQBANKING_LIBS=$pkg_cv_AQBANKING_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ AQBANKING_DIR=hbci
-+fi
-
-+else
-+ AQBANKING_CFLAGS=$pkg_cv_AQBANKING_CFLAGS
-+ AQBANKING_LIBS=$pkg_cv_AQBANKING_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ AQBANKING_DIR=aqbanking
-+fi
-
- # also check for ktoblzcheck
-
- for ac_header in ktoblzcheck.h
- do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -29940,33 +29410,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -29980,52 +29449,51 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
-
- rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
- ## ---------------------------------------- ##
- ## Report this to gnucash-devel at gnucash.org ##
-@@ -30034,24 +29502,21 @@ _ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -30089,10 +29554,10 @@ if test "x$DATADIRNAME" = "x"; then
- fi
-
-
-- { $as_echo "$as_me:$LINENO: checking for nl_langinfo and D_FMT" >&5
--$as_echo_n "checking for nl_langinfo and D_FMT... " >&6; }
-+ { echo "$as_me:$LINENO: checking for nl_langinfo and D_FMT" >&5
-+echo $ECHO_N "checking for nl_langinfo and D_FMT... $ECHO_C" >&6; }
- if test "${am_cv_langinfo_dfmt+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -30115,36 +29580,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- am_cv_langinfo_dfmt=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- am_cv_langinfo_dfmt=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_langinfo_dfmt" >&5
--$as_echo "$am_cv_langinfo_dfmt" >&6; }
-+{ echo "$as_me:$LINENO: result: $am_cv_langinfo_dfmt" >&5
-+echo "${ECHO_T}$am_cv_langinfo_dfmt" >&6; }
- if test $am_cv_langinfo_dfmt = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -30164,17 +29625,17 @@ _ACEOF
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking for a valid gettext/gmsgfmt installation" >&5
--$as_echo_n "checking for a valid gettext/gmsgfmt installation... " >&6; }
-+{ echo "$as_me:$LINENO: checking for a valid gettext/gmsgfmt installation" >&5
-+echo $ECHO_N "checking for a valid gettext/gmsgfmt installation... $ECHO_C" >&6; }
- if test "$gt_cv_have_gettext" != "yes" || test "x$GMSGFMT" = "x"; then
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- { { $as_echo "$as_me:$LINENO: error: Cannot find Glib Gettext. Maybe you need to install the gettext package?" >&5
--$as_echo "$as_me: error: Cannot find Glib Gettext. Maybe you need to install the gettext package?" >&2;}
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ { { echo "$as_me:$LINENO: error: Cannot find Glib Gettext. Maybe you need to install the gettext package?" >&5
-+echo "$as_me: error: Cannot find Glib Gettext. Maybe you need to install the gettext package?" >&2;}
- { (exit 1); exit 1; }; }
- else
-- { $as_echo "$as_me:$LINENO: result: yes - $GMSGFMT" >&5
--$as_echo "yes - $GMSGFMT" >&6; }
-+ { echo "$as_me:$LINENO: result: yes - $GMSGFMT" >&5
-+echo "${ECHO_T}yes - $GMSGFMT" >&6; }
- fi
-
- ### --------------------------------------------------------------------------
-@@ -30209,10 +29670,10 @@ fi
- if test x${USE_ETAGS} = x1; then
- # Extract the first word of "etags", so it can be a program name with args.
- set dummy etags; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_GNC_ETAGS_FILE+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$GNC_ETAGS_FILE"; then
- ac_cv_prog_GNC_ETAGS_FILE="$GNC_ETAGS_FILE" # Let the user override the test.
-@@ -30225,7 +29686,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_GNC_ETAGS_FILE="TAGS"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -30236,11 +29697,11 @@ fi
- fi
- GNC_ETAGS_FILE=$ac_cv_prog_GNC_ETAGS_FILE
- if test -n "$GNC_ETAGS_FILE"; then
-- { $as_echo "$as_me:$LINENO: result: $GNC_ETAGS_FILE" >&5
--$as_echo "$GNC_ETAGS_FILE" >&6; }
-+ { echo "$as_me:$LINENO: result: $GNC_ETAGS_FILE" >&5
-+echo "${ECHO_T}$GNC_ETAGS_FILE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -30271,10 +29732,10 @@ fi
- if test x${USE_CTAGS} = x1; then
- # Extract the first word of "ctags", so it can be a program name with args.
- set dummy ctags; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_GNC_CTAGS_FILE+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$GNC_CTAGS_FILE"; then
- ac_cv_prog_GNC_CTAGS_FILE="$GNC_CTAGS_FILE" # Let the user override the test.
-@@ -30287,7 +29748,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_GNC_CTAGS_FILE="tags"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -30298,11 +29759,11 @@ fi
- fi
- GNC_CTAGS_FILE=$ac_cv_prog_GNC_CTAGS_FILE
- if test -n "$GNC_CTAGS_FILE"; then
-- { $as_echo "$as_me:$LINENO: result: $GNC_CTAGS_FILE" >&5
--$as_echo "$GNC_CTAGS_FILE" >&6; }
-+ { echo "$as_me:$LINENO: result: $GNC_CTAGS_FILE" >&5
-+echo "${ECHO_T}$GNC_CTAGS_FILE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -30333,10 +29794,10 @@ if test x"$PERL" = x;
- then
- # Extract the first word of "perl", so it can be a program name with args.
- set dummy perl; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_PERL+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $PERL in
- [\\/]* | ?:[\\/]*)
-@@ -30351,7 +29812,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -30363,11 +29824,11 @@ esac
- fi
- PERL=$ac_cv_path_PERL
- if test -n "$PERL"; then
-- { $as_echo "$as_me:$LINENO: result: $PERL" >&5
--$as_echo "$PERL" >&6; }
-+ { echo "$as_me:$LINENO: result: $PERL" >&5
-+echo "${ECHO_T}$PERL" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -30375,8 +29836,8 @@ fi
-
- # Make sure Perl was found
- if test x"$PERL" = x; then
-- { { $as_echo "$as_me:$LINENO: error: Cannot find Perl. Try using the --with-perl flag." >&5
--$as_echo "$as_me: error: Cannot find Perl. Try using the --with-perl flag." >&2;}
-+ { { echo "$as_me:$LINENO: error: Cannot find Perl. Try using the --with-perl flag." >&5
-+echo "$as_me: error: Cannot find Perl. Try using the --with-perl flag." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -30384,9 +29845,9 @@ fi
- if "$PERL" -e 'exit 1 if $] < 5.0'; then
- :
- else
-- { { $as_echo "$as_me:$LINENO: error: Found ${PERL} reports version
-+ { { echo "$as_me:$LINENO: error: Found ${PERL} reports version
- \`${PERL} -e 'print $'\`" >&5
--$as_echo "$as_me: error: Found ${PERL} reports version
-+echo "$as_me: error: Found ${PERL} reports version
- \`${PERL} -e 'print $'\`" >&2;}
- { (exit need version 5.*]); exit need version 5.*]; }; }
- fi
-@@ -30442,10 +29903,10 @@ if test "x$enable_doxygen" = xno; then
- else
- # Extract the first word of "doxygen", so it can be a program name with args.
- set dummy doxygen; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_DOXYGEN+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $DOXYGEN in
- [\\/]* | ?:[\\/]*)
-@@ -30460,7 +29921,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -30472,18 +29933,18 @@ esac
- fi
- DOXYGEN=$ac_cv_path_DOXYGEN
- if test -n "$DOXYGEN"; then
-- { $as_echo "$as_me:$LINENO: result: $DOXYGEN" >&5
--$as_echo "$DOXYGEN" >&6; }
-+ { echo "$as_me:$LINENO: result: $DOXYGEN" >&5
-+echo "${ECHO_T}$DOXYGEN" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
- if test x$DOXYGEN = x; then
- if test "x$enable_doxygen" = xyes; then
-- { { $as_echo "$as_me:$LINENO: error: could not find doxygen" >&5
--$as_echo "$as_me: error: could not find doxygen" >&2;}
-+ { { echo "$as_me:$LINENO: error: could not find doxygen" >&5
-+echo "$as_me: error: could not find doxygen" >&2;}
- { (exit 1); exit 1; }; }
- fi
- enable_doc=no
-@@ -30491,10 +29952,10 @@ $as_echo "$as_me: error: could not find doxygen" >&2;}
- enable_doc=yes
- # Extract the first word of "dot", so it can be a program name with args.
- set dummy dot; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_DOT+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $DOT in
- [\\/]* | ?:[\\/]*)
-@@ -30509,7 +29970,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -30521,11 +29982,11 @@ esac
- fi
- DOT=$ac_cv_path_DOT
- if test -n "$DOT"; then
-- { $as_echo "$as_me:$LINENO: result: $DOT" >&5
--$as_echo "$DOT" >&6; }
-+ { echo "$as_me:$LINENO: result: $DOT" >&5
-+echo "${ECHO_T}$DOT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -30542,8 +30003,8 @@ fi
-
- if test x$DOT = x; then
- if test "x$enable_dot" = xyes; then
-- { { $as_echo "$as_me:$LINENO: error: could not find dot" >&5
--$as_echo "$as_me: error: could not find dot" >&2;}
-+ { { echo "$as_me:$LINENO: error: could not find dot" >&5
-+echo "$as_me: error: could not find dot" >&2;}
- { (exit 1); exit 1; }; }
- fi
- enable_dot=no
-@@ -30574,21 +30035,20 @@ LIBS="$LIBS -lm"
-
- for ac_header in popt.h
- do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -30604,33 +30064,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -30644,52 +30103,51 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
-
- rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
- ## ---------------------------------------- ##
- ## Report this to gnucash-devel at gnucash.org ##
-@@ -30698,24 +30156,21 @@ _ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -30723,10 +30178,10 @@ fi
- done
-
-
--{ $as_echo "$as_me:$LINENO: checking for poptStrippedArgv in -lpopt" >&5
--$as_echo_n "checking for poptStrippedArgv in -lpopt... " >&6; }
-+{ echo "$as_me:$LINENO: checking for poptStrippedArgv in -lpopt" >&5
-+echo $ECHO_N "checking for poptStrippedArgv in -lpopt... $ECHO_C" >&6; }
- if test "${ac_cv_lib_popt_poptStrippedArgv+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpopt $LIBS"
-@@ -30758,37 +30213,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_popt_poptStrippedArgv=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_popt_poptStrippedArgv=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_popt_poptStrippedArgv" >&5
--$as_echo "$ac_cv_lib_popt_poptStrippedArgv" >&6; }
--if test "x$ac_cv_lib_popt_poptStrippedArgv" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_popt_poptStrippedArgv" >&5
-+echo "${ECHO_T}$ac_cv_lib_popt_poptStrippedArgv" >&6; }
-+if test $ac_cv_lib_popt_poptStrippedArgv = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBPOPT 1
- _ACEOF
-@@ -30796,13 +30247,13 @@ _ACEOF
- LIBS="-lpopt $LIBS"
-
- else
-- { { $as_echo "$as_me:$LINENO: error:
-+ { { echo "$as_me:$LINENO: error:
-
- popt 1.5 or newer is required to build gnucash. You can download
- the latest version from ftp://people.redhat.com/sopwith/popt/, or if
- you're running Debian, install the libpopt-dev package.
- " >&5
--$as_echo "$as_me: error:
-+echo "$as_me: error:
-
- popt 1.5 or newer is required to build gnucash. You can download
- the latest version from ftp://people.redhat.com/sopwith/popt/, or if
-@@ -30851,39 +30302,109 @@ then
- enable_compile_warnings="yes"
- fi
-
-- # Check whether --enable-compile-warnings was given.
-+
-+ # Check whether --enable-compile-warnings was given.
- if test "${enable_compile_warnings+set}" = set; then
- enableval=$enable_compile_warnings;
- else
-- enable_compile_warnings=minimum
-+ enable_compile_warnings="yes"
- fi
-
-
-- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
--$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
-- warnCFLAGS=
-- if test "x$GCC" != xyes; then
-- enable_compile_warnings=no
-- fi
-+ warnCFLAGS=
-+ if test "x$GCC" != xyes; then
-+ enable_compile_warnings=no
-+ fi
-
-- if test "x$enable_compile_warnings" != "xno"; then
-- if test "x$GCC" = "xyes"; then
-- case " $CFLAGS " in
-- *\ \ -Wall\ \ *) ;;
-- *) warnCFLAGS="-Wall -Wunused" ;;
-- esac
-+ warning_flags=
-+ realsave_CFLAGS="$CFLAGS"
-
-- ## -W is not all that useful. And it cannot be controlled
-- ## with individual -Wno-xxx flags, unlike -Wall
-- if test "x$enable_compile_warnings" = "xyes"; then
-- warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations"
-- fi
-- fi
-- fi
-- { $as_echo "$as_me:$LINENO: result: $warnCFLAGS" >&5
--$as_echo "$warnCFLAGS" >&6; }
-+ case "$enable_compile_warnings" in
-+ no)
-+ warning_flags=
-+ ;;
-+ minimum)
-+ warning_flags="-Wall"
-+ ;;
-+ yes)
-+ warning_flags="-Wall -Wmissing-prototypes"
-+ ;;
-+ maximum|error)
-+ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-+ CFLAGS="$warning_flags $CFLAGS"
-+ for option in -Wno-sign-compare; do
-+ SAVE_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS $option"
-+ { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
-+echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-- # Check whether --enable-iso-c was given.
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ has_option=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ has_option=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ CFLAGS="$SAVE_CFLAGS"
-+ { echo "$as_me:$LINENO: result: $has_option" >&5
-+echo "${ECHO_T}$has_option" >&6; }
-+ if test $has_option = yes; then
-+ warning_flags="$warning_flags $option"
-+ fi
-+ unset has_option
-+ unset SAVE_CFLAGS
-+ done
-+ unset option
-+ if test "$enable_compile_warnings" = "error" ; then
-+ warning_flags="$warning_flags -Werror"
-+ fi
-+ ;;
-+ *)
-+ { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
-+echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
-+ { (exit 1); exit 1; }; }
-+ ;;
-+ esac
-+ CFLAGS="$realsave_CFLAGS"
-+ { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
-+echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: result: $warning_flags" >&5
-+echo "${ECHO_T}$warning_flags" >&6; }
-+
-+ # Check whether --enable-iso-c was given.
- if test "${enable_iso_c+set}" = set; then
- enableval=$enable_iso_c;
- else
-@@ -30891,132 +30412,135 @@ else
- fi
-
-
-- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
--$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
-- complCFLAGS=
-- if test "x$enable_iso_c" != "xno"; then
-- if test "x$GCC" = "xyes"; then
-- case " $CFLAGS " in
-- *\ \ -ansi\ \ *) ;;
-- *) complCFLAGS="$complCFLAGS -ansi" ;;
-- esac
--
-- case " $CFLAGS " in
-- *\ \ -pedantic\ \ *) ;;
-- *) complCFLAGS="$complCFLAGS -pedantic" ;;
-- esac
-+ { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
-+echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }
-+ complCFLAGS=
-+ if test "x$enable_iso_c" != "xno"; then
-+ if test "x$GCC" = "xyes"; then
-+ case " $CFLAGS " in
-+ *\ \ -ansi\ \ *) ;;
-+ *) complCFLAGS="$complCFLAGS -ansi" ;;
-+ esac
-+ case " $CFLAGS " in
-+ *\ \ -pedantic\ \ *) ;;
-+ *) complCFLAGS="$complCFLAGS -pedantic" ;;
-+ esac
-+ fi
- fi
-- fi
-- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
--$as_echo "$complCFLAGS" >&6; }
-- if test "x$cflags_set" != "xyes"; then
-- CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS"
-- cflags_set=yes
-+ { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
-+echo "${ECHO_T}$complCFLAGS" >&6; }
-
-- fi
-+ WARN_CFLAGS="$warning_flags $complCFLAGS"
-
-
-
-- succeeded=no
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTK" >&5
-+echo $ECHO_N "checking for GTK... $ECHO_C" >&6; }
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+if test -n "$GTK_CFLAGS"; then
-+ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.6" 2>/dev/null`
-+else
-+ pkg_failed=yes
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTK_LIBS"; then
-+ pkg_cv_GTK_LIBS="$GTK_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.6" 2>/dev/null`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
- fi
-
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.6" >&5
--$as_echo_n "checking for gtk+-2.0 >= 2.6... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "gtk+-2.0 >= 2.6" ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
--$as_echo_n "checking GTK_CFLAGS... " >&6; }
-- GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.6"`
-- { $as_echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
--$as_echo "$GTK_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GTK_LIBS" >&5
--$as_echo_n "checking GTK_LIBS... " >&6; }
-- GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.6"`
-- { $as_echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
--$as_echo "$GTK_LIBS" >&6; }
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.6" 2>&1`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GTK_CFLAGS=""
-- GTK_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.6" 2>&1`
-- echo $GTK_PKG_ERRORS
-+ GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.6" 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTK_PKG_ERRORS" >&5
-
-+ { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= 2.6) were not met:
-
-+$GTK_PKG_ERRORS
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-- if test $succeeded = yes; then
-- :
-- else
-- { { $as_echo "$as_me:$LINENO: error: Library requirements (gtk+-2.0 >= 2.6) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
--$as_echo "$as_me: error: Library requirements (gtk+-2.0 >= 2.6) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+Alternatively, you may set the environment variables GTK_CFLAGS
-+and GTK_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (gtk+-2.0 >= 2.6) were not met:
-+
-+$GTK_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables GTK_CFLAGS
-+and GTK_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-+elif test $pkg_failed = untried; then
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables GTK_CFLAGS
-+and GTK_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-
-+Alternatively, you may set the environment variables GTK_CFLAGS
-+and GTK_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
-+ GTK_LIBS=$pkg_cv_GTK_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ :
-+fi
-
- GIVEN_CFLAGS=$GTK_CFLAGS
- INCLUDE_DIRS=`echo | cpp -v 2>&1`
-@@ -31031,12 +30555,12 @@ $as_echo "$as_me: error: Library requirements (gtk+-2.0 >= 2.6) not met; conside
-
- HAVE_UNTESTED_GTK=yes
-
-- { $as_echo "$as_me:$LINENO: checking for GTK - version >= 2.10.0" >&5
--$as_echo_n "checking for GTK - version >= 2.10.0... " >&6; }
-+ { echo "$as_me:$LINENO: checking for GTK - version >= 2.10.0" >&5
-+echo $ECHO_N "checking for GTK - version >= 2.10.0... $ECHO_C" >&6; }
- if $PKG_CONFIG 'gtk+-2.0 >= 2.10.0'
- then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GTK_2_10 1
-@@ -31044,8 +30568,8 @@ _ACEOF
-
- HAVE_GTK_2_10=yes
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- if test "x$HAVE_GTK_2_10" = "xyes" ; then
- HAVE_GTK_2_10_TRUE=
-@@ -31056,116 +30580,122 @@ else
- fi
-
-
-- { $as_echo "$as_me:$LINENO: checking for untested GDK versions (gdk > 2.11.0)" >&5
--$as_echo_n "checking for untested GDK versions (gdk > 2.11.0)... " >&6; }
-+ { echo "$as_me:$LINENO: checking for untested GDK versions (gdk > 2.11.0)" >&5
-+echo $ECHO_N "checking for untested GDK versions (gdk > 2.11.0)... $ECHO_C" >&6; }
- if $PKG_CONFIG 'gtk+-2.0 > 2.11.0'
- then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- HAVE_UNTESTED_GDK=yes
- fi
-
-
-- succeeded=no
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GNOME" >&5
-+echo $ECHO_N "checking for GNOME... $ECHO_C" >&6; }
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+if test -n "$GNOME_CFLAGS"; then
-+ pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 >= 2.4\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 >= 2.4") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= 2.4" 2>/dev/null`
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ pkg_failed=yes
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GNOME_LIBS"; then
-+ pkg_cv_GNOME_LIBS="$GNOME_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 >= 2.4\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 >= 2.4") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 >= 2.4" 2>/dev/null`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
- fi
-
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for libgnomeui-2.0 >= 2.4" >&5
--$as_echo_n "checking for libgnomeui-2.0 >= 2.4... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "libgnomeui-2.0 >= 2.4" ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GNOME_CFLAGS" >&5
--$as_echo_n "checking GNOME_CFLAGS... " >&6; }
-- GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= 2.4"`
-- { $as_echo "$as_me:$LINENO: result: $GNOME_CFLAGS" >&5
--$as_echo "$GNOME_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GNOME_LIBS" >&5
--$as_echo_n "checking GNOME_LIBS... " >&6; }
-- GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 >= 2.4"`
-- { $as_echo "$as_me:$LINENO: result: $GNOME_LIBS" >&5
--$as_echo "$GNOME_LIBS" >&6; }
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgnomeui-2.0 >= 2.4" 2>&1`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GNOME_CFLAGS=""
-- GNOME_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeui-2.0 >= 2.4" 2>&1`
-- echo $GNOME_PKG_ERRORS
-+ GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgnomeui-2.0 >= 2.4" 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GNOME_PKG_ERRORS" >&5
-
-+ { { echo "$as_me:$LINENO: error: Package requirements (libgnomeui-2.0 >= 2.4) were not met:
-
-+$GNOME_PKG_ERRORS
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-- if test $succeeded = yes; then
-- :
-- else
-- { { $as_echo "$as_me:$LINENO: error: Library requirements (libgnomeui-2.0 >= 2.4) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
--$as_echo "$as_me: error: Library requirements (libgnomeui-2.0 >= 2.4) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+Alternatively, you may set the environment variables GNOME_CFLAGS
-+and GNOME_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (libgnomeui-2.0 >= 2.4) were not met:
-+
-+$GNOME_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables GNOME_CFLAGS
-+and GNOME_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-+elif test $pkg_failed = untried; then
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-
-+Alternatively, you may set the environment variables GNOME_CFLAGS
-+and GNOME_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables GNOME_CFLAGS
-+and GNOME_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS
-+ GNOME_LIBS=$pkg_cv_GNOME_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ :
-+fi
-
- GIVEN_CFLAGS=$GNOME_CFLAGS
- INCLUDE_DIRS=`echo | cpp -v 2>&1`
-@@ -31179,119 +30709,125 @@ $as_echo "$as_me: error: Library requirements (libgnomeui-2.0 >= 2.4) not met; c
-
-
-
-- { $as_echo "$as_me:$LINENO: checking for untested GNOME versions (libgnome >= 2.19.0)" >&5
--$as_echo_n "checking for untested GNOME versions (libgnome >= 2.19.0)... " >&6; }
-+ { echo "$as_me:$LINENO: checking for untested GNOME versions (libgnome >= 2.19.0)" >&5
-+echo $ECHO_N "checking for untested GNOME versions (libgnome >= 2.19.0)... $ECHO_C" >&6; }
- if $PKG_CONFIG 'libgnome-2.0 >= 2.19.0'
- then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- HAVE_UNTESTED_GNOME=yes
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-- succeeded=no
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GDK_PIXBUF" >&5
-+echo $ECHO_N "checking for GDK_PIXBUF... $ECHO_C" >&6; }
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+if test -n "$GDK_PIXBUF_CFLAGS"; then
-+ pkg_cv_GDK_PIXBUF_CFLAGS="$GDK_PIXBUF_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GDK_PIXBUF_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0" 2>/dev/null`
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ pkg_failed=yes
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GDK_PIXBUF_LIBS"; then
-+ pkg_cv_GDK_PIXBUF_LIBS="$GDK_PIXBUF_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GDK_PIXBUF_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0" 2>/dev/null`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
- fi
-
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for gdk-pixbuf-2.0" >&5
--$as_echo_n "checking for gdk-pixbuf-2.0... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "gdk-pixbuf-2.0" ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GDK_PIXBUF_CFLAGS" >&5
--$as_echo_n "checking GDK_PIXBUF_CFLAGS... " >&6; }
-- GDK_PIXBUF_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0"`
-- { $as_echo "$as_me:$LINENO: result: $GDK_PIXBUF_CFLAGS" >&5
--$as_echo "$GDK_PIXBUF_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GDK_PIXBUF_LIBS" >&5
--$as_echo_n "checking GDK_PIXBUF_LIBS... " >&6; }
-- GDK_PIXBUF_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0"`
-- { $as_echo "$as_me:$LINENO: result: $GDK_PIXBUF_LIBS" >&5
--$as_echo "$GDK_PIXBUF_LIBS" >&6; }
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GDK_PIXBUF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdk-pixbuf-2.0" 2>&1`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GDK_PIXBUF_CFLAGS=""
-- GDK_PIXBUF_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GDK_PIXBUF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-pixbuf-2.0" 2>&1`
-- echo $GDK_PIXBUF_PKG_ERRORS
-+ GDK_PIXBUF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdk-pixbuf-2.0" 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GDK_PIXBUF_PKG_ERRORS" >&5
-
-+ { { echo "$as_me:$LINENO: error: Package requirements (gdk-pixbuf-2.0) were not met:
-
-+$GDK_PIXBUF_PKG_ERRORS
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-- if test $succeeded = yes; then
-- :
-- else
-- { { $as_echo "$as_me:$LINENO: error: Library requirements (gdk-pixbuf-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
--$as_echo "$as_me: error: Library requirements (gdk-pixbuf-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS
-+and GDK_PIXBUF_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (gdk-pixbuf-2.0) were not met:
-+
-+$GDK_PIXBUF_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS
-+and GDK_PIXBUF_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-+elif test $pkg_failed = untried; then
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-
-+Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS
-+and GDK_PIXBUF_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS
-+and GDK_PIXBUF_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ GDK_PIXBUF_CFLAGS=$pkg_cv_GDK_PIXBUF_CFLAGS
-+ GDK_PIXBUF_LIBS=$pkg_cv_GDK_PIXBUF_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ :
-+fi
-
- GIVEN_CFLAGS=$GDK_PIXBUF_CFLAGS
- INCLUDE_DIRS=`echo | cpp -v 2>&1`
-@@ -31306,106 +30842,112 @@ $as_echo "$as_me: error: Library requirements (gdk-pixbuf-2.0) not met; consider
-
-
-
-- succeeded=no
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GLADE" >&5
-+echo $ECHO_N "checking for GLADE... $ECHO_C" >&6; }
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+if test -n "$GLADE_CFLAGS"; then
-+ pkg_cv_GLADE_CFLAGS="$GLADE_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= 2.4\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libglade-2.0 >= 2.4") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GLADE_CFLAGS=`$PKG_CONFIG --cflags "libglade-2.0 >= 2.4" 2>/dev/null`
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ pkg_failed=yes
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GLADE_LIBS"; then
-+ pkg_cv_GLADE_LIBS="$GLADE_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= 2.4\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libglade-2.0 >= 2.4") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GLADE_LIBS=`$PKG_CONFIG --libs "libglade-2.0 >= 2.4" 2>/dev/null`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
- fi
-
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for libglade-2.0 >= 2.4" >&5
--$as_echo_n "checking for libglade-2.0 >= 2.4... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "libglade-2.0 >= 2.4" ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GLADE_CFLAGS" >&5
--$as_echo_n "checking GLADE_CFLAGS... " >&6; }
-- GLADE_CFLAGS=`$PKG_CONFIG --cflags "libglade-2.0 >= 2.4"`
-- { $as_echo "$as_me:$LINENO: result: $GLADE_CFLAGS" >&5
--$as_echo "$GLADE_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GLADE_LIBS" >&5
--$as_echo_n "checking GLADE_LIBS... " >&6; }
-- GLADE_LIBS=`$PKG_CONFIG --libs "libglade-2.0 >= 2.4"`
-- { $as_echo "$as_me:$LINENO: result: $GLADE_LIBS" >&5
--$as_echo "$GLADE_LIBS" >&6; }
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GLADE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libglade-2.0 >= 2.4" 2>&1`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GLADE_CFLAGS=""
-- GLADE_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GLADE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libglade-2.0 >= 2.4" 2>&1`
-- echo $GLADE_PKG_ERRORS
-+ GLADE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libglade-2.0 >= 2.4" 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GLADE_PKG_ERRORS" >&5
-
-+ { { echo "$as_me:$LINENO: error: Package requirements (libglade-2.0 >= 2.4) were not met:
-
-+$GLADE_PKG_ERRORS
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-- if test $succeeded = yes; then
-- :
-- else
-- { { $as_echo "$as_me:$LINENO: error: Library requirements (libglade-2.0 >= 2.4) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
--$as_echo "$as_me: error: Library requirements (libglade-2.0 >= 2.4) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+Alternatively, you may set the environment variables GLADE_CFLAGS
-+and GLADE_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (libglade-2.0 >= 2.4) were not met:
-+
-+$GLADE_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables GLADE_CFLAGS
-+and GLADE_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-+elif test $pkg_failed = untried; then
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-
-+Alternatively, you may set the environment variables GLADE_CFLAGS
-+and GLADE_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables GLADE_CFLAGS
-+and GLADE_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ GLADE_CFLAGS=$pkg_cv_GLADE_CFLAGS
-+ GLADE_LIBS=$pkg_cv_GLADE_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ :
-+fi
-
- GIVEN_CFLAGS=$GLADE_CFLAGS
- INCLUDE_DIRS=`echo | cpp -v 2>&1`
-@@ -31424,304 +30966,480 @@ $as_echo "$as_me: error: Library requirements (libglade-2.0 >= 2.4) not met; con
- goffice_with_cairo=0
- have_goffice_0_5=0
-
-- succeeded=no
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
-+echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+if test -n "$GOFFICE_CFLAGS"; then
-+ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.8 >= 0.7.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.8 >= 0.7.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.8 >= 0.7.0" 2>/dev/null`
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ pkg_failed=yes
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GOFFICE_LIBS"; then
-+ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.8 >= 0.7.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.8 >= 0.7.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.8 >= 0.7.0" 2>/dev/null`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
- fi
-
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for libgoffice-0.8 >= 0.7.0" >&5
--$as_echo_n "checking for libgoffice-0.8 >= 0.7.0... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "libgoffice-0.8 >= 0.7.0" ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GOFFICE_CFLAGS" >&5
--$as_echo_n "checking GOFFICE_CFLAGS... " >&6; }
-- GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.8 >= 0.7.0"`
-- { $as_echo "$as_me:$LINENO: result: $GOFFICE_CFLAGS" >&5
--$as_echo "$GOFFICE_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GOFFICE_LIBS" >&5
--$as_echo_n "checking GOFFICE_LIBS... " >&6; }
-- GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.8 >= 0.7.0"`
-- { $as_echo "$as_me:$LINENO: result: $GOFFICE_LIBS" >&5
--$as_echo "$GOFFICE_LIBS" >&6; }
-- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GOFFICE_CFLAGS=""
-- GOFFICE_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.8 >= 0.7.0" 2>&1`
-+if test $pkg_failed = yes; then
-
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.8 >= 0.7.0" 2>&1`
-+ else
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.8 >= 0.7.0" 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GOFFICE_PKG_ERRORS" >&5
-
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
-+echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
-
-- if test $succeeded = yes; then
-- goffice=1
-- else
-+if test -n "$GOFFICE_CFLAGS"; then
-+ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.6 >= 0.6.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.6 >= 0.6.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.6 >= 0.6.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GOFFICE_LIBS"; then
-+ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.6 >= 0.6.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.6 >= 0.6.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.6 >= 0.6.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-
-
-- succeeded=no
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.6 >= 0.6.0" 2>&1`
-+ else
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.6 >= 0.6.0" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GOFFICE_PKG_ERRORS" >&5
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
-+echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
-+
-+if test -n "$GOFFICE_CFLAGS"; then
-+ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.5 >= 0.5.1\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.5 >= 0.5.1") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.5 >= 0.5.1" 2>/dev/null`
-+else
-+ pkg_failed=yes
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GOFFICE_LIBS"; then
-+ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.5 >= 0.5.1\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.5 >= 0.5.1") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.5 >= 0.5.1" 2>/dev/null`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
- fi
-
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for libgoffice-0.6 >= 0.6.0" >&5
--$as_echo_n "checking for libgoffice-0.6 >= 0.6.0... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "libgoffice-0.6 >= 0.6.0" ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GOFFICE_CFLAGS" >&5
--$as_echo_n "checking GOFFICE_CFLAGS... " >&6; }
-- GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.6 >= 0.6.0"`
-- { $as_echo "$as_me:$LINENO: result: $GOFFICE_CFLAGS" >&5
--$as_echo "$GOFFICE_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GOFFICE_LIBS" >&5
--$as_echo_n "checking GOFFICE_LIBS... " >&6; }
-- GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.6 >= 0.6.0"`
-- { $as_echo "$as_me:$LINENO: result: $GOFFICE_LIBS" >&5
--$as_echo "$GOFFICE_LIBS" >&6; }
-- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GOFFICE_CFLAGS=""
-- GOFFICE_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.6 >= 0.6.0" 2>&1`
-+if test $pkg_failed = yes; then
-
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
-+ else
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GOFFICE_PKG_ERRORS" >&5
-
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ goffice=0
-+elif test $pkg_failed = untried; then
-+ goffice=0
-+else
-+ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
-+ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ goffice=1
-+fi
-
-+elif test $pkg_failed = untried; then
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-
-- if test $succeeded = yes; then
-- goffice=1
-- else
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
-+echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
-
-+if test -n "$GOFFICE_CFLAGS"; then
-+ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.5 >= 0.5.1\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.5 >= 0.5.1") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.5 >= 0.5.1" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GOFFICE_LIBS"; then
-+ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.5 >= 0.5.1\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.5 >= 0.5.1") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.5 >= 0.5.1" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-
-- succeeded=no
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
-+ else
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GOFFICE_PKG_ERRORS" >&5
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ goffice=0
-+elif test $pkg_failed = untried; then
-+ goffice=0
-+else
-+ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
-+ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ goffice=1
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
-+ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ goffice=1
- fi
-
-+elif test $pkg_failed = untried; then
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for libgoffice-0.5 >= 0.5.1" >&5
--$as_echo_n "checking for libgoffice-0.5 >= 0.5.1... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "libgoffice-0.5 >= 0.5.1" ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GOFFICE_CFLAGS" >&5
--$as_echo_n "checking GOFFICE_CFLAGS... " >&6; }
-- GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.5 >= 0.5.1"`
-- { $as_echo "$as_me:$LINENO: result: $GOFFICE_CFLAGS" >&5
--$as_echo "$GOFFICE_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GOFFICE_LIBS" >&5
--$as_echo_n "checking GOFFICE_LIBS... " >&6; }
-- GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.5 >= 0.5.1"`
-- { $as_echo "$as_me:$LINENO: result: $GOFFICE_LIBS" >&5
--$as_echo "$GOFFICE_LIBS" >&6; }
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
-+echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
-+
-+if test -n "$GOFFICE_CFLAGS"; then
-+ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.6 >= 0.6.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.6 >= 0.6.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.6 >= 0.6.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GOFFICE_LIBS"; then
-+ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.6 >= 0.6.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.6 >= 0.6.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.6 >= 0.6.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.6 >= 0.6.0" 2>&1`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GOFFICE_CFLAGS=""
-- GOFFICE_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.6 >= 0.6.0" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GOFFICE_PKG_ERRORS" >&5
-+
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
-+echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
-+
-+if test -n "$GOFFICE_CFLAGS"; then
-+ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.5 >= 0.5.1\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.5 >= 0.5.1") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.5 >= 0.5.1" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GOFFICE_LIBS"; then
-+ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.5 >= 0.5.1\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.5 >= 0.5.1") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.5 >= 0.5.1" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
-+ else
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GOFFICE_PKG_ERRORS" >&5
-
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ goffice=0
-+elif test $pkg_failed = untried; then
-+ goffice=0
-+else
-+ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
-+ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ goffice=1
-+fi
-
-+elif test $pkg_failed = untried; then
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-
-- if test $succeeded = yes; then
-- goffice=1
-- else
-- goffice=0
-- fi
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
-+echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
-+
-+if test -n "$GOFFICE_CFLAGS"; then
-+ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.5 >= 0.5.1\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.5 >= 0.5.1") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.5 >= 0.5.1" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GOFFICE_LIBS"; then
-+ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.5 >= 0.5.1\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.5 >= 0.5.1") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.5 >= 0.5.1" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-
-
-- fi
-
-+if test $pkg_failed = yes; then
-
-- fi
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
-+ else
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GOFFICE_PKG_ERRORS" >&5
-
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ goffice=0
-+elif test $pkg_failed = untried; then
-+ goffice=0
-+else
-+ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
-+ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ goffice=1
-+fi
-+
-+else
-+ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
-+ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ goffice=1
-+fi
-+
-+else
-+ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
-+ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ goffice=1
-+fi
- if test x$goffice = x1
- then
-
-@@ -31738,308 +31456,512 @@ _ACEOF
- goffice_with_cairo=1
- else
-
-- succeeded=no
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
-+echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+if test -n "$GOFFICE_CFLAGS"; then
-+ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.4 >= 0.4.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.4 >= 0.4.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.4 >= 0.4.0" 2>/dev/null`
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ pkg_failed=yes
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GOFFICE_LIBS"; then
-+ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.4 >= 0.4.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.4 >= 0.4.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.4 >= 0.4.0" 2>/dev/null`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
- fi
-
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for libgoffice-0.4 >= 0.4.0" >&5
--$as_echo_n "checking for libgoffice-0.4 >= 0.4.0... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "libgoffice-0.4 >= 0.4.0" ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GOFFICE_CFLAGS" >&5
--$as_echo_n "checking GOFFICE_CFLAGS... " >&6; }
-- GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.4 >= 0.4.0"`
-- { $as_echo "$as_me:$LINENO: result: $GOFFICE_CFLAGS" >&5
--$as_echo "$GOFFICE_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GOFFICE_LIBS" >&5
--$as_echo_n "checking GOFFICE_LIBS... " >&6; }
-- GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.4 >= 0.4.0"`
-- { $as_echo "$as_me:$LINENO: result: $GOFFICE_LIBS" >&5
--$as_echo "$GOFFICE_LIBS" >&6; }
-- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GOFFICE_CFLAGS=""
-- GOFFICE_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.4 >= 0.4.0" 2>&1`
-+if test $pkg_failed = yes; then
-
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.4 >= 0.4.0" 2>&1`
-+ else
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.4 >= 0.4.0" 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GOFFICE_PKG_ERRORS" >&5
-
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
-+echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
-
-- if test $succeeded = yes; then
-- goffice=1
-- else
-+if test -n "$GOFFICE_CFLAGS"; then
-+ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.3 >= 0.3.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.3 >= 0.3.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.3 >= 0.3.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GOFFICE_LIBS"; then
-+ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.3 >= 0.3.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.3 >= 0.3.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.3 >= 0.3.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-
-
-- succeeded=no
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.3 >= 0.3.0" 2>&1`
-+ else
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.3 >= 0.3.0" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GOFFICE_PKG_ERRORS" >&5
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
-+echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
-+
-+if test -n "$GOFFICE_CFLAGS"; then
-+ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= 0.0.4\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= 0.0.4") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-1 >= 0.0.4" 2>/dev/null`
-+else
-+ pkg_failed=yes
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GOFFICE_LIBS"; then
-+ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= 0.0.4\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= 0.0.4") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-1 >= 0.0.4" 2>/dev/null`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
- fi
-
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for libgoffice-0.3 >= 0.3.0" >&5
--$as_echo_n "checking for libgoffice-0.3 >= 0.3.0... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "libgoffice-0.3 >= 0.3.0" ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GOFFICE_CFLAGS" >&5
--$as_echo_n "checking GOFFICE_CFLAGS... " >&6; }
-- GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.3 >= 0.3.0"`
-- { $as_echo "$as_me:$LINENO: result: $GOFFICE_CFLAGS" >&5
--$as_echo "$GOFFICE_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GOFFICE_LIBS" >&5
--$as_echo_n "checking GOFFICE_LIBS... " >&6; }
-- GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.3 >= 0.3.0"`
-- { $as_echo "$as_me:$LINENO: result: $GOFFICE_LIBS" >&5
--$as_echo "$GOFFICE_LIBS" >&6; }
-- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GOFFICE_CFLAGS=""
-- GOFFICE_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.3 >= 0.3.0" 2>&1`
-+if test $pkg_failed = yes; then
-
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
-+ else
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GOFFICE_PKG_ERRORS" >&5
-
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
-+ { { echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
-+echo "$as_me: error: Cannot find libgoffice." >&2;}
-+ { (exit 1); exit 1; }; }
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+elif test $pkg_failed = untried; then
-
-- if test $succeeded = yes; then
-- goffice=1
-- else
-+ { { echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
-+echo "$as_me: error: Cannot find libgoffice." >&2;}
-+ { (exit 1); exit 1; }; }
-
-+else
-+ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
-+ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ goffice=1
-+fi
-
-- succeeded=no
-+elif test $pkg_failed = untried; then
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
-+echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
-+
-+if test -n "$GOFFICE_CFLAGS"; then
-+ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= 0.0.4\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= 0.0.4") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-1 >= 0.0.4" 2>/dev/null`
-+else
-+ pkg_failed=yes
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GOFFICE_LIBS"; then
-+ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= 0.0.4\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= 0.0.4") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-1 >= 0.0.4" 2>/dev/null`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
- fi
-
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for libgoffice-1 >= 0.0.4" >&5
--$as_echo_n "checking for libgoffice-1 >= 0.0.4... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "libgoffice-1 >= 0.0.4" ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GOFFICE_CFLAGS" >&5
--$as_echo_n "checking GOFFICE_CFLAGS... " >&6; }
-- GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-1 >= 0.0.4"`
-- { $as_echo "$as_me:$LINENO: result: $GOFFICE_CFLAGS" >&5
--$as_echo "$GOFFICE_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GOFFICE_LIBS" >&5
--$as_echo_n "checking GOFFICE_LIBS... " >&6; }
-- GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-1 >= 0.0.4"`
-- { $as_echo "$as_me:$LINENO: result: $GOFFICE_LIBS" >&5
--$as_echo "$GOFFICE_LIBS" >&6; }
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GOFFICE_CFLAGS=""
-- GOFFICE_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GOFFICE_PKG_ERRORS" >&5
-+
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+ { { echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
-+echo "$as_me: error: Cannot find libgoffice." >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+elif test $pkg_failed = untried; then
-+
-+ { { echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
-+echo "$as_me: error: Cannot find libgoffice." >&2;}
-+ { (exit 1); exit 1; }; }
-
-+else
-+ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
-+ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ goffice=1
-+fi
-+
-+else
-+ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
-+ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ goffice=1
-+fi
-+
-+elif test $pkg_failed = untried; then
-+
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
-+echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
-+
-+if test -n "$GOFFICE_CFLAGS"; then
-+ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.3 >= 0.3.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.3 >= 0.3.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.3 >= 0.3.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GOFFICE_LIBS"; then
-+ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.3 >= 0.3.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.3 >= 0.3.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.3 >= 0.3.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.3 >= 0.3.0" 2>&1`
-+ else
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.3 >= 0.3.0" 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GOFFICE_PKG_ERRORS" >&5
-
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
-+echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
-+
-+if test -n "$GOFFICE_CFLAGS"; then
-+ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= 0.0.4\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= 0.0.4") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-1 >= 0.0.4" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GOFFICE_LIBS"; then
-+ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= 0.0.4\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= 0.0.4") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-1 >= 0.0.4" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-
-- if test $succeeded = yes; then
-- goffice=1
-- else
-
-- { { $as_echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
--$as_echo "$as_me: error: Cannot find libgoffice." >&2;}
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
-+ else
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GOFFICE_PKG_ERRORS" >&5
-+
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+ { { echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
-+echo "$as_me: error: Cannot find libgoffice." >&2;}
- { (exit 1); exit 1; }; }
-
-- fi
-+elif test $pkg_failed = untried; then
-
-+ { { echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
-+echo "$as_me: error: Cannot find libgoffice." >&2;}
-+ { (exit 1); exit 1; }; }
-
-- fi
-+else
-+ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
-+ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ goffice=1
-+fi
-
-+elif test $pkg_failed = untried; then
-
-- fi
-
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
-+echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
-+
-+if test -n "$GOFFICE_CFLAGS"; then
-+ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= 0.0.4\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= 0.0.4") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-1 >= 0.0.4" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GOFFICE_LIBS"; then
-+ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= 0.0.4\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= 0.0.4") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-1 >= 0.0.4" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
-+ else
-+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GOFFICE_PKG_ERRORS" >&5
-+
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+ { { echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
-+echo "$as_me: error: Cannot find libgoffice." >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+elif test $pkg_failed = untried; then
-+
-+ { { echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
-+echo "$as_me: error: Cannot find libgoffice." >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+else
-+ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
-+ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ goffice=1
-+fi
-+
-+else
-+ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
-+ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ goffice=1
-+fi
-+
-+else
-+ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
-+ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ goffice=1
-+fi
- fi
-
- GIVEN_CFLAGS=$GOFFICE_CFLAGS
-@@ -32059,17 +31981,17 @@ $as_echo "$as_me: error: Cannot find libgoffice." >&2;}
- saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${GOFFICE_CFLAGS} ${CPPFLAGS}"
- if test "${ac_cv_header_goffice_graph_gog_renderer_cairo_h+set}" = set; then
-- { $as_echo "$as_me:$LINENO: checking for goffice/graph/gog-renderer-cairo.h" >&5
--$as_echo_n "checking for goffice/graph/gog-renderer-cairo.h... " >&6; }
-+ { echo "$as_me:$LINENO: checking for goffice/graph/gog-renderer-cairo.h" >&5
-+echo $ECHO_N "checking for goffice/graph/gog-renderer-cairo.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_goffice_graph_gog_renderer_cairo_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_goffice_graph_gog_renderer_cairo_h" >&5
--$as_echo "$ac_cv_header_goffice_graph_gog_renderer_cairo_h" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_goffice_graph_gog_renderer_cairo_h" >&5
-+echo "${ECHO_T}$ac_cv_header_goffice_graph_gog_renderer_cairo_h" >&6; }
- else
- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking goffice/graph/gog-renderer-cairo.h usability" >&5
--$as_echo_n "checking goffice/graph/gog-renderer-cairo.h usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking goffice/graph/gog-renderer-cairo.h usability" >&5
-+echo $ECHO_N "checking goffice/graph/gog-renderer-cairo.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -32085,33 +32007,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking goffice/graph/gog-renderer-cairo.h presence" >&5
--$as_echo_n "checking goffice/graph/gog-renderer-cairo.h presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking goffice/graph/gog-renderer-cairo.h presence" >&5
-+echo $ECHO_N "checking goffice/graph/gog-renderer-cairo.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -32125,52 +32046,51 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
-
- rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: proceeding with the compiler's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: in the future, the compiler will take precedence" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
- ## ---------------------------------------- ##
- ## Report this to gnucash-devel at gnucash.org ##
-@@ -32179,18 +32099,18 @@ _ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for goffice/graph/gog-renderer-cairo.h" >&5
--$as_echo_n "checking for goffice/graph/gog-renderer-cairo.h... " >&6; }
-+{ echo "$as_me:$LINENO: checking for goffice/graph/gog-renderer-cairo.h" >&5
-+echo $ECHO_N "checking for goffice/graph/gog-renderer-cairo.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_goffice_graph_gog_renderer_cairo_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_goffice_graph_gog_renderer_cairo_h=$ac_header_preproc
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_goffice_graph_gog_renderer_cairo_h" >&5
--$as_echo "$ac_cv_header_goffice_graph_gog_renderer_cairo_h" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_goffice_graph_gog_renderer_cairo_h" >&5
-+echo "${ECHO_T}$ac_cv_header_goffice_graph_gog_renderer_cairo_h" >&6; }
-
- fi
--if test "x$ac_cv_header_goffice_graph_gog_renderer_cairo_h" = x""yes; then
-+if test $ac_cv_header_goffice_graph_gog_renderer_cairo_h = yes; then
-
-
- cat >>confdefs.h <<\_ACEOF
-@@ -32212,106 +32132,77 @@ fi
- # check for gtkhtml >= 3.14 with gtkprint support
- gtkhtml=0
-
-- succeeded=no
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-+echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+if test -n "$GTKHTML_CFLAGS"; then
-+ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14" 2>/dev/null`
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ pkg_failed=yes
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTKHTML_LIBS"; then
-+ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14" 2>/dev/null`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
- fi
-
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for libgtkhtml-3.14" >&5
--$as_echo_n "checking for libgtkhtml-3.14... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "libgtkhtml-3.14" ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GTKHTML_CFLAGS" >&5
--$as_echo_n "checking GTKHTML_CFLAGS... " >&6; }
-- GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14"`
-- { $as_echo "$as_me:$LINENO: result: $GTKHTML_CFLAGS" >&5
--$as_echo "$GTKHTML_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GTKHTML_LIBS" >&5
--$as_echo_n "checking GTKHTML_LIBS... " >&6; }
-- GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14"`
-- { $as_echo "$as_me:$LINENO: result: $GTKHTML_LIBS" >&5
--$as_echo "$GTKHTML_LIBS" >&6; }
-- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GTKHTML_CFLAGS=""
-- GTKHTML_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.14" 2>&1`
-+if test $pkg_failed = yes; then
-
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.14" 2>&1`
-+ else
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.14" 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTKHTML_PKG_ERRORS" >&5
-
--
--
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
--
-- if test $succeeded = yes; then
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ gtkhtml=0
-+elif test $pkg_failed = untried; then
-+ gtkhtml=0
-+else
-+ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-+ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- if test "x$HAVE_GTK_2_10" != "xyes"; then
-- { $as_echo "$as_me:$LINENO: Found libgtkhtml-3.14, but not gtk+-2.0 >= 2.10" >&5
--$as_echo "$as_me: Found libgtkhtml-3.14, but not gtk+-2.0 >= 2.10" >&6;}
-+ { echo "$as_me:$LINENO: Found libgtkhtml-3.14, but not gtk+-2.0 >= 2.10" >&5
-+echo "$as_me: Found libgtkhtml-3.14, but not gtk+-2.0 >= 2.10" >&6;}
- elif test "x$goffice_with_cairo" != "x1"; then
-- { $as_echo "$as_me:$LINENO: Found libgtkhtml-3.14, but goffice lacks a cairo renderer" >&5
--$as_echo "$as_me: Found libgtkhtml-3.14, but goffice lacks a cairo renderer" >&6;}
-+ { echo "$as_me:$LINENO: Found libgtkhtml-3.14, but goffice lacks a cairo renderer" >&5
-+echo "$as_me: Found libgtkhtml-3.14, but goffice lacks a cairo renderer" >&6;}
- else
- gtkhtml=1
-
-@@ -32321,10 +32212,7 @@ _ACEOF
-
- fi
-
-- else
-- gtkhtml=0
-- fi
--
-+fi
- if test "x$gtkhtml" = "x1"; then
- GTKHTML_USES_GTKPRINT_TRUE=
- GTKHTML_USES_GTKPRINT_FALSE='#'
-@@ -32336,18 +32224,18 @@ fi
-
- # GOffice >= 0.5 requires GtkHTML >= 3.14
- if test x$have_goffice_0_5 = x1 -a x$gtkhtml = x0 ; then
-- { { $as_echo "$as_me:$LINENO: error: Goffice uses Cairo/GtkPrint but didn't find GtkHTML with GtkPrint support" >&5
--$as_echo "$as_me: error: Goffice uses Cairo/GtkPrint but didn't find GtkHTML with GtkPrint support" >&2;}
-+ { { echo "$as_me:$LINENO: error: Goffice uses Cairo/GtkPrint but didn't find GtkHTML with GtkPrint support" >&5
-+echo "$as_me: error: Goffice uses Cairo/GtkPrint but didn't find GtkHTML with GtkPrint support" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- # check for gtkhtml >= 3.16 (includes gtk_html_print_operation_run())
- if test x$gtkhtml = x1; then
-- { $as_echo "$as_me:$LINENO: checking for GtkHTML - version >= 3.16.0" >&5
--$as_echo_n "checking for GtkHTML - version >= 3.16.0... " >&6; }
-+ { echo "$as_me:$LINENO: checking for GtkHTML - version >= 3.16.0" >&5
-+echo $ECHO_N "checking for GtkHTML - version >= 3.16.0... $ECHO_C" >&6; }
- if $PKG_CONFIG 'libgtkhtml-3.14 >= 3.16.0'; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GTKHTML_3_16 1
-@@ -32355,8 +32243,8 @@ _ACEOF
-
- HAVE_GTKHTML_3_16=1
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- fi
-
-@@ -32364,510 +32252,1196 @@ $as_echo "no" >&6; }
- if test x$gtkhtml = x0
- then
-
-- succeeded=no
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-+echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+if test -n "$GTKHTML_CFLAGS"; then
-+ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8 " 2>/dev/null`
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTKHTML_LIBS"; then
-+ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.8 " 2>&1`
-+ else
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.8 " 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTKHTML_PKG_ERRORS" >&5
-+
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-+echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
-+
-+if test -n "$GTKHTML_CFLAGS"; then
-+ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.6 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.6 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.6 " 2>/dev/null`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTKHTML_LIBS"; then
-+ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.6 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.6 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.6 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
- fi
-
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for libgtkhtml-3.8 " >&5
--$as_echo_n "checking for libgtkhtml-3.8 ... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "libgtkhtml-3.8 " ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GTKHTML_CFLAGS" >&5
--$as_echo_n "checking GTKHTML_CFLAGS... " >&6; }
-- GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8 "`
-- { $as_echo "$as_me:$LINENO: result: $GTKHTML_CFLAGS" >&5
--$as_echo "$GTKHTML_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GTKHTML_LIBS" >&5
--$as_echo_n "checking GTKHTML_LIBS... " >&6; }
-- GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8 "`
-- { $as_echo "$as_me:$LINENO: result: $GTKHTML_LIBS" >&5
--$as_echo "$GTKHTML_LIBS" >&6; }
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.6 " 2>&1`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GTKHTML_CFLAGS=""
-- GTKHTML_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.8 " 2>&1`
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.6 " 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTKHTML_PKG_ERRORS" >&5
-+
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-+echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
-+
-+if test -n "$GTKHTML_CFLAGS"; then
-+ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.2 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.2 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.2 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTKHTML_LIBS"; then
-+ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.2 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.2 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.2 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.2 " 2>&1`
-+ else
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.2 " 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTKHTML_PKG_ERRORS" >&5
-
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-+echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
-
-- if test $succeeded = yes; then
-- gtkhtml=1
-- else
-+if test -n "$GTKHTML_CFLAGS"; then
-+ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTKHTML_LIBS"; then
-+ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-
-
-- succeeded=no
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.1 " 2>&1`
-+ else
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.1 " 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTKHTML_PKG_ERRORS" >&5
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
-+echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+elif test $pkg_failed = untried; then
-+
-+ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
-+echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+else
-+ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-+ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ gtkhtml=1
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+
-+elif test $pkg_failed = untried; then
-+
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-+echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
-+
-+if test -n "$GTKHTML_CFLAGS"; then
-+ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTKHTML_LIBS"; then
-+ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 " 2>/dev/null`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
- fi
-
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for libgtkhtml-3.6 " >&5
--$as_echo_n "checking for libgtkhtml-3.6 ... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "libgtkhtml-3.6 " ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GTKHTML_CFLAGS" >&5
--$as_echo_n "checking GTKHTML_CFLAGS... " >&6; }
-- GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.6 "`
-- { $as_echo "$as_me:$LINENO: result: $GTKHTML_CFLAGS" >&5
--$as_echo "$GTKHTML_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GTKHTML_LIBS" >&5
--$as_echo_n "checking GTKHTML_LIBS... " >&6; }
-- GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.6 "`
-- { $as_echo "$as_me:$LINENO: result: $GTKHTML_LIBS" >&5
--$as_echo "$GTKHTML_LIBS" >&6; }
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.1 " 2>&1`
-+ else
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.1 " 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTKHTML_PKG_ERRORS" >&5
-+
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
-+echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+elif test $pkg_failed = untried; then
-+
-+ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
-+echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+else
-+ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-+ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ gtkhtml=1
-+fi
-+
-+else
-+ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-+ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ gtkhtml=1
-+fi
-+
-+elif test $pkg_failed = untried; then
-+
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-+echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
-+
-+if test -n "$GTKHTML_CFLAGS"; then
-+ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.2 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.2 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.2 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTKHTML_LIBS"; then
-+ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.2 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.2 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.2 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.2 " 2>&1`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GTKHTML_CFLAGS=""
-- GTKHTML_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.6 " 2>&1`
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.2 " 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTKHTML_PKG_ERRORS" >&5
-+
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-+echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
-+
-+if test -n "$GTKHTML_CFLAGS"; then
-+ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTKHTML_LIBS"; then
-+ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.1 " 2>&1`
-+ else
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.1 " 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTKHTML_PKG_ERRORS" >&5
-
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
-+ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
-+echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
-+ { (exit 1); exit 1; }; }
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+elif test $pkg_failed = untried; then
-
-- if test $succeeded = yes; then
-- gtkhtml=1
-- else
-+ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
-+echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
-+ { (exit 1); exit 1; }; }
-
-+else
-+ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-+ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ gtkhtml=1
-+fi
-
-- succeeded=no
-+elif test $pkg_failed = untried; then
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-+echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
-+
-+if test -n "$GTKHTML_CFLAGS"; then
-+ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 " 2>/dev/null`
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTKHTML_LIBS"; then
-+ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.1 " 2>&1`
-+ else
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.1 " 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTKHTML_PKG_ERRORS" >&5
-+
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
-+echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+elif test $pkg_failed = untried; then
-+
-+ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
-+echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
-+ { (exit 1); exit 1; }; }
-+
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-+ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ gtkhtml=1
- fi
-
-+else
-+ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-+ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ gtkhtml=1
-+fi
-
-- fi
-+else
-+ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-+ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ gtkhtml=1
-+fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for libgtkhtml-3.2 " >&5
--$as_echo_n "checking for libgtkhtml-3.2 ... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "libgtkhtml-3.2 " ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GTKHTML_CFLAGS" >&5
--$as_echo_n "checking GTKHTML_CFLAGS... " >&6; }
-- GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.2 "`
-- { $as_echo "$as_me:$LINENO: result: $GTKHTML_CFLAGS" >&5
--$as_echo "$GTKHTML_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GTKHTML_LIBS" >&5
--$as_echo_n "checking GTKHTML_LIBS... " >&6; }
-- GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.2 "`
-- { $as_echo "$as_me:$LINENO: result: $GTKHTML_LIBS" >&5
--$as_echo "$GTKHTML_LIBS" >&6; }
-+elif test $pkg_failed = untried; then
-+
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-+echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
-+
-+if test -n "$GTKHTML_CFLAGS"; then
-+ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.6 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.6 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.6 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTKHTML_LIBS"; then
-+ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.6 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.6 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.6 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.6 " 2>&1`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GTKHTML_CFLAGS=""
-- GTKHTML_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.2 " 2>&1`
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.6 " 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTKHTML_PKG_ERRORS" >&5
-+
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-+echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
-+
-+if test -n "$GTKHTML_CFLAGS"; then
-+ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.2 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.2 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.2 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTKHTML_LIBS"; then
-+ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.2 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.2 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.2 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.2 " 2>&1`
-+ else
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.2 " 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTKHTML_PKG_ERRORS" >&5
-
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-+echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
-
-- if test $succeeded = yes; then
-- gtkhtml=1
-- else
-+if test -n "$GTKHTML_CFLAGS"; then
-+ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTKHTML_LIBS"; then
-+ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-
-
-- succeeded=no
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.1 " 2>&1`
-+ else
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.1 " 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTKHTML_PKG_ERRORS" >&5
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
-+echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+elif test $pkg_failed = untried; then
-+
-+ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
-+echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+else
-+ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-+ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ gtkhtml=1
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+
-+elif test $pkg_failed = untried; then
-+
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-+echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
-+
-+if test -n "$GTKHTML_CFLAGS"; then
-+ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 " 2>/dev/null`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTKHTML_LIBS"; then
-+ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
- fi
-
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for libgtkhtml-3.1 " >&5
--$as_echo_n "checking for libgtkhtml-3.1 ... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "libgtkhtml-3.1 " ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GTKHTML_CFLAGS" >&5
--$as_echo_n "checking GTKHTML_CFLAGS... " >&6; }
-- GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 "`
-- { $as_echo "$as_me:$LINENO: result: $GTKHTML_CFLAGS" >&5
--$as_echo "$GTKHTML_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GTKHTML_LIBS" >&5
--$as_echo_n "checking GTKHTML_LIBS... " >&6; }
-- GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 "`
-- { $as_echo "$as_me:$LINENO: result: $GTKHTML_LIBS" >&5
--$as_echo "$GTKHTML_LIBS" >&6; }
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.1 " 2>&1`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GTKHTML_CFLAGS=""
-- GTKHTML_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.1 " 2>&1`
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.1 " 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTKHTML_PKG_ERRORS" >&5
-+
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
-+echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+elif test $pkg_failed = untried; then
-+
-+ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
-+echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+else
-+ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-+ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ gtkhtml=1
-+fi
-+
-+else
-+ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-+ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ gtkhtml=1
-+fi
-+
-+elif test $pkg_failed = untried; then
-+
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-+echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
-+
-+if test -n "$GTKHTML_CFLAGS"; then
-+ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.2 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.2 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.2 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTKHTML_LIBS"; then
-+ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.2 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.2 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.2 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.2 " 2>&1`
-+ else
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.2 " 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTKHTML_PKG_ERRORS" >&5
-
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-+echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
-+
-+if test -n "$GTKHTML_CFLAGS"; then
-+ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTKHTML_LIBS"; then
-+ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-
-- if test $succeeded = yes; then
-- gtkhtml=1
-- else
-
-- { { $as_echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
--$as_echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.1 " 2>&1`
-+ else
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.1 " 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTKHTML_PKG_ERRORS" >&5
-+
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
-+echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
- { (exit 1); exit 1; }; }
-
-- fi
-+elif test $pkg_failed = untried; then
-
-+ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
-+echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
-+ { (exit 1); exit 1; }; }
-
-- fi
-+else
-+ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-+ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ gtkhtml=1
-+fi
-
-+elif test $pkg_failed = untried; then
-
-- fi
-
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-+echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
-
-- fi
-+if test -n "$GTKHTML_CFLAGS"; then
-+ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GTKHTML_LIBS"; then
-+ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-
-
-
-- succeeded=no
-+if test $pkg_failed = yes; then
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.1 " 2>&1`
-+ else
-+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.1 " 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTKHTML_PKG_ERRORS" >&5
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
-+echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+elif test $pkg_failed = untried; then
-+
-+ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
-+echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+else
-+ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-+ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ gtkhtml=1
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-+ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ gtkhtml=1
- fi
-
-+else
-+ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-+ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ gtkhtml=1
-+fi
-
-- fi
-+else
-+ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-+ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ gtkhtml=1
-+fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- pkg_config_min_version=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
-- { $as_echo "$as_me:$LINENO: checking for libgnomeprint-2.2 libgnomeprintui-2.2" >&5
--$as_echo_n "checking for libgnomeprint-2.2 libgnomeprintui-2.2... " >&6; }
--
-- if $PKG_CONFIG --silence-errors --exists "libgnomeprint-2.2 libgnomeprintui-2.2" ; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:$LINENO: checking GNOME_PRINT_CFLAGS" >&5
--$as_echo_n "checking GNOME_PRINT_CFLAGS... " >&6; }
-- GNOME_PRINT_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprint-2.2 libgnomeprintui-2.2"`
-- { $as_echo "$as_me:$LINENO: result: $GNOME_PRINT_CFLAGS" >&5
--$as_echo "$GNOME_PRINT_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:$LINENO: checking GNOME_PRINT_LIBS" >&5
--$as_echo_n "checking GNOME_PRINT_LIBS... " >&6; }
-- GNOME_PRINT_LIBS=`$PKG_CONFIG --libs "libgnomeprint-2.2 libgnomeprintui-2.2"`
-- { $as_echo "$as_me:$LINENO: result: $GNOME_PRINT_LIBS" >&5
--$as_echo "$GNOME_PRINT_LIBS" >&6; }
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for GNOME_PRINT" >&5
-+echo $ECHO_N "checking for GNOME_PRINT... $ECHO_C" >&6; }
-+
-+if test -n "$GNOME_PRINT_CFLAGS"; then
-+ pkg_cv_GNOME_PRINT_CFLAGS="$GNOME_PRINT_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprint-2.2 libgnomeprintui-2.2\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GNOME_PRINT_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprint-2.2 libgnomeprintui-2.2" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GNOME_PRINT_LIBS"; then
-+ pkg_cv_GNOME_PRINT_LIBS="$GNOME_PRINT_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprint-2.2 libgnomeprintui-2.2\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GNOME_PRINT_LIBS=`$PKG_CONFIG --libs "libgnomeprint-2.2 libgnomeprintui-2.2" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GNOME_PRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2" 2>&1`
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- GNOME_PRINT_CFLAGS=""
-- GNOME_PRINT_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GNOME_PRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2" 2>&1`
-- echo $GNOME_PRINT_PKG_ERRORS
-+ GNOME_PRINT_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2" 2>&1`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GNOME_PRINT_PKG_ERRORS" >&5
-
-+ { { echo "$as_me:$LINENO: error: Package requirements (libgnomeprint-2.2 libgnomeprintui-2.2) were not met:
-
-+$GNOME_PRINT_PKG_ERRORS
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-- if test $succeeded = yes; then
-- :
-- else
-- { { $as_echo "$as_me:$LINENO: error: Library requirements (libgnomeprint-2.2 libgnomeprintui-2.2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
--$as_echo "$as_me: error: Library requirements (libgnomeprint-2.2 libgnomeprintui-2.2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+Alternatively, you may set the environment variables GNOME_PRINT_CFLAGS
-+and GNOME_PRINT_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (libgnomeprint-2.2 libgnomeprintui-2.2) were not met:
-+
-+$GNOME_PRINT_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables GNOME_PRINT_CFLAGS
-+and GNOME_PRINT_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-+elif test $pkg_failed = untried; then
-+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables GNOME_PRINT_CFLAGS
-+and GNOME_PRINT_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-
-+Alternatively, you may set the environment variables GNOME_PRINT_CFLAGS
-+and GNOME_PRINT_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ GNOME_PRINT_CFLAGS=$pkg_cv_GNOME_PRINT_CFLAGS
-+ GNOME_PRINT_LIBS=$pkg_cv_GNOME_PRINT_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ :
-+fi
-
- GIVEN_CFLAGS=$GNOME_PRINT_CFLAGS
- INCLUDE_DIRS=`echo | cpp -v 2>&1`
-@@ -32910,7 +33484,7 @@ if test "${enable_efence+set}" = set; then
- USE_EFENCE=1
-
- cat >>confdefs.h <<\_ACEOF
--#define USE_EFENCE /**/
-+#define USE_EFENCE
- _ACEOF
-
- fi
-@@ -32930,7 +33504,7 @@ fi
- GNOME=1
-
- cat >>confdefs.h <<\_ACEOF
--#define GNOME /**/
-+#define GNOME
- _ACEOF
-
- else
-@@ -33068,11 +33642,11 @@ fi
-
- for ac_func in pthread_mutex_init
- do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -33125,42 +33699,35 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -33170,11 +33737,11 @@ done
-
- for ac_func in strptime localtime_r
- do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -33227,42 +33794,35 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- else
-@@ -33290,8 +33850,8 @@ fi
- ###-------------------------------------------------------------------------
-
- # This has to come after AC_PROG_CC _AND_ GNOME_COMPILE_WARNINGS
--{ $as_echo "$as_me:$LINENO: checking what extra warning flags to pass to the C compiler" >&5
--$as_echo_n "checking what extra warning flags to pass to the C compiler... " >&6; }
-+{ echo "$as_me:$LINENO: checking what extra warning flags to pass to the C compiler" >&5
-+echo $ECHO_N "checking what extra warning flags to pass to the C compiler... $ECHO_C" >&6; }
- if test ${GCC}x = yesx
- then
- warnFLAGS=
-@@ -33319,8 +33879,8 @@ if test "${enable_error_on_warning+set}" = set; then
- enableval=$enable_error_on_warning; case "${enableval}" in
- yes) warnFLAGS="${warnFLAGS} -Werror" ; gnc_error_on_warning=yes ;;
- no) gnc_error_on_warning=no ;;
-- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-error-on-warning" >&5
--$as_echo "$as_me: error: bad value ${enableval} for --enable-error-on-warning" >&2;}
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-error-on-warning" >&5
-+echo "$as_me: error: bad value ${enableval} for --enable-error-on-warning" >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
- else
-@@ -33357,8 +33917,8 @@ fi
- else
- warnFLAGS=none
- fi
--{ $as_echo "$as_me:$LINENO: result: $warnFLAGS" >&5
--$as_echo "$warnFLAGS" >&6; }
-+{ echo "$as_me:$LINENO: result: $warnFLAGS" >&5
-+echo "${ECHO_T}$warnFLAGS" >&6; }
-
- # Adjust CFLAGS and LDFLAGS on Windows
- if test "x${platform_win32}" = "xyes"; then
-@@ -33412,12 +33972,11 @@ _ACEOF
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
-- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
--$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
-- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) $as_unset $ac_var ;;
- esac ;;
- esac
-@@ -33450,12 +34009,12 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
- if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
- if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
-- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
--$as_echo "$as_me: updating cache $cache_file" >&6;}
-+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
- else
-- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
--$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
- fi
- rm -f confcache
-@@ -33471,7 +34030,7 @@ ac_ltlibobjs=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-+ ac_i=`echo "$ac_i" | sed "$ac_script"`
- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
- # will be set to the directory where LIBOBJS objects are built.
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-@@ -33483,16 +34042,16 @@ LTLIBOBJS=$ac_ltlibobjs
-
-
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-+echo "$as_me: error: conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-@@ -33501,161 +34060,166 @@ fi
-
-
- if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-+echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
--
- if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"OS_WIN32\" was never defined.
-+echo "$as_me: error: conditional \"OS_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined.
-+echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILDING_FROM_SVN_TRUE}" && test -z "${BUILDING_FROM_SVN_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILDING_FROM_SVN\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"BUILDING_FROM_SVN\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"BUILDING_FROM_SVN\" was never defined.
-+echo "$as_me: error: conditional \"BUILDING_FROM_SVN\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${GNUCASH_SEPARATE_BUILDDIR_TRUE}" && test -z "${GNUCASH_SEPARATE_BUILDDIR_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GNUCASH_SEPARATE_BUILDDIR\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"GNUCASH_SEPARATE_BUILDDIR\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GNUCASH_SEPARATE_BUILDDIR\" was never defined.
-+echo "$as_me: error: conditional \"GNUCASH_SEPARATE_BUILDDIR\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_X11_XLIB_H_TRUE}" && test -z "${HAVE_X11_XLIB_H_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_X11_XLIB_H\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_X11_XLIB_H\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_X11_XLIB_H\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_X11_XLIB_H\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_GLIB_2_8_TRUE}" && test -z "${HAVE_GLIB_2_8_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GLIB_2_8\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GLIB_2_8\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_GLIB_2_8\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_GLIB_2_8\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_GLIB_2_8_TRUE}" && test -z "${HAVE_GLIB_2_8_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GLIB_2_8\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GLIB_2_8\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"HAVE_GLIB_2_8\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${GDK_TARGET_QUARTZ_TRUE}" && test -z "${GDK_TARGET_QUARTZ_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"GDK_TARGET_QUARTZ\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_GLIB_2_8\" was never defined.
-+echo "$as_me: error: conditional \"GDK_TARGET_QUARTZ\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${GUILE_TRUE}" && test -z "${GUILE_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GUILE\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"GUILE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GUILE\" was never defined.
-+echo "$as_me: error: conditional \"GUILE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${GNC_HAVE_GUILE_WWW_TRUE}" && test -z "${GNC_HAVE_GUILE_WWW_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GNC_HAVE_GUILE_WWW\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"GNC_HAVE_GUILE_WWW\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GNC_HAVE_GUILE_WWW\" was never defined.
-+echo "$as_me: error: conditional \"GNC_HAVE_GUILE_WWW\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${USE_LIBQOF_TRUE}" && test -z "${USE_LIBQOF_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_LIBQOF\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"USE_LIBQOF\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"USE_LIBQOF\" was never defined.
-+echo "$as_me: error: conditional \"USE_LIBQOF\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${USE_LIBQOF_TRUE}" && test -z "${USE_LIBQOF_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_LIBQOF\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"USE_LIBQOF\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"USE_LIBQOF\" was never defined.
-+echo "$as_me: error: conditional \"USE_LIBQOF\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${GNC_ETAGS_FILE_TRUE}" && test -z "${GNC_ETAGS_FILE_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GNC_ETAGS_FILE\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"GNC_ETAGS_FILE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GNC_ETAGS_FILE\" was never defined.
-+echo "$as_me: error: conditional \"GNC_ETAGS_FILE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${GNC_CTAGS_FILE_TRUE}" && test -z "${GNC_CTAGS_FILE_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GNC_CTAGS_FILE\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"GNC_CTAGS_FILE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GNC_CTAGS_FILE\" was never defined.
-+echo "$as_me: error: conditional \"GNC_CTAGS_FILE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DOC_TRUE}" && test -z "${DOC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DOC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DOC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DOC\" was never defined.
-+echo "$as_me: error: conditional \"DOC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${ENABLE_DOXYGEN_TRUE}" && test -z "${ENABLE_DOXYGEN_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_DOXYGEN\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_DOXYGEN\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_DOXYGEN\" was never defined.
-+echo "$as_me: error: conditional \"ENABLE_DOXYGEN\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${GNUCASH_ENABLE_GUI_TRUE}" && test -z "${GNUCASH_ENABLE_GUI_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GNUCASH_ENABLE_GUI\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"GNUCASH_ENABLE_GUI\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GNUCASH_ENABLE_GUI\" was never defined.
-+echo "$as_me: error: conditional \"GNUCASH_ENABLE_GUI\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_GTK_2_10_TRUE}" && test -z "${HAVE_GTK_2_10_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_10\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_10\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_GTK_2_10\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_GTK_2_10\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${GTKHTML_USES_GTKPRINT_TRUE}" && test -z "${GTKHTML_USES_GTKPRINT_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GTKHTML_USES_GTKPRINT\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"GTKHTML_USES_GTKPRINT\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GTKHTML_USES_GTKPRINT\" was never defined.
-+echo "$as_me: error: conditional \"GTKHTML_USES_GTKPRINT\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_GTK_2_10_TRUE}" && test -z "${HAVE_GTK_2_10_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_10\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_10\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_GTK_2_10\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_GTK_2_10\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- : ${CONFIG_STATUS=./config.status}
--ac_write_fail=0
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
--$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
--cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-+echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
- # Generated by $as_me.
- # Run this file to recreate the current configuration.
-@@ -33668,7 +34232,7 @@ ac_cs_silent=false
- SHELL=\${CONFIG_SHELL-$SHELL}
- _ACEOF
-
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- ## --------------------- ##
- ## M4sh Initialization. ##
- ## --------------------- ##
-@@ -33678,7 +34242,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
-- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-@@ -33700,45 +34264,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
-
--as_nl='
--'
--export as_nl
--# Printing a long string crashes Solaris 7 /usr/bin/printf.
--as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
--as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
--as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
--if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-- as_echo='printf %s\n'
-- as_echo_n='printf %s'
--else
-- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-- as_echo_n='/usr/ucb/echo -n'
-- else
-- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-- as_echo_n_body='eval
-- arg=$1;
-- case $arg in
-- *"$as_nl"*)
-- expr "X$arg" : "X\\(.*\\)$as_nl";
-- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-- esac;
-- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-- '
-- export as_echo_n_body
-- as_echo_n='sh -c $as_echo_n_body as_echo'
-- fi
-- export as_echo_body
-- as_echo='sh -c $as_echo_body as_echo'
--fi
--
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
-- PATH_SEPARATOR=:
-- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-- PATH_SEPARATOR=';'
-- }
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
- fi
-
- # Support unset when possible.
-@@ -33754,6 +34290,8 @@ fi
- # there to prevent editors from complaining about space-tab.
- # (If _AS_PATH_WALK were called with IFS unset, it would disable word
- # splitting by setting IFS to empty value.)
-+as_nl='
-+'
- IFS=" "" $as_nl"
-
- # Find who we are. Look in the path if we contain no directory separator.
-@@ -33776,7 +34314,7 @@ if test "x$as_myself" = x; then
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
-- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
- fi
-
-@@ -33789,10 +34327,17 @@ PS2='> '
- PS4='+ '
-
- # NLS nuisances.
--LC_ALL=C
--export LC_ALL
--LANGUAGE=C
--export LANGUAGE
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ fi
-+done
-
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -33814,7 +34359,7 @@ as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X/"$0" |
-+echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
-@@ -33865,7 +34410,7 @@ $as_unset CDPATH
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
-- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
-@@ -33893,6 +34438,7 @@ case `echo -n x` in
- *)
- ECHO_N='-n';;
- esac
-+
- if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-@@ -33905,22 +34451,19 @@ if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
- else
- rm -f conf$$.dir
-- mkdir conf$$.dir 2>/dev/null
--fi
--if (echo >conf$$.file) 2>/dev/null; then
-- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- as_ln_s='ln -s'
-- # ... but there are two gotchas:
-- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-- # In both cases, we have to default to `cp -p'.
-- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-- as_ln_s='cp -p'
-- elif ln conf$$.file conf$$ 2>/dev/null; then
-- as_ln_s=ln
-- else
-+ mkdir conf$$.dir
-+fi
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s='ln -s'
-+ # ... but there are two gotchas:
-+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+ # In both cases, we have to default to `cp -p'.
-+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
-- fi
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
-@@ -33945,10 +34488,10 @@ else
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-- test -d "$1/.";
-+ test -d "$1/.";
- else
- case $1 in
-- -*)set "./$1";;
-+ -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
-@@ -33971,7 +34514,7 @@ exec 6>&1
- # values after options handling.
- ac_log="
- This file was extended by gnucash $as_me 2.2.9, which was
--generated by GNU Autoconf 2.63. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -33984,16 +34527,7 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
-
- _ACEOF
-
--case $ac_config_files in *"
--"*) set x $ac_config_files; shift; ac_config_files=$*;;
--esac
--
--case $ac_config_headers in *"
--"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
--esac
--
--
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<_ACEOF
- # Files that config.status was made for.
- config_files="$ac_config_files"
- config_headers="$ac_config_headers"
-@@ -34001,23 +34535,22 @@ config_commands="$ac_config_commands"
-
- _ACEOF
-
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-
--Usage: $0 [OPTION]... [FILE]...
-+Usage: $0 [OPTIONS] [FILE]...
-
- -h, --help print this help, then exit
- -V, --version print version number and configuration settings, then exit
-- -q, --quiet, --silent
-- do not print progress messages
-+ -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
-- --file=FILE[:TEMPLATE]
-- instantiate the configuration file FILE
-- --header=FILE[:TEMPLATE]
-- instantiate the configuration header FILE
-+ --file=FILE[:TEMPLATE]
-+ instantiate the configuration file FILE
-+ --header=FILE[:TEMPLATE]
-+ instantiate the configuration header FILE
-
- Configuration files:
- $config_files
-@@ -34031,13 +34564,13 @@ $config_commands
- Report bugs to <bug-autoconf at gnu.org>."
-
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- gnucash config.status 2.2.9
--configured by $0, generated by GNU Autoconf 2.63,
-- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.61,
-+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
--Copyright (C) 2008 Free Software Foundation, Inc.
-+Copyright (C) 2006 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
-
-@@ -34045,12 +34578,11 @@ ac_pwd='$ac_pwd'
- srcdir='$srcdir'
- INSTALL='$INSTALL'
- MKDIR_P='$MKDIR_P'
--AWK='$AWK'
--test -n "\$AWK" || AWK=awk
- _ACEOF
-
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
--# The default lists apply if the user does not specify any file.
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If no file are specified by the user, then we need to provide default
-+# value. By we need to know if files were specified by the user.
- ac_need_defaults=:
- while test $# != 0
- do
-@@ -34072,36 +34604,30 @@ do
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-- $as_echo "$ac_cs_version"; exit ;;
-+ echo "$ac_cs_version"; exit ;;
- --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
-- case $ac_optarg in
-- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-- esac
-- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-+ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
- ac_need_defaults=false;;
- --header | --heade | --head | --hea )
- $ac_shift
-- case $ac_optarg in
-- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-- esac
-- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
-+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
- ac_need_defaults=false;;
- --he | --h)
- # Conflict between --help and --header
-- { $as_echo "$as_me: error: ambiguous option: $1
-+ { echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; };;
- --help | --hel | -h )
-- $as_echo "$ac_cs_usage"; exit ;;
-+ echo "$ac_cs_usage"; exit ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil | --si | --s)
- ac_cs_silent=: ;;
-
- # This is an error.
-- -*) { $as_echo "$as_me: error: unrecognized option: $1
-+ -*) { echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
-
-@@ -34120,41 +34646,36 @@ if $ac_cs_silent; then
- fi
-
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<_ACEOF
- if \$ac_cs_recheck; then
-- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-- shift
-- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-- CONFIG_SHELL='$SHELL'
-+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ CONFIG_SHELL=$SHELL
- export CONFIG_SHELL
-- exec "\$@"
-+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- fi
-
- _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- exec 5>>config.log
- {
- echo
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
- ## Running $as_me. ##
- _ASBOX
-- $as_echo "$ac_log"
-+ echo "$ac_log"
- } >&5
-
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<_ACEOF
- #
- # INIT-COMMANDS
- #
- AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
--INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
--prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
--INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
-
-
- _ACEOF
-
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
-
- # Handling of arguments.
- for ac_config_target in $ac_config_targets
-@@ -34162,7 +34683,6 @@ do
- case $ac_config_target in
- "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-- "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
- "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
- "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-@@ -34310,8 +34830,8 @@ do
- "src/business/business-reports/Makefile") CONFIG_FILES="$CONFIG_FILES src/business/business-reports/Makefile" ;;
- "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
-
-- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
--$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
- esac
- done
-@@ -34352,144 +34872,431 @@ $debug ||
- (umask 077 && mkdir "$tmp")
- } ||
- {
-- $as_echo "$as_me: cannot create a temporary directory in ." >&2
-+ echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
- }
-
--# Set up the scripts for CONFIG_FILES section.
--# No need to generate them if there are no CONFIG_FILES.
--# This happens for instance with `./config.status config.h'.
-+#
-+# Set up the sed scripts for CONFIG_FILES section.
-+#
-+
-+# No need to generate the scripts if there are no CONFIG_FILES.
-+# This happens for instance when ./config.status config.h
- if test -n "$CONFIG_FILES"; then
-
-+_ACEOF
-+
-
--ac_cr='
'
--ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
--if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-- ac_cs_awk_cr='\\r'
--else
-- ac_cs_awk_cr=$ac_cr
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-+INSTALL_DATA!$INSTALL_DATA$ac_delim
-+am__isrc!$am__isrc$ac_delim
-+CYGPATH_W!$CYGPATH_W$ac_delim
-+PACKAGE!$PACKAGE$ac_delim
-+VERSION!$VERSION$ac_delim
-+ACLOCAL!$ACLOCAL$ac_delim
-+AUTOCONF!$AUTOCONF$ac_delim
-+AUTOMAKE!$AUTOMAKE$ac_delim
-+AUTOHEADER!$AUTOHEADER$ac_delim
-+MAKEINFO!$MAKEINFO$ac_delim
-+install_sh!$install_sh$ac_delim
-+STRIP!$STRIP$ac_delim
-+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-+mkdir_p!$mkdir_p$ac_delim
-+AWK!$AWK$ac_delim
-+SET_MAKE!$SET_MAKE$ac_delim
-+am__leading_dot!$am__leading_dot$ac_delim
-+AMTAR!$AMTAR$ac_delim
-+am__tar!$am__tar$ac_delim
-+am__untar!$am__untar$ac_delim
-+CC!$CC$ac_delim
-+CFLAGS!$CFLAGS$ac_delim
-+LDFLAGS!$LDFLAGS$ac_delim
-+CPPFLAGS!$CPPFLAGS$ac_delim
-+ac_ct_CC!$ac_ct_CC$ac_delim
-+EXEEXT!$EXEEXT$ac_delim
-+OBJEXT!$OBJEXT$ac_delim
-+DEPDIR!$DEPDIR$ac_delim
-+am__include!$am__include$ac_delim
-+am__quote!$am__quote$ac_delim
-+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-+CCDEPMODE!$CCDEPMODE$ac_delim
-+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-+USE_NLS!$USE_NLS$ac_delim
-+INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
-+INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
-+INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
-+INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
-+INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
-+INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
-+INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim
-+INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim
-+INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim
-+INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim
-+INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim
-+INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
-+INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
-+INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
-+INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
-+INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
-+INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
-+INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
-+INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
-+INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
-+INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
- fi
-
--echo 'BEGIN {' >"$tmp/subs1.awk" &&
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
- _ACEOF
-
-
--{
-- echo "cat >conf$$subs.awk <<_ACEOF" &&
-- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-- echo "_ACEOF"
--} >conf$$subs.sh ||
-- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-- { (exit 1); exit 1; }; }
--ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-- . ./conf$$subs.sh ||
-- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ cat >conf$$subs.sed <<_ACEOF
-+INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
-+XGETTEXT!$XGETTEXT$ac_delim
-+MSGMERGE!$MSGMERGE$ac_delim
-+MSGFMT!$MSGFMT$ac_delim
-+GMSGFMT!$GMSGFMT$ac_delim
-+INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
-+ALL_LINGUAS!$ALL_LINGUAS$ac_delim
-+DATADIRNAME!$DATADIRNAME$ac_delim
-+GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim
-+GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim
-+GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim
-+GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim
-+GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY!$GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY$ac_delim
-+GNUCASH_MAJOR_VERSION!$GNUCASH_MAJOR_VERSION$ac_delim
-+GNUCASH_MINOR_VERSION!$GNUCASH_MINOR_VERSION$ac_delim
-+GNUCASH_MICRO_VERSION!$GNUCASH_MICRO_VERSION$ac_delim
-+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
-+CPP!$CPP$ac_delim
-+GREP!$GREP$ac_delim
-+EGREP!$EGREP$ac_delim
-+MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
-+CATALOGS!$CATALOGS$ac_delim
-+CATOBJEXT!$CATOBJEXT$ac_delim
-+GMOFILES!$GMOFILES$ac_delim
-+INSTOBJEXT!$INSTOBJEXT$ac_delim
-+INTLLIBS!$INTLLIBS$ac_delim
-+PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
-+PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
-+POFILES!$POFILES$ac_delim
-+POSUB!$POSUB$ac_delim
-+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
-+build!$build$ac_delim
-+build_cpu!$build_cpu$ac_delim
-+build_vendor!$build_vendor$ac_delim
-+build_os!$build_os$ac_delim
-+host!$host$ac_delim
-+host_cpu!$host_cpu$ac_delim
-+host_vendor!$host_vendor$ac_delim
-+host_os!$host_os$ac_delim
-+SED!$SED$ac_delim
-+LN_S!$LN_S$ac_delim
-+ECHO!$ECHO$ac_delim
-+AR!$AR$ac_delim
-+RANLIB!$RANLIB$ac_delim
-+DSYMUTIL!$DSYMUTIL$ac_delim
-+NMEDIT!$NMEDIT$ac_delim
-+DLLTOOL!$DLLTOOL$ac_delim
-+AS!$AS$ac_delim
-+OBJDUMP!$OBJDUMP$ac_delim
-+CXX!$CXX$ac_delim
-+CXXFLAGS!$CXXFLAGS$ac_delim
-+ac_ct_CXX!$ac_ct_CXX$ac_delim
-+CXXDEPMODE!$CXXDEPMODE$ac_delim
-+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-+CXXCPP!$CXXCPP$ac_delim
-+F77!$F77$ac_delim
-+FFLAGS!$FFLAGS$ac_delim
-+ac_ct_F77!$ac_ct_F77$ac_delim
-+LIBTOOL!$LIBTOOL$ac_delim
-+LIBTOOL_DEPS!$LIBTOOL_DEPS$ac_delim
-+OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim
-+OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim
-+PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim
-+PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim
-+REGEX_LIBS!$REGEX_LIBS$ac_delim
-+HTMLHELP_LIBS!$HTMLHELP_LIBS$ac_delim
-+SWIG!$SWIG$ac_delim
-+BUILDING_FROM_SVN_TRUE!$BUILDING_FROM_SVN_TRUE$ac_delim
-+BUILDING_FROM_SVN_FALSE!$BUILDING_FROM_SVN_FALSE$ac_delim
-+GNUCASH_SEPARATE_BUILDDIR_TRUE!$GNUCASH_SEPARATE_BUILDDIR_TRUE$ac_delim
-+GNUCASH_SEPARATE_BUILDDIR_FALSE!$GNUCASH_SEPARATE_BUILDDIR_FALSE$ac_delim
-+HAVE_X11_XLIB_H_TRUE!$HAVE_X11_XLIB_H_TRUE$ac_delim
-+HAVE_X11_XLIB_H_FALSE!$HAVE_X11_XLIB_H_FALSE$ac_delim
-+BINRELOC_CFLAGS!$BINRELOC_CFLAGS$ac_delim
-+BINRELOC_LIBS!$BINRELOC_LIBS$ac_delim
-+PKG_CONFIG!$PKG_CONFIG$ac_delim
-+GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
-+GLIB_LIBS!$GLIB_LIBS$ac_delim
-+GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim
-+GOBJECT_QUERY!$GOBJECT_QUERY$ac_delim
-+GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim
-+GLIB26_LIBS!$GLIB26_LIBS$ac_delim
-+HAVE_GLIB_2_8_TRUE!$HAVE_GLIB_2_8_TRUE$ac_delim
-+HAVE_GLIB_2_8_FALSE!$HAVE_GLIB_2_8_FALSE$ac_delim
-+DL_LIB!$DL_LIB$ac_delim
-+GDK_TARGET_QUARTZ_TRUE!$GDK_TARGET_QUARTZ_TRUE$ac_delim
-+GDK_TARGET_QUARTZ_FALSE!$GDK_TARGET_QUARTZ_FALSE$ac_delim
-+IGE_MAC_CFLAGS!$IGE_MAC_CFLAGS$ac_delim
-+IGE_MAC_LIBS!$IGE_MAC_LIBS$ac_delim
-+QTTHREADS_LIB!$QTTHREADS_LIB$ac_delim
-+TERMCAP_LIB!$TERMCAP_LIB$ac_delim
-+READLINE_LIB!$READLINE_LIB$ac_delim
-+BUILD_GUILE!$BUILD_GUILE$ac_delim
-+GUILE_LIBS!$GUILE_LIBS$ac_delim
-+GUILE_INCS!$GUILE_INCS$ac_delim
-+GUILE_TRUE!$GUILE_TRUE$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
-
-- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-- if test $ac_delim_n = $ac_delim_num; then
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+GUILE_FALSE!$GUILE_FALSE$ac_delim
-+GUILE!$GUILE$ac_delim
-+GNC_ADD_ON_SRFIS!$GNC_ADD_ON_SRFIS$ac_delim
-+GNC_SRFI_LOAD_PATH!$GNC_SRFI_LOAD_PATH$ac_delim
-+GNC_TEST_SRFI_LOAD_CMD!$GNC_TEST_SRFI_LOAD_CMD$ac_delim
-+GUILE_CONFIG!$GUILE_CONFIG$ac_delim
-+GUILE_TOOLS!$GUILE_TOOLS$ac_delim
-+GNC_HAVE_GUILE_WWW_TRUE!$GNC_HAVE_GUILE_WWW_TRUE$ac_delim
-+GNC_HAVE_GUILE_WWW_FALSE!$GNC_HAVE_GUILE_WWW_FALSE$ac_delim
-+GCONF_CFLAGS!$GCONF_CFLAGS$ac_delim
-+GCONF_LIBS!$GCONF_LIBS$ac_delim
-+GCONFTOOL!$GCONFTOOL$ac_delim
-+LIBXML2_CFLAGS!$LIBXML2_CFLAGS$ac_delim
-+LIBXML2_LIBS!$LIBXML2_LIBS$ac_delim
-+LIBXML_VERSION!$LIBXML_VERSION$ac_delim
-+ZLIB_LIBS!$ZLIB_LIBS$ac_delim
-+LIBQOF_LIBRARY_VERSION!$LIBQOF_LIBRARY_VERSION$ac_delim
-+LIBQOF_BACKEND_QSF_LIBRARY_VERSION!$LIBQOF_BACKEND_QSF_LIBRARY_VERSION$ac_delim
-+USE_LIBQOF_TRUE!$USE_LIBQOF_TRUE$ac_delim
-+USE_LIBQOF_FALSE!$USE_LIBQOF_FALSE$ac_delim
-+USE_LIBQOF!$USE_LIBQOF$ac_delim
-+QOF_CFLAGS!$QOF_CFLAGS$ac_delim
-+QOF_LIBS!$QOF_LIBS$ac_delim
-+QOF_PREFIX!$QOF_PREFIX$ac_delim
-+QOF_LIB_DIR!$QOF_LIB_DIR$ac_delim
-+QOF_XML_DIR!$QOF_XML_DIR$ac_delim
-+GNC_ACCOUNTS_DIR!$GNC_ACCOUNTS_DIR$ac_delim
-+GNC_CHECKS_DIR!$GNC_CHECKS_DIR$ac_delim
-+GNC_CONFIGDIR!$GNC_CONFIGDIR$ac_delim
-+GNC_DOC_INSTALL_DIR!$GNC_DOC_INSTALL_DIR$ac_delim
-+GNC_GLADE_DIR!$GNC_GLADE_DIR$ac_delim
-+GNC_UI_DIR!$GNC_UI_DIR$ac_delim
-+GNC_INCLUDE_DIR!$GNC_INCLUDE_DIR$ac_delim
-+GNC_PIXMAP_DIR!$GNC_PIXMAP_DIR$ac_delim
-+GNC_SCM_INSTALL_DIR!$GNC_SCM_INSTALL_DIR$ac_delim
-+GNC_SHAREDIR!$GNC_SHAREDIR$ac_delim
-+GNC_LIBEXECDIR!$GNC_LIBEXECDIR$ac_delim
-+PGSQL_CFLAGS!$PGSQL_CFLAGS$ac_delim
-+PGSQL_LIBS!$PGSQL_LIBS$ac_delim
-+SQL_DIR!$SQL_DIR$ac_delim
-+LIBOFX_CFLAGS!$LIBOFX_CFLAGS$ac_delim
-+LIBOFX_LIBS!$LIBOFX_LIBS$ac_delim
-+OFX_DIR!$OFX_DIR$ac_delim
-+AQBANKING_CFLAGS!$AQBANKING_CFLAGS$ac_delim
-+AQBANKING_LIBS!$AQBANKING_LIBS$ac_delim
-+AQBANKING_DIR!$AQBANKING_DIR$ac_delim
-+GNC_HELPDIR!$GNC_HELPDIR$ac_delim
-+GNC_ETAGS_FILE!$GNC_ETAGS_FILE$ac_delim
-+GNC_ETAGS_FILE_TRUE!$GNC_ETAGS_FILE_TRUE$ac_delim
-+GNC_ETAGS_FILE_FALSE!$GNC_ETAGS_FILE_FALSE$ac_delim
-+GNC_CTAGS_FILE!$GNC_CTAGS_FILE$ac_delim
-+GNC_CTAGS_FILE_TRUE!$GNC_CTAGS_FILE_TRUE$ac_delim
-+GNC_CTAGS_FILE_FALSE!$GNC_CTAGS_FILE_FALSE$ac_delim
-+PERL!$PERL$ac_delim
-+PERLINCL!$PERLINCL$ac_delim
-+DOXYGEN!$DOXYGEN$ac_delim
-+DOT!$DOT$ac_delim
-+DOC_TRUE!$DOC_TRUE$ac_delim
-+DOC_FALSE!$DOC_FALSE$ac_delim
-+ENABLE_DOXYGEN_TRUE!$ENABLE_DOXYGEN_TRUE$ac_delim
-+ENABLE_DOXYGEN_FALSE!$ENABLE_DOXYGEN_FALSE$ac_delim
-+enable_dot!$enable_dot$ac_delim
-+enable_html_docs!$enable_html_docs$ac_delim
-+enable_latex_docs!$enable_latex_docs$ac_delim
-+GNUCASH_ENABLE_GUI_TRUE!$GNUCASH_ENABLE_GUI_TRUE$ac_delim
-+GNUCASH_ENABLE_GUI_FALSE!$GNUCASH_ENABLE_GUI_FALSE$ac_delim
-+WARN_CFLAGS!$WARN_CFLAGS$ac_delim
-+GTK_CFLAGS!$GTK_CFLAGS$ac_delim
-+GTK_LIBS!$GTK_LIBS$ac_delim
-+HAVE_GTK_2_10_TRUE!$HAVE_GTK_2_10_TRUE$ac_delim
-+HAVE_GTK_2_10_FALSE!$HAVE_GTK_2_10_FALSE$ac_delim
-+GNOME_CFLAGS!$GNOME_CFLAGS$ac_delim
-+GNOME_LIBS!$GNOME_LIBS$ac_delim
-+GDK_PIXBUF_CFLAGS!$GDK_PIXBUF_CFLAGS$ac_delim
-+GDK_PIXBUF_LIBS!$GDK_PIXBUF_LIBS$ac_delim
-+GLADE_CFLAGS!$GLADE_CFLAGS$ac_delim
-+GLADE_LIBS!$GLADE_LIBS$ac_delim
-+GOFFICE_CFLAGS!$GOFFICE_CFLAGS$ac_delim
-+GOFFICE_LIBS!$GOFFICE_LIBS$ac_delim
-+GTKHTML_CFLAGS!$GTKHTML_CFLAGS$ac_delim
-+GTKHTML_LIBS!$GTKHTML_LIBS$ac_delim
-+GTKHTML_USES_GTKPRINT_TRUE!$GTKHTML_USES_GTKPRINT_TRUE$ac_delim
-+GTKHTML_USES_GTKPRINT_FALSE!$GTKHTML_USES_GTKPRINT_FALSE$ac_delim
-+GNOME_PRINT_CFLAGS!$GNOME_PRINT_CFLAGS$ac_delim
-+GNOME_PRINT_LIBS!$GNOME_PRINT_LIBS$ac_delim
-+EFENCE_LIBS!$EFENCE_LIBS$ac_delim
-+LIBOBJS!$LIBOBJS$ac_delim
-+LC_MESSAGES_ENUM!$LC_MESSAGES_ENUM$ac_delim
-+LIBOBJS_SEDSCRIPT!$LIBOBJS_SEDSCRIPT$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
- break
- elif $ac_last_try; then
-- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
- done
--rm -f conf$$subs.sh
--
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
--cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
--_ACEOF
--sed -n '
--h
--s/^/S["/; s/!.*/"]=/
--p
--g
--s/^[^!]*!//
--:repl
--t repl
--s/'"$ac_delim"'$//
--t delim
--:nl
--h
--s/\(.\{148\}\).*/\1/
--t more1
--s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
--p
--n
--b repl
--:more1
--s/["\\]/\\&/g; s/^/"/; s/$/"\\/
--p
--g
--s/.\{148\}//
--t nl
--:delim
--h
--s/\(.\{148\}\).*/\1/
--t more2
--s/["\\]/\\&/g; s/^/"/; s/$/"/
--p
--b
--:more2
--s/["\\]/\\&/g; s/^/"/; s/$/"\\/
--p
--g
--s/.\{148\}//
--t delim
--' <conf$$subs.awk | sed '
--/^[^""]/{
-- N
-- s/\n//
--}
--' >>$CONFIG_STATUS || ac_write_fail=1
--rm -f conf$$subs.awk
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
--_ACAWK
--cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-- for (key in S) S_is_set[key] = 1
-- FS = ""
-
--}
--{
-- line = $ 0
-- nfields = split(line, field, "@")
-- substed = 0
-- len = length(field[1])
-- for (i = 2; i < nfields; i++) {
-- key = field[i]
-- keylen = length(key)
-- if (S_is_set[key]) {
-- value = S[key]
-- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-- len += length(value) + length(field[++i])
-- substed = 1
-- } else
-- len += 1 + keylen
-- }
--
-- print line
--}
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-
--_ACAWK
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
- _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
--if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
--else
-- cat
--fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
--$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-- { (exit 1); exit 1; }; }
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
- _ACEOF
-
-+
- # VPATH may cause trouble with some makes, so we remove $(srcdir),
- # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
- # trailing colons and then remove the whole line if VPATH becomes empty
-@@ -34505,133 +35312,19 @@ s/^[^=]*=[ ]*$//
- }'
- fi
-
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- fi # test -n "$CONFIG_FILES"
-
--# Set up the scripts for CONFIG_HEADERS section.
--# No need to generate them if there are no CONFIG_HEADERS.
--# This happens for instance with `./config.status Makefile'.
--if test -n "$CONFIG_HEADERS"; then
--cat >"$tmp/defines.awk" <<\_ACAWK ||
--BEGIN {
--_ACEOF
--
--# Transform confdefs.h into an awk script `defines.awk', embedded as
--# here-document in config.status, that substitutes the proper values into
--# config.h.in to produce config.h.
--
--# Create a delimiter string that does not exist in confdefs.h, to ease
--# handling of long lines.
--ac_delim='%!_!# '
--for ac_last_try in false false :; do
-- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-- if test -z "$ac_t"; then
-- break
-- elif $ac_last_try; then
-- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
--$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-- { (exit 1); exit 1; }; }
-- else
-- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-- fi
--done
--
--# For the awk script, D is an array of macro values keyed by name,
--# likewise P contains macro parameters if any. Preserve backslash
--# newline sequences.
--
--ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
--sed -n '
--s/.\{148\}/&'"$ac_delim"'/g
--t rset
--:rset
--s/^[ ]*#[ ]*define[ ][ ]*/ /
--t def
--d
--:def
--s/\\$//
--t bsnl
--s/["\\]/\\&/g
--s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
--D["\1"]=" \3"/p
--s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
--d
--:bsnl
--s/["\\]/\\&/g
--s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
--D["\1"]=" \3\\\\\\n"\\/p
--t cont
--s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
--t cont
--d
--:cont
--n
--s/.\{148\}/&'"$ac_delim"'/g
--t clear
--:clear
--s/\\$//
--t bsnlc
--s/["\\]/\\&/g; s/^/"/; s/$/"/p
--d
--:bsnlc
--s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
--b cont
--' <confdefs.h | sed '
--s/'"$ac_delim"'/"\\\
--"/g' >>$CONFIG_STATUS || ac_write_fail=1
--
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-- for (key in D) D_is_set[key] = 1
-- FS = ""
--}
--/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-- line = \$ 0
-- split(line, arg, " ")
-- if (arg[1] == "#") {
-- defundef = arg[2]
-- mac1 = arg[3]
-- } else {
-- defundef = substr(arg[1], 2)
-- mac1 = arg[2]
-- }
-- split(mac1, mac2, "(") #)
-- macro = mac2[1]
-- prefix = substr(line, 1, index(line, defundef) - 1)
-- if (D_is_set[macro]) {
-- # Preserve the white space surrounding the "#".
-- print prefix "define", macro P[macro] D[macro]
-- next
-- } else {
-- # Replace #undef with comments. This is necessary, for example,
-- # in the case of _POSIX_SOURCE, which is predefined and required
-- # on some systems where configure will not decide to define it.
-- if (defundef == "undef") {
-- print "/*", prefix defundef, macro, "*/"
-- next
-- }
-- }
--}
--{ print }
--_ACAWK
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
--$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-- { (exit 1); exit 1; }; }
--fi # test -n "$CONFIG_HEADERS"
--
-
--eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
--shift
--for ac_tag
-+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
- do
- case $ac_tag in
- :[FHLC]) ac_mode=$ac_tag; continue;;
- esac
- case $ac_mode$ac_tag in
- :[FHL]*:*);;
-- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
--$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
- { (exit 1); exit 1; }; };;
- :[FH]-) ac_tag=-:-;;
- :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-@@ -34660,38 +35353,26 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
- [\\/$]*) false;;
- *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- esac ||
-- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
--$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
- { (exit 1); exit 1; }; };;
- esac
-- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-- ac_file_inputs="$ac_file_inputs '$ac_f'"
-+ ac_file_inputs="$ac_file_inputs $ac_f"
- done
-
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
-- configure_input='Generated from '`
-- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-- `' by configure.'
-+ configure_input="Generated from "`IFS=:
-+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
- if test x"$ac_file" != x-; then
- configure_input="$ac_file. $configure_input"
-- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
--$as_echo "$as_me: creating $ac_file" >&6;}
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
- fi
-- # Neutralize special characters interpreted by sed in replacement strings.
-- case $configure_input in #(
-- *\&* | *\|* | *\\* )
-- ac_sed_conf_input=`$as_echo "$configure_input" |
-- sed 's/[\\\\&|]/\\\\&/g'`;; #(
-- *) ac_sed_conf_input=$configure_input;;
-- esac
-
- case $ac_tag in
-- *:-:* | *:-) cat >"$tmp/stdin" \
-- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
--$as_echo "$as_me: error: could not create $ac_file" >&2;}
-- { (exit 1); exit 1; }; } ;;
-+ *:-:* | *:-) cat >"$tmp/stdin";;
- esac
- ;;
- esac
-@@ -34701,7 +35382,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$ac_file" |
-+echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -34727,7 +35408,7 @@ $as_echo X"$ac_file" |
- as_dirs=
- while :; do
- case $as_dir in #(
-- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
-@@ -34736,7 +35417,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$as_dir" |
-+echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -34757,17 +35438,17 @@ $as_echo X"$as_dir" |
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
-- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
--$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
- ac_builddir=.
-
- case "$ac_dir" in
- .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *)
-- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A ".." for each directory in $ac_dir_suffix.
-- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -34812,13 +35493,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- esac
- _ACEOF
-
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- # If the template does not know about datarootdir, expand it.
- # FIXME: This hack should be removed a few years after 2.60.
- ac_datarootdir_hack=; ac_datarootdir_seen=
-
--ac_sed_dataroot='
--/datarootdir/ {
-+case `sed -n '/datarootdir/ {
- p
- q
- }
-@@ -34827,14 +35507,13 @@ ac_sed_dataroot='
- /@infodir@/p
- /@localedir@/p
- /@mandir@/p
--'
--case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-+' $ac_file_inputs` in
- *datarootdir*) ac_datarootdir_seen=yes;;
- *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
--$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<_ACEOF
- ac_datarootdir_hack='
- s&@datadir@&$datadir&g
- s&@docdir@&$docdir&g
-@@ -34848,16 +35527,15 @@ _ACEOF
- # Neutralize VPATH when `$srcdir' = `.'.
- # Shell code in configure.ac might set extrasub.
- # FIXME: do we really want to maintain this feature?
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
--ac_sed_extra="$ac_vpsub
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ sed "$ac_vpsub
- $extrasub
- _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s|@configure_input@|$ac_sed_conf_input|;t t
-+s&@configure_input@&$configure_input&;t t
- s&@top_builddir@&$ac_top_builddir_sub&;t t
--s&@top_build_prefix@&$ac_top_build_prefix&;t t
- s&@srcdir@&$ac_srcdir&;t t
- s&@abs_srcdir@&$ac_abs_srcdir&;t t
- s&@top_srcdir@&$ac_top_srcdir&;t t
-@@ -34868,60 +35546,121 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
- s&@INSTALL@&$ac_INSTALL&;t t
- s&@MKDIR_P@&$ac_MKDIR_P&;t t
- $ac_datarootdir_hack
--"
--eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
--$as_echo "$as_me: error: could not create $ac_file" >&2;}
-- { (exit 1); exit 1; }; }
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
-
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined. Please make sure it is defined." >&5
--$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined. Please make sure it is defined." >&2;}
-
- rm -f "$tmp/stdin"
- case $ac_file in
-- -) cat "$tmp/out" && rm -f "$tmp/out";;
-- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-- esac \
-- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
--$as_echo "$as_me: error: could not create $ac_file" >&2;}
-- { (exit 1); exit 1; }; }
-+ -) cat "$tmp/out"; rm -f "$tmp/out";;
-+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-+ esac
- ;;
- :H)
- #
- # CONFIG_HEADER
- #
-+_ACEOF
-+
-+# Transform confdefs.h into a sed script `conftest.defines', that
-+# substitutes the proper values into config.h.in to produce config.h.
-+rm -f conftest.defines conftest.tail
-+# First, append a space to every undef/define line, to ease matching.
-+echo 's/$/ /' >conftest.defines
-+# Then, protect against being on the right side of a sed subst, or in
-+# an unquoted here document, in config.status. If some macros were
-+# called several times there might be several #defines for the same
-+# symbol, which is useless. But do not sort them, since the last
-+# AC_DEFINE must be honored.
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-+# NAME is the cpp macro being defined, VALUE is the value it is being given.
-+# PARAMS is the parameter list in the macro definition--in most cases, it's
-+# just an empty string.
-+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
-+ac_dB='\\)[ (].*,\\1define\\2'
-+ac_dC=' '
-+ac_dD=' ,'
-+
-+uniq confdefs.h |
-+ sed -n '
-+ t rset
-+ :rset
-+ s/^[ ]*#[ ]*define[ ][ ]*//
-+ t ok
-+ d
-+ :ok
-+ s/[\\&,]/\\&/g
-+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-+ ' >>conftest.defines
-+
-+# Remove the space that was appended to ease matching.
-+# Then replace #undef with comments. This is necessary, for
-+# example, in the case of _POSIX_SOURCE, which is predefined and required
-+# on some systems where configure will not decide to define it.
-+# (The regexp can be short, since the line contains either #define or #undef.)
-+echo 's/ $//
-+s,^[ #]*u.*,/* & */,' >>conftest.defines
-+
-+# Break up conftest.defines:
-+ac_max_sed_lines=50
-+
-+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-+# et cetera.
-+ac_in='$ac_file_inputs'
-+ac_out='"$tmp/out1"'
-+ac_nxt='"$tmp/out2"'
-+
-+while :
-+do
-+ # Write a here document:
-+ cat >>$CONFIG_STATUS <<_ACEOF
-+ # First, check the format of the line:
-+ cat >"\$tmp/defines.sed" <<\\CEOF
-+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
-+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
-+b
-+:def
-+_ACEOF
-+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-+ echo 'CEOF
-+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-+ grep . conftest.tail >/dev/null || break
-+ rm -f conftest.defines
-+ mv conftest.tail conftest.defines
-+done
-+rm -f conftest.defines conftest.tail
-+
-+echo "ac_result=$ac_in" >>$CONFIG_STATUS
-+cat >>$CONFIG_STATUS <<\_ACEOF
- if test x"$ac_file" != x-; then
-- {
-- $as_echo "/* $configure_input */" \
-- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-- } >"$tmp/config.h" \
-- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
--$as_echo "$as_me: error: could not create $ac_file" >&2;}
-- { (exit 1); exit 1; }; }
-- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
--$as_echo "$as_me: $ac_file is unchanged" >&6;}
-+ echo "/* $configure_input */" >"$tmp/config.h"
-+ cat "$ac_result" >>"$tmp/config.h"
-+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-+echo "$as_me: $ac_file is unchanged" >&6;}
- else
-- rm -f "$ac_file"
-- mv "$tmp/config.h" "$ac_file" \
-- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
--$as_echo "$as_me: error: could not create $ac_file" >&2;}
-- { (exit 1); exit 1; }; }
-+ rm -f $ac_file
-+ mv "$tmp/config.h" $ac_file
- fi
- else
-- $as_echo "/* $configure_input */" \
-- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
--$as_echo "$as_me: error: could not create -" >&2;}
-- { (exit 1); exit 1; }; }
-+ echo "/* $configure_input */"
-+ cat "$ac_result"
- fi
--# Compute "$ac_file"'s index in $config_headers.
--_am_arg="$ac_file"
-+ rm -f "$tmp/out12"
-+# Compute $ac_file's index in $config_headers.
-+_am_arg=$ac_file
- _am_stamp_count=1
- for _am_header in $config_headers :; do
- case $_am_header in
-@@ -34936,7 +35675,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$_am_arg" : 'X\(//\)[^/]' \| \
- X"$_am_arg" : 'X\(//\)$' \| \
- X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$_am_arg" |
-+echo X"$_am_arg" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -34956,23 +35695,14 @@ $as_echo X"$_am_arg" |
- s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
--$as_echo "$as_me: executing $ac_file commands" >&6;}
-+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+echo "$as_me: executing $ac_file commands" >&6;}
- ;;
- esac
-
-
- case $ac_file$ac_mode in
-- "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
--# are listed without --file. Let's play safe and only enable the eval
--# if we detect the quoting.
--case $CONFIG_FILES in
--*\'*) eval set x "$CONFIG_FILES" ;;
--*) set x $CONFIG_FILES ;;
--esac
--shift
--for mf
--do
-+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
-@@ -34988,7 +35718,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$mf" |
-+echo X"$mf" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -35032,7 +35762,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$file" |
-+echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -35058,7 +35788,7 @@ $as_echo X"$file" |
- as_dirs=
- while :; do
- case $as_dir in #(
-- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
-@@ -35067,7 +35797,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$as_dir" |
-+echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -35088,35 +35818,23 @@ $as_echo X"$as_dir" |
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
-- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
--$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
- done
- ;;
-- "intltool":C)
--
--for file in intltool-extract intltool-merge intltool-update; do
-- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
-- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
-- < ${ac_aux_dir}/${file}.in > ${file}.out
-- if cmp -s ${file} ${file}.out 2>/dev/null; then
-- rm -f ${file}.out
-- else
-- mv -f ${file}.out ${file}
-- fi
-- chmod ugo+x ${file}
-- chmod u+w ${file}
--done
--
-- ;;
- "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
- esac ;;
- "po/stamp-it":C)
-+ if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
-+ { { echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
-+echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
- rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
- >"po/stamp-it.tmp"
- sed '/^#/d
-@@ -35125,17 +35843,11 @@ done
- '"s|^| $ac_top_srcdir/|" \
- "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
-
-- if test ! -f "po/Makefile"; then
-- { { $as_echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
--$as_echo "$as_me: error: po/Makefile is not ready." >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-- mv "po/Makefile" "po/Makefile.tmp"
- sed '/^POTFILES =/,/[^\\]$/ {
- /^POTFILES =/!d
- r po/POTFILES
- }
-- ' "po/Makefile.tmp" >"po/Makefile"
-+ ' "po/Makefile.in" >"po/Makefile"
- rm -f "po/Makefile.tmp"
- mv "po/stamp-it.tmp" "po/stamp-it"
- ;;
-@@ -35149,11 +35861,6 @@ _ACEOF
- chmod +x $CONFIG_STATUS
- ac_clean_files=$ac_clean_files_save
-
--test $ac_write_fail = 0 ||
-- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
--$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-- { (exit 1); exit 1; }; }
--
-
- # configure is writing to config.log, and then calls config.status.
- # config.status does its own redirection, appending to config.log.
-@@ -35175,10 +35882,6 @@ if test "$no_create" != yes; then
- # would make configure fail if this is the last instruction.
- $ac_cs_success || { (exit 1); exit 1; }
- fi
--if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
--$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
--fi
-
-
- pkgdatadir=${prefix}/${PACKAGE}
-@@ -35196,7 +35899,7 @@ if test x${AQBANKING_DIR} != x; then
- components="$components $AQBANKING_DIR"
- fi
-
--{ $as_echo "$as_me:$LINENO: result:
-+{ echo "$as_me:$LINENO: result:
- Options detected/selected
- -------------------------
- gnucash version ...... : $VERSION
-@@ -35214,7 +35917,7 @@ fi
-
-
- " >&5
--$as_echo "
-+echo "${ECHO_T}
- Options detected/selected
- -------------------------
- gnucash version ...... : $VERSION
-diff --git a/configure.in b/configure.in
-index e3d47d3..0e9ac1e 100644
---- a/configure.in
-+++ b/configure.in
-@@ -350,6 +350,16 @@ update to latest darwin])
- ;;
- esac
-
-+### --------------------------------------------------------------------------
-+### Check to see if GDK uses the quartz backend and if we can use
-+### MacOSX integration
-+_gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
-+AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
-+if test "x$_gdk_tgt" = xquartz; then
-+ PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration)
-+ AC_SUBST(IGE_MAC_LIBS)
-+ AC_SUBST(IGE_MAC_CFLAGS)
-+fi
-
- ### --------------------------------------------------------------------------
- ### Guile version checks (should this be something other than the Gnome check?)
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index 364320a..207c527 100644
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -176,6 +175,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -183,29 +184,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -267,6 +249,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -288,7 +271,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = ${GNC_DOC_INSTALL_DIR}
-@@ -322,7 +304,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = examples
-@@ -373,8 +354,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -415,8 +396,8 @@ install-man1: $(man1_MANS) $(man_MANS)
- esac; \
- done; \
- for i in $$list; do \
-- if test -f $$i; then file=$$i; \
-- else file=$(srcdir)/$$i; fi; \
-+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-+ else file=$$i; fi; \
- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 1*) ;; \
-@@ -559,7 +540,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/doc/examples/Makefile.in b/doc/examples/Makefile.in
-index 78e10b3..d4af00a 100644
---- a/doc/examples/Makefile.in
-+++ b/doc/examples/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = ${GNC_DOC_INSTALL_DIR}/examples
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- doc_DATA = \
-@@ -345,8 +326,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/intl-scm/Makefile.in b/intl-scm/Makefile.in
-index bb7f99d..1fb7987 100644
---- a/intl-scm/Makefile.in
-+++ b/intl-scm/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -154,6 +153,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -161,29 +162,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -245,6 +227,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -266,7 +249,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -300,7 +282,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = \
-@@ -321,8 +302,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -358,7 +339,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/lib/Makefile.in b/lib/Makefile.in
-index 4f1de4d..d776e2f 100644
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = libc glib28 guile-www srfi $(am__append_1)
-@@ -320,8 +301,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -427,7 +408,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/lib/glib28/Makefile.in b/lib/glib28/Makefile.in
-index 3201a32..189440b 100644
---- a/lib/glib28/Makefile.in
-+++ b/lib/glib28/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -177,6 +176,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -184,29 +185,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -268,6 +250,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -289,7 +272,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -323,7 +305,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- noinst_LTLIBRARIES = libgnc-glib.la
-@@ -344,8 +325,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -422,7 +403,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/lib/guile-www/Makefile.in b/lib/guile-www/Makefile.in
-index f67d603..a3df786 100644
---- a/lib/guile-www/Makefile.in
-+++ b/lib/guile-www/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -160,6 +159,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -167,29 +168,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -251,6 +233,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -272,7 +255,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -306,7 +288,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-
-@@ -325,8 +306,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/lib/libc/Makefile.in b/lib/libc/Makefile.in
-index faafb26..e09b8f2 100644
---- a/lib/libc/Makefile.in
-+++ b/lib/libc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -172,6 +171,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -179,29 +180,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
-
-@@ -268,6 +250,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -289,7 +272,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -323,7 +305,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- noinst_LTLIBRARIES = libc-missing.la
-@@ -350,8 +331,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -430,7 +411,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/lib/libqof/Makefile.in b/lib/libqof/Makefile.in
-index dbb623d..0411db3 100644
---- a/lib/libqof/Makefile.in
-+++ b/lib/libqof/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . qof backend
-@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/lib/libqof/backend/Makefile.in b/lib/libqof/backend/Makefile.in
-index 80ad716..200c84b 100644
---- a/lib/libqof/backend/Makefile.in
-+++ b/lib/libqof/backend/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = file
-@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/lib/libqof/backend/file/Makefile.in b/lib/libqof/backend/file/Makefile.in
-index 0b7b9d3..5a323d5 100644
---- a/lib/libqof/backend/file/Makefile.in
-+++ b/lib/libqof/backend/file/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -197,6 +196,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -204,29 +205,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -288,6 +270,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -309,7 +292,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -343,7 +325,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = .
-@@ -393,8 +374,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -577,7 +558,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/lib/libqof/qof/Makefile.in b/lib/libqof/qof/Makefile.in
-index 97fb98e..23cc376 100644
---- a/lib/libqof/qof/Makefile.in
-+++ b/lib/libqof/qof/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -43,10 +43,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -211,6 +210,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -218,29 +219,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -302,6 +284,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -323,7 +306,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -357,7 +339,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- lib_LTLIBRARIES = libgnc-qof.la
-@@ -442,8 +423,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -618,7 +599,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/lib/srfi/Makefile.in b/lib/srfi/Makefile.in
-index bf567a5..e2b6cc9 100644
---- a/lib/srfi/Makefile.in
-+++ b/lib/srfi/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- gncscmdir = ${GNC_SHAREDIR}/guile-modules/srfi
-@@ -326,8 +307,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/ltmain.sh b/ltmain.sh
-index e589475..27d498a 100644
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -44,7 +44,7 @@ EXIT_FAILURE=1
- PROGRAM=ltmain.sh
- PACKAGE=libtool
- VERSION=1.5.26
--TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
-+TIMESTAMP=" (1.1220.2.492 2008/01/30 06:40:56)"
-
- # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -281,21 +281,7 @@ func_infer_tag ()
- esac
- CC_quoted="$CC_quoted $arg"
- done
-- # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
-- trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"`
-- # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
-- extendcc=${host}-${CC}
-- # and sometimes libtool has CC=<OLDHOST>-gcc but user has CC=<NEWHOST>-gcc
-- # (Gentoo-specific hack because we always export $CHOST)
-- mungedcc=${CHOST-${host}}-${trimedcc}
- case "$@ " in
-- "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\
-- "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
-- tagname=CC
-- break ;;
-- "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
-- "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
-- "$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\
- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
- # The compiler in the base compile command matches
- # the one in the tagged configuration.
-@@ -902,7 +888,7 @@ if test -z "$show_help"; then
- # Lock this critical section if it is needed
- # We use this script file to make the link, it avoids creating a new file
- if test "$need_locks" = yes; then
-- until $run ln "$srcfile" "$lockfile" 2>/dev/null; do
-+ until $run ln "$progpath" "$lockfile" 2>/dev/null; do
- $show "Waiting for $lockfile to be removed"
- sleep 2
- done
-@@ -5482,11 +5468,6 @@ else
- $echo >> $output "\
- if test \"\$libtool_execute_magic\" != \"$magic\"; then
- # Run the actual program with our arguments.
--
-- # Make sure env LD_LIBRARY_PATH does not mess us up
-- if test -n \"\${LD_LIBRARY_PATH+set}\"; then
-- export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH
-- fi
- "
- case $host in
- # Backslashes separate directories on plain windows
-diff --git a/packaging/Makefile.in b/packaging/Makefile.in
-index 1ebbff2..ff0b7be 100644
---- a/packaging/Makefile.in
-+++ b/packaging/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = win32
-@@ -324,8 +305,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -431,7 +412,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/packaging/win32/Makefile.in b/packaging/win32/Makefile.in
-index 062d3ce..aefbe1f 100644
---- a/packaging/win32/Makefile.in
-+++ b/packaging/win32/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -42,10 +42,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -184,6 +183,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -191,29 +192,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -275,6 +257,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -296,7 +279,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -330,7 +312,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = README defaults.sh dist.sh exetype.pl functions.sh \
-@@ -349,8 +330,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -465,7 +446,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/po/Makefile.in.in b/po/Makefile.in.in
-index 6891e8f..c7e8302 100644
---- a/po/Makefile.in.in
-+++ b/po/Makefile.in.in
-@@ -21,7 +21,7 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
-
--SHELL = /bin/sh
-+SHELL = @SHELL@
-
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
-@@ -54,16 +54,16 @@ GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDA
-
- ALL_LINGUAS = @ALL_LINGUAS@
-
--PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-
--USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
-
--USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-
--POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-
--DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
--EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
-+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
-+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
-
- POTFILES = \
- # This comment gets stripped out
-@@ -101,7 +101,6 @@ install: install-data
- install-data: install-data- at USE_NLS@
- install-data-no: all
- install-data-yes: all
-- $(mkdir_p) $(DESTDIR)$(itlocaledir)
- linguas="$(USE_LINGUAS)"; \
- for lang in $$linguas; do \
- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 7197a25..ff8da98 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -167,6 +166,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -174,29 +175,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -258,6 +240,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -279,7 +262,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -313,7 +295,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- NONGUI_SUBDIRS = \
-@@ -367,8 +348,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -493,7 +474,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/app-utils/Makefile.in b/src/app-utils/Makefile.in
-index 1557bef..6dcc436 100644
---- a/src/app-utils/Makefile.in
-+++ b/src/app-utils/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -44,10 +44,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -231,6 +230,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -238,29 +239,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -322,6 +304,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -343,7 +326,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -377,7 +359,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -472,8 +453,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -711,7 +692,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/app-utils/test/Makefile.in b/src/app-utils/test/Makefile.in
-index 5cf1859..6fb7eeb 100644
---- a/src/app-utils/test/Makefile.in
-+++ b/src/app-utils/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -44,10 +44,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -249,6 +248,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -256,29 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -340,6 +322,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -361,7 +344,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -395,7 +377,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- test_exp_parser_SOURCES = \
-@@ -460,8 +441,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -571,7 +552,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -614,7 +595,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -625,7 +606,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -637,7 +618,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -651,36 +632,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/backend/Makefile.in b/src/backend/Makefile.in
-index 3fc074e..8adee38 100644
---- a/src/backend/Makefile.in
-+++ b/src/backend/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -160,6 +159,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -167,29 +168,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -251,6 +233,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -272,7 +255,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -306,7 +288,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = file ${SQL_DIR}
-@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/backend/file/Makefile.in b/src/backend/file/Makefile.in
-index 716330f..a794bfa 100644
---- a/src/backend/file/Makefile.in
-+++ b/src/backend/file/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -220,6 +219,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -227,29 +228,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -311,6 +293,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -332,7 +315,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -366,7 +348,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -451,8 +432,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -666,7 +647,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/backend/file/test/Makefile.in b/src/backend/file/test/Makefile.in
-index 23653df..c59116a 100644
---- a/src/backend/file/test/Makefile.in
-+++ b/src/backend/file/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -53,10 +53,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -426,6 +425,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -433,29 +434,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -517,6 +499,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -538,7 +521,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -572,7 +554,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = test-files
-@@ -802,8 +783,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -1308,7 +1289,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -1364,7 +1345,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -1375,7 +1356,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -1387,7 +1368,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -1401,36 +1382,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/backend/file/test/test-files/Makefile.in b/src/backend/file/test/test-files/Makefile.in
-index 14e9f78..adf56b1 100644
---- a/src/backend/file/test/test-files/Makefile.in
-+++ b/src/backend/file/test/test-files/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = xml2
-@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/backend/file/test/test-files/xml2/Makefile.in b/src/backend/file/test/test-files/xml2/Makefile.in
-index 1e80475..8bdf82a 100644
---- a/src/backend/file/test/test-files/xml2/Makefile.in
-+++ b/src/backend/file/test/test-files/xml2/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -149,6 +148,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -156,29 +157,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -240,6 +222,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -261,7 +244,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -295,7 +277,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = \
-@@ -321,8 +302,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/backend/postgres/Makefile.in b/src/backend/postgres/Makefile.in
-index f4e6f67..1cd0772 100644
---- a/src/backend/postgres/Makefile.in
-+++ b/src/backend/postgres/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -202,6 +201,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -209,29 +210,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -293,6 +275,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -314,7 +297,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -348,7 +330,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -459,8 +440,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -645,7 +626,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/backend/postgres/test/Makefile.in b/src/backend/postgres/test/Makefile.in
-index df723f0..cc70051 100644
---- a/src/backend/postgres/test/Makefile.in
-+++ b/src/backend/postgres/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -214,6 +213,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -221,29 +222,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -305,6 +287,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -326,7 +309,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -360,7 +342,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- GNC_TEST_DEPS := \
-@@ -440,8 +421,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -738,7 +719,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -781,7 +762,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -792,7 +773,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -804,7 +785,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -818,36 +799,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in
-index 873669c..25be006 100644
---- a/src/bin/Makefile.in
-+++ b/src/bin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -193,6 +192,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -200,29 +201,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -284,6 +266,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -305,7 +288,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -339,7 +321,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-
-@@ -406,8 +387,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -592,7 +573,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/bin/overrides/Makefile.in b/src/bin/overrides/Makefile.in
-index 4e88bda..60aabe5 100644
---- a/src/bin/overrides/Makefile.in
-+++ b/src/bin/overrides/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -155,6 +154,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -162,29 +163,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -246,6 +228,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -267,7 +250,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -301,7 +283,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- gncoverridesdir = ${GNC_LIBEXECDIR}/overrides
-@@ -327,8 +308,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/bin/test/Makefile.in b/src/bin/test/Makefile.in
-index c645175..800ab1c 100644
---- a/src/bin/test/Makefile.in
-+++ b/src/bin/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -149,6 +148,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -156,29 +157,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -240,6 +222,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -261,7 +244,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -295,7 +277,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- TESTS = test-version
-@@ -310,8 +291,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -349,7 +330,7 @@ CTAGS:
-
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -360,7 +341,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -372,7 +353,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -386,36 +367,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/business/Makefile.in b/src/business/Makefile.in
-index 08d3492..a3f3ebd 100644
---- a/src/business/Makefile.in
-+++ b/src/business/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = \
-@@ -325,8 +306,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -432,7 +413,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/business/business-core/Makefile.in b/src/business/business-core/Makefile.in
-index 2fb8638..42bb54a 100644
---- a/src/business/business-core/Makefile.in
-+++ b/src/business/business-core/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -206,6 +205,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -213,29 +214,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -297,6 +279,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -318,7 +301,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -352,7 +334,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test file
-@@ -437,8 +418,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -633,7 +614,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/business/business-core/file/Makefile.in b/src/business/business-core/file/Makefile.in
-index a76796e..742a581 100644
---- a/src/business/business-core/file/Makefile.in
-+++ b/src/business/business-core/file/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -206,6 +205,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -213,29 +214,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -297,6 +279,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -318,7 +301,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -352,7 +334,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = .
-@@ -414,8 +395,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -590,7 +571,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/business/business-core/test/Makefile.in b/src/business/business-core/test/Makefile.in
-index dc70ea0..bc8b5f6 100644
---- a/src/business/business-core/test/Makefile.in
-+++ b/src/business/business-core/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -43,10 +43,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -235,6 +234,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -242,29 +243,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -326,6 +308,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -347,7 +330,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -381,7 +363,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CFLAGS = \
-@@ -426,8 +407,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -526,7 +507,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -569,7 +550,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -580,7 +561,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -592,7 +573,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -606,36 +587,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/business/business-gnome/Makefile.in b/src/business/business-gnome/Makefile.in
-index 04d38f2..aed3db2 100644
---- a/src/business/business-gnome/Makefile.in
-+++ b/src/business/business-gnome/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -220,6 +219,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -227,29 +228,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -311,6 +293,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -332,7 +315,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -366,7 +348,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . glade schemas ui
-@@ -479,8 +460,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -694,7 +675,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/business/business-gnome/glade/Makefile.in b/src/business/business-gnome/glade/Makefile.in
-index 8905e5a..fe9a45e 100644
---- a/src/business/business-gnome/glade/Makefile.in
-+++ b/src/business/business-gnome/glade/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- gladedir = $(GNC_GLADE_DIR)
-@@ -332,8 +313,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/business/business-gnome/schemas/Makefile.in b/src/business/business-gnome/schemas/Makefile.in
-index 00541a2..3086509 100644
---- a/src/business/business-gnome/schemas/Makefile.in
-+++ b/src/business/business-gnome/schemas/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- schemadir = @GCONF_SCHEMA_FILE_DIR@
-@@ -322,8 +303,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/business/business-gnome/ui/Makefile.in b/src/business/business-gnome/ui/Makefile.in
-index 068376b..d4e20d7 100644
---- a/src/business/business-gnome/ui/Makefile.in
-+++ b/src/business/business-gnome/ui/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- uidir = $(GNC_UI_DIR)
-@@ -321,8 +302,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/business/business-ledger/Makefile.in b/src/business/business-ledger/Makefile.in
-index 74521b2..b5c5d9e 100644
---- a/src/business/business-ledger/Makefile.in
-+++ b/src/business/business-ledger/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -204,6 +203,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -211,29 +212,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -295,6 +277,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -316,7 +299,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -350,7 +332,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = .
-@@ -411,8 +392,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -581,7 +562,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/business/business-reports/Makefile.in b/src/business/business-reports/Makefile.in
-index 5f4aea3..ce87a2e 100644
---- a/src/business/business-reports/Makefile.in
-+++ b/src/business/business-reports/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
-@@ -334,8 +315,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/business/business-utils/Makefile.in b/src/business/business-utils/Makefile.in
-index c30af69..dad90c1 100644
---- a/src/business/business-utils/Makefile.in
-+++ b/src/business/business-utils/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -195,6 +194,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -202,29 +203,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -286,6 +268,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -307,7 +290,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -341,7 +323,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pkglib_LTLIBRARIES = libgncmod-business-utils.la
-@@ -403,8 +384,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -533,7 +514,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/business/dialog-tax-table/Makefile.in b/src/business/dialog-tax-table/Makefile.in
-index 3902125..63e9f50 100644
---- a/src/business/dialog-tax-table/Makefile.in
-+++ b/src/business/dialog-tax-table/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -198,6 +197,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -205,29 +206,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -289,6 +271,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -310,7 +293,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -344,7 +326,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pkglib_LTLIBRARIES = libgncmod-dialog-tax-table.la
-@@ -411,8 +392,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -542,7 +523,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/calculation/Makefile.in b/src/calculation/Makefile.in
-index dd63b16..38d72ff 100644
---- a/src/calculation/Makefile.in
-+++ b/src/calculation/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -196,6 +195,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -203,29 +204,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -287,6 +269,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -308,7 +291,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -342,7 +324,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -388,8 +369,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -555,7 +536,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/calculation/test/Makefile.in b/src/calculation/test/Makefile.in
-index fd80d39..f1f3bba 100644
---- a/src/calculation/test/Makefile.in
-+++ b/src/calculation/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -170,6 +169,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -177,29 +178,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -261,6 +243,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -282,7 +265,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -316,7 +298,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- test_link_SOURCES = test-link.c
-@@ -333,8 +314,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -409,7 +390,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -452,7 +433,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -463,7 +444,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -475,7 +456,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -489,36 +470,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/core-utils/Makefile.in b/src/core-utils/Makefile.in
-index 2358007..a8d34c0 100644
---- a/src/core-utils/Makefile.in
-+++ b/src/core-utils/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -187,6 +186,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -194,29 +195,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -278,6 +260,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -299,7 +282,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -333,7 +315,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- lib_LTLIBRARIES = libgnc-core-utils.la
-@@ -387,8 +368,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -506,7 +487,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
-index 5ff2662..0432340 100644
---- a/src/doc/Makefile.in
-+++ b/src/doc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = ${GNC_DOC_INSTALL_DIR}
-@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = \
-@@ -348,8 +329,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -455,7 +436,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/doc/design/Makefile.in b/src/doc/design/Makefile.in
-index 625d167..32e738d 100644
---- a/src/doc/design/Makefile.in
-+++ b/src/doc/design/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -170,6 +169,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -177,29 +178,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -261,6 +243,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -282,7 +265,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -316,7 +298,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- info_TEXINFOS = gnucash-design.texinfo
-@@ -346,8 +327,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/doc/xml/Makefile.in b/src/doc/xml/Makefile.in
-index ed883b3..6f2b7d9 100644
---- a/src/doc/xml/Makefile.in
-+++ b/src/doc/xml/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -149,6 +148,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -156,29 +157,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -240,6 +222,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -261,7 +244,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -295,7 +277,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = \
-@@ -316,8 +297,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
-index bbc65e8..e96dbbf 100644
---- a/src/engine/Makefile.am
-+++ b/src/engine/Makefile.am
-@@ -10,6 +10,7 @@ AM_CFLAGS = \
- -I${top_srcdir}/src/gnc-module \
- ${QOF_CFLAGS} \
- ${GLIB_CFLAGS} \
-+ ${IGE_MAC_CFLAGS} \
- ${GUILE_INCS}
-
- libgncmod_engine_la_SOURCES = \
-@@ -116,6 +117,7 @@ libgncmod_engine_la_LIBADD = \
- ${REGEX_LIBS} \
- ${GLIB_LIBS} \
- ${BINRELOC_LIBS} \
-+ ${IGE_MAC_LIBS} \
- ${top_builddir}/lib/libc/libc-missing.la
-
- gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
-diff --git a/src/engine/Makefile.in b/src/engine/Makefile.in
-index 601a050..95fe6ea 100644
---- a/src/engine/Makefile.in
-+++ b/src/engine/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -42,10 +42,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -66,7 +65,7 @@ libgncmod_engine_la_DEPENDENCIES = ../gnc-module/libgnc-module.la \
- ../core-utils/libgnc-core-utils.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-- ${top_builddir}/lib/libc/libc-missing.la
-+ $(am__DEPENDENCIES_1) ${top_builddir}/lib/libc/libc-missing.la
- am_libgncmod_engine_la_OBJECTS = Account.lo Recurrence.lo Period.lo \
- Query.lo SchedXaction.lo SX-book.lo SX-ttinfo.lo Scrub.lo \
- Scrub2.lo Scrub3.lo Split.lo TransLog.lo Transaction.lo \
-@@ -215,6 +214,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -222,29 +223,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -306,6 +288,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -327,7 +310,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -361,7 +343,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test-core test
-@@ -374,6 +355,7 @@ AM_CFLAGS = \
- -I${top_srcdir}/src/gnc-module \
- ${QOF_CFLAGS} \
- ${GLIB_CFLAGS} \
-+ ${IGE_MAC_CFLAGS} \
- ${GUILE_INCS}
-
- libgncmod_engine_la_SOURCES = \
-@@ -477,6 +459,7 @@ libgncmod_engine_la_LIBADD = \
- ${REGEX_LIBS} \
- ${GLIB_LIBS} \
- ${BINRELOC_LIBS} \
-+ ${IGE_MAC_LIBS} \
- ${top_builddir}/lib/libc/libc-missing.la
-
- gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
-@@ -525,8 +508,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -774,7 +757,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/engine/binreloc.c b/src/engine/binreloc.c
-index d582a5d..032f2af 100644
---- a/src/engine/binreloc.c
-+++ b/src/engine/binreloc.c
-@@ -18,6 +18,9 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
-+#ifdef MAC_INTEGRATION
-+#include <igemacintegration/ige-mac-bundle.h>
-+#endif
- #endif /* ENABLE_BINRELOC */
- #include <stdio.h>
- #include <stdlib.h>
-@@ -27,7 +30,9 @@
- #include <glib.h>
-
- G_BEGIN_DECLS
--
-+#if defined ENABLE_BINRELOC && defined MAC_INTEGRATION
-+static IgeMacBundle *bundle = NULL;
-+#endif
-
- /** @internal
- * Find the canonical filename of the executable. Returns the filename
-@@ -61,6 +66,23 @@ _br_find_exe (GbrInitError *error)
- (char*)NULL);
- g_free (prefix);
- return result;
-+#elif MAC_INTEGRATION
-+ gchar *prefix = NULL, *result = NULL;
-+ bundle = ige_mac_bundle_get_default();
-+ if (!bundle) {
-+ *error = GBR_INIT_ERROR_DISABLED;
-+ return NULL;
-+ }
-+ if (!ige_mac_bundle_get_is_app_bundle (bundle)) {
-+ *error = GBR_INIT_ERROR_OPEN_MAPS;
-+ return NULL;
-+ }
-+ ige_mac_bundle_setup_environment(bundle);
-+ prefix = g_strdup(ige_mac_bundle_get_path(bundle));
-+ result = g_build_filename(prefix, "Contents/MacOS",
-+ "gnucash-bin.exe", NULL);
-+ g_free(prefix);
-+ return result;
- #else
- char *path, *path2, *line, *result;
- size_t buf_size;
-@@ -202,7 +224,7 @@ _br_find_exe_for_symbol (const void *symbol, GbrInitError *error)
- *error = GBR_INIT_ERROR_DISABLED;
- return (char *) NULL;
- #else
--#ifdef G_OS_WIN32
-+#if defined G_OS_WIN32 || defined MAC_INTEGRATION
- g_warning ("_br_find_exe_for_symbol not implemented on win32.");
- if (error)
- *error = GBR_INIT_ERROR_DISABLED;
-@@ -474,18 +496,33 @@ gbr_find_prefix (const gchar *default_prefix)
- {
- gchar *dir1, *dir2;
-
-- if (exe == NULL) {
-+#if defined ENABLE_BINRELOC && defined MAC_INTEGRATION
-+ gchar *prefix = NULL, *result = NULL;
-+ if (bundle == NULL) {
- /* BinReloc not initialized. */
- if (default_prefix != NULL)
- return g_strdup (default_prefix);
- else
- return NULL;
- }
-+ prefix = g_strdup(ige_mac_bundle_get_path(bundle));
-+ result = g_build_filename(prefix, "Contents/Resources", NULL);
-+ g_free(prefix);
-+ return result;
-+#else
-
-+ if (exe == NULL) {
-+ /* BinReloc not initialized. */
-+ if (default_prefix != NULL)
-+ return g_strdup (default_prefix);
-+ else
-+ return NULL;
-+ }
- dir1 = g_path_get_dirname (exe);
- dir2 = g_path_get_dirname (dir1);
- g_free (dir1);
- return dir2;
-+#endif //ENABLE_BINRELOC && MAC_INTEGRATION
- }
-
-
-@@ -506,6 +543,19 @@ gchar *
- gbr_find_bin_dir (const gchar *default_bin_dir)
- {
- gchar *prefix, *dir;
-+#if defined ENABLE_BINRELOC && defined MAC_INTEGRATION
-+ if (bundle == NULL) {
-+ /* BinReloc not initialized. */
-+ if (default_bin_dir != NULL)
-+ return g_strdup (default_bin_dir);
-+ else
-+ return NULL;
-+ }
-+ prefix = g_strdup(ige_mac_bundle_get_path(bundle));
-+ dir = g_build_filename(prefix, "Contents/MacOS", NULL);
-+ g_free(prefix);
-+ return dir;
-+#else
-
- prefix = gbr_find_prefix (NULL);
- if (prefix == NULL) {
-@@ -519,6 +569,7 @@ gbr_find_bin_dir (const gchar *default_bin_dir)
- dir = g_build_filename (prefix, "bin", NULL);
- g_free (prefix);
- return dir;
-+#endif //ENABLE_BINRELOC && MAC_INTEGRATION
- }
-
-
-diff --git a/src/engine/test-core/Makefile.in b/src/engine/test-core/Makefile.in
-index c2ae633..7721bb8 100644
---- a/src/engine/test-core/Makefile.in
-+++ b/src/engine/test-core/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -178,6 +177,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -185,29 +186,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -269,6 +251,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -290,7 +273,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -324,7 +306,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- check_LTLIBRARIES = libgncmod-test-engine.la
-@@ -360,8 +341,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -438,7 +419,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/engine/test/Makefile.in b/src/engine/test/Makefile.in
-index 37b440a..e0d7195 100644
---- a/src/engine/test/Makefile.in
-+++ b/src/engine/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -59,10 +59,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -384,6 +383,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -391,29 +392,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -475,6 +457,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -496,7 +479,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -530,7 +512,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CFLAGS = \
-@@ -583,8 +564,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -739,7 +720,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -782,7 +763,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -793,7 +774,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -805,7 +786,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -819,36 +800,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/gnc-module/Makefile.in b/src/gnc-module/Makefile.in
-index 0205851..d6840a6 100644
---- a/src/gnc-module/Makefile.in
-+++ b/src/gnc-module/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -197,6 +196,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -204,29 +205,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -288,6 +270,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -309,7 +292,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -343,7 +325,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -387,8 +368,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -587,7 +568,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/gnc-module/test/Makefile.in b/src/gnc-module/test/Makefile.in
-index c9a3087..92b95a9 100644
---- a/src/gnc-module/test/Makefile.in
-+++ b/src/gnc-module/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -45,10 +45,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -212,6 +211,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -219,29 +220,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -303,6 +285,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -324,7 +307,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -358,7 +340,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = mod-foo mod-bar mod-baz misc-mods
-@@ -406,8 +387,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -568,7 +549,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -624,7 +605,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -635,7 +616,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -647,7 +628,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -661,36 +642,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/gnc-module/test/misc-mods/Makefile.in b/src/gnc-module/test/misc-mods/Makefile.in
-index 5f43b09..e1638c2 100644
---- a/src/gnc-module/test/misc-mods/Makefile.in
-+++ b/src/gnc-module/test/misc-mods/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -185,6 +184,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -192,29 +193,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -276,6 +258,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -297,7 +280,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -331,7 +313,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CFLAGS = \
-@@ -368,8 +349,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -451,7 +432,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/gnc-module/test/mod-bar/Makefile.in b/src/gnc-module/test/mod-bar/Makefile.in
-index 01709da..8803a8e 100644
---- a/src/gnc-module/test/mod-bar/Makefile.in
-+++ b/src/gnc-module/test/mod-bar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -180,6 +179,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -187,29 +188,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -271,6 +253,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -292,7 +275,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -326,7 +308,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CFLAGS = \
-@@ -367,8 +348,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -447,7 +428,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/gnc-module/test/mod-baz/Makefile.in b/src/gnc-module/test/mod-baz/Makefile.in
-index b95d79f..78841f2 100644
---- a/src/gnc-module/test/mod-baz/Makefile.in
-+++ b/src/gnc-module/test/mod-baz/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -180,6 +179,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -187,29 +188,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -271,6 +253,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -292,7 +275,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -326,7 +308,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CFLAGS = \
-@@ -371,8 +352,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -451,7 +432,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/gnc-module/test/mod-foo/Makefile.in b/src/gnc-module/test/mod-foo/Makefile.in
-index 4c8d157..0c76120 100644
---- a/src/gnc-module/test/mod-foo/Makefile.in
-+++ b/src/gnc-module/test/mod-foo/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -180,6 +179,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -187,29 +188,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -271,6 +253,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -292,7 +275,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -326,7 +308,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CFLAGS = \
-@@ -368,8 +349,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -448,7 +429,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/gnome-search/Makefile.in b/src/gnome-search/Makefile.in
-index 1db595b..b0b6daa 100644
---- a/src/gnome-search/Makefile.in
-+++ b/src/gnome-search/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -202,6 +201,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -209,29 +210,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -293,6 +275,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -314,7 +297,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -348,7 +330,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pkglib_LTLIBRARIES = libgncmod-gnome-search.la
-@@ -430,8 +411,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -571,7 +552,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
-index 3a9f056..0fc611a 100644
---- a/src/gnome-utils/Makefile.am
-+++ b/src/gnome-utils/Makefile.am
-@@ -20,7 +20,8 @@ AM_CFLAGS = \
- ${GTKHTML_CFLAGS} \
- ${GUILE_INCS} \
- ${QOF_CFLAGS} \
-- ${GOFFICE_CFLAGS}
-+ ${GOFFICE_CFLAGS} \
-+ $(IGE_MAC_CFLAGS)
-
- libgncmod_gnome_utils_la_SOURCES = \
- QuickFill.c \
-@@ -193,11 +194,14 @@ libgncmod_gnome_utils_la_LIBADD = \
- ${QOF_LIBS} \
- ${GOFFICE_LIBS} \
- ${REGEX_LIBS} \
-- ${LIBXML2_LIBS}
-+ ${LIBXML2_LIBS} \
-+ ${IGE_MAC_LIBS}
-
--if HAVE_X11_XLIB_H
-+if HAVE_X11_XLIB_H
-+if !GDK_TARGET_QUARTZ
- libgncmod_gnome_utils_la_LIBADD += -lX11
- endif
-+endif
-
- if BUILDING_FROM_SVN
- swig-gnome-utils.c: gnome-utils.i gnc-html.h \
-diff --git a/src/gnome-utils/Makefile.in b/src/gnome-utils/Makefile.in
-index b7e5cd1..006ce82 100644
---- a/src/gnome-utils/Makefile.in
-+++ b/src/gnome-utils/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -34,7 +34,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-- at HAVE_X11_XLIB_H_TRUE@am__append_1 = -lX11
-+ at GDK_TARGET_QUARTZ_FALSE@@HAVE_X11_XLIB_H_TRUE at am__append_1 = -lX11
- @GTKHTML_USES_GTKPRINT_TRUE at am__append_2 = print-session.c
- @GTKHTML_USES_GTKPRINT_FALSE at am__append_3 = ${GNOME_PRINT_CFLAGS}
- @GTKHTML_USES_GTKPRINT_FALSE at am__append_4 = ${GNOME_PRINT_LIBS}
-@@ -46,10 +46,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -81,7 +80,8 @@ libgncmod_gnome_utils_la_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_2)
- am__libgncmod_gnome_utils_la_SOURCES_DIST = QuickFill.c \
- account-quickfill.c cursors.c dialog-account.c \
- dialog-book-close.c dialog-commodity.c dialog-options.c \
-@@ -280,6 +280,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -287,29 +289,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -371,6 +354,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -392,7 +376,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -426,7 +409,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = glade schemas . test ui
-@@ -439,7 +421,8 @@ AM_CFLAGS = -I${top_srcdir}/src/core-utils \
- -I${top_srcdir}/src -I${top_builddir}/src \
- -I${top_srcdir}/lib/libc ${GLIB_CFLAGS} ${GLADE_CFLAGS} \
- ${GTK_CFLAGS} ${GNOME_CFLAGS} ${GTKHTML_CFLAGS} ${GUILE_INCS} \
-- ${QOF_CFLAGS} ${GOFFICE_CFLAGS} $(am__append_3)
-+ ${QOF_CFLAGS} ${GOFFICE_CFLAGS} $(IGE_MAC_CFLAGS) \
-+ $(am__append_3)
- libgncmod_gnome_utils_la_SOURCES = QuickFill.c account-quickfill.c \
- cursors.c dialog-account.c dialog-book-close.c \
- dialog-commodity.c dialog-options.c dialog-preferences.c \
-@@ -557,8 +540,8 @@ libgncmod_gnome_utils_la_LIBADD = \
- $(top_builddir)/lib/libc/libc-missing.la ${GNOME_LIBS} \
- ${GTKHTML_LIBS} ${GUILE_LIBS} ${GDK_PIXBUF_LIBS} ${GLADE_LIBS} \
- ${GUILE_LIBS} ${GLIB_LIBS} ${DB_LIBS} ${QOF_LIBS} \
-- ${GOFFICE_LIBS} ${REGEX_LIBS} ${LIBXML2_LIBS} $(am__append_1) \
-- $(am__append_4)
-+ ${GOFFICE_LIBS} ${REGEX_LIBS} ${LIBXML2_LIBS} ${IGE_MAC_LIBS} \
-+ $(am__append_1) $(am__append_4)
- gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
- gncmod_DATA = gnome-utils.scm
- gncscmdir = ${GNC_SHAREDIR}/scm
-@@ -585,8 +568,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -873,7 +856,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/gnome-utils/glade/Makefile.in b/src/gnome-utils/glade/Makefile.in
-index aff3c0b..fb16e23 100644
---- a/src/gnome-utils/glade/Makefile.in
-+++ b/src/gnome-utils/glade/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- gladedir = $(GNC_GLADE_DIR)
-@@ -332,8 +313,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c
-index a664630..42ed231 100644
---- a/src/gnome-utils/gnc-main-window.c
-+++ b/src/gnome-utils/gnc-main-window.c
-@@ -32,7 +32,6 @@
- @author Copyright (C) 2003 Jan Arne Petersen <jpetersen at uni-bonn.de>
- @author Copyright (C) 2003,2005,2006 David Hampton <hampton at employees.org>
- */
--
- #include "config.h"
-
- #include <gnome.h>
-@@ -67,6 +66,9 @@
- // +JSLED
- #include "gnc-html.h"
- #include "gnc-autosave.h"
-+#ifdef MAC_INTEGRATION
-+#include <igemacintegration/igemacintegration.h>
-+#endif
-
- /** Names of signals generated by the main window. */
- enum {
-@@ -145,6 +147,9 @@ static void do_popup_menu(GncPluginPage *page, GdkEventButton *event);
- static gboolean gnc_main_window_popup_menu_cb (GtkWidget *widget, GncPluginPage *page);
-
- static GtkAction *gnc_main_window_find_action (GncMainWindow *window, const gchar *name);
-+#ifdef MAC_INTEGRATION
-+static void gtk_quartz_set_menu(GncMainWindow* window);
-+#endif
-
- /** The instance private data structure for an embedded window
- * object. */
-@@ -1344,7 +1349,14 @@ gnc_main_window_update_one_menu_action (GncMainWindow *window,
- "label", data->label,
- "visible", data->visible,
- (char *)NULL);
-- LEAVE(" ");
-+#ifdef MAC_INTEGRATION
-+ {
-+ GtkWidget *menu = gtk_ui_manager_get_widget(window->ui_merge,
-+ "/menubar"
-+);
-+ ige_mac_menu_sync(GTK_MENU_SHELL( menu ));
-+ }
-+ #endif LEAVE(" ");
- }
-
-
-@@ -1900,6 +1912,9 @@ gnc_main_window_init (GncMainWindow *window,
- qof_event_register_handler(gnc_main_window_event_handler, window);
-
- gnc_main_window_setup_window (window);
-+#ifdef MAC_INTEGRATION
-+ gtk_quartz_set_menu(window);
-+#endif
- gnc_gobject_tracking_remember(G_OBJECT(window),
- G_OBJECT_CLASS(klass));
- }
-@@ -2948,6 +2963,44 @@ gnc_main_window_setup_window (GncMainWindow *window)
- LEAVE(" ");
- }
-
-+#ifdef MAC_INTEGRATION
-+static void
-+gtk_quartz_set_menu(GncMainWindow* window) {
-+ IgeMacMenuGroup *group;
-+ GtkWidget *menu;
-+ GtkWidget *item;
-+
-+ menu = gtk_ui_manager_get_widget (window->ui_merge, "/menubar");
-+ if (GTK_IS_MENU_ITEM (menu))
-+ menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
-+ gtk_widget_hide(menu);
-+ ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (menu));
-+
-+ item = gtk_ui_manager_get_widget (window->ui_merge,
-+ "/menubar/File/FileQuit");
-+ if (GTK_IS_MENU_ITEM (item))
-+ ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (item));
-+
-+ /* the about group */
-+ group = ige_mac_menu_add_app_menu_group ();
-+
-+ item = gtk_ui_manager_get_widget (window->ui_merge,
-+ "/menubar/Help/HelpAbout");
-+ if (GTK_IS_MENU_ITEM (item))
-+ ige_mac_menu_add_app_menu_item (group, GTK_MENU_ITEM (item),
-+ _("About GnuCash"));
-+
-+ /* the preferences group */
-+ group = ige_mac_menu_add_app_menu_group ();
-+
-+ item = gtk_ui_manager_get_widget (window->ui_merge,
-+ "/menubar/Edit/EditPreferences");
-+ if (GTK_IS_MENU_ITEM (item))
-+ ige_mac_menu_add_app_menu_item (group, GTK_MENU_ITEM (item), NULL);
-+
-+}
-+#endif //MAC_INTEGRATION
-+
- /* Callbacks */
- static void
- gnc_main_window_add_widget (GtkUIManager *merge,
-@@ -3103,6 +3156,9 @@ gnc_main_window_page_reordered (GtkNotebook *notebook,
- LEAVE(" ");
- }
- #endif
-+#ifdef MAC_INTEGRATION
-+#include <igemacintegration/ige-mac-menu.h>
-+#endif
-
- static void
- gnc_main_window_plugin_added (GncPlugin *manager,
-diff --git a/src/gnome-utils/schemas/Makefile.in b/src/gnome-utils/schemas/Makefile.in
-index b40e174..c4f350d 100644
---- a/src/gnome-utils/schemas/Makefile.in
-+++ b/src/gnome-utils/schemas/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- schemadir = @GCONF_SCHEMA_FILE_DIR@
-@@ -322,8 +303,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/gnome-utils/test/Makefile.in b/src/gnome-utils/test/Makefile.in
-index 5c303ed..4f255c2 100644
---- a/src/gnome-utils/test/Makefile.in
-+++ b/src/gnome-utils/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -191,6 +190,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -198,29 +199,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -282,6 +264,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -303,7 +286,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -337,7 +319,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-
-@@ -397,8 +378,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -481,7 +462,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -524,7 +505,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -535,7 +516,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -547,7 +528,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -561,36 +542,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/gnome-utils/ui/Makefile.in b/src/gnome-utils/ui/Makefile.in
-index 75fd307..a55c507 100644
---- a/src/gnome-utils/ui/Makefile.in
-+++ b/src/gnome-utils/ui/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- uidir = $(GNC_UI_DIR)
-@@ -320,8 +301,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/gnome/Makefile.in b/src/gnome/Makefile.in
-index 5ed9c07..f3a22fc 100644
---- a/src/gnome/Makefile.in
-+++ b/src/gnome/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -220,6 +219,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -227,29 +228,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -311,6 +293,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -332,7 +315,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -366,7 +348,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = glade schemas ui
-@@ -498,8 +479,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -714,7 +695,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/gnome/glade/Makefile.in b/src/gnome/glade/Makefile.in
-index 8f6d0af..cf38c05 100644
---- a/src/gnome/glade/Makefile.in
-+++ b/src/gnome/glade/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- gladedir = $(GNC_GLADE_DIR)
-@@ -337,8 +318,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/gnome/schemas/Makefile.in b/src/gnome/schemas/Makefile.in
-index 401c3cd..b634938 100644
---- a/src/gnome/schemas/Makefile.in
-+++ b/src/gnome/schemas/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- schemadir = @GCONF_SCHEMA_FILE_DIR@
-@@ -332,8 +313,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/gnome/ui/Makefile.in b/src/gnome/ui/Makefile.in
-index 998ca9c..88ff1c4 100644
---- a/src/gnome/ui/Makefile.in
-+++ b/src/gnome/ui/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- uidir = $(GNC_UI_DIR)
-@@ -333,8 +314,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/import-export/Makefile.in b/src/import-export/Makefile.in
-index db0a812..e7165f7 100644
---- a/src/import-export/Makefile.in
-+++ b/src/import-export/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -213,6 +212,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -220,29 +221,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -304,6 +286,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -325,7 +308,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -359,7 +341,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . schemas qif qif-import \
-@@ -450,8 +431,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -662,7 +643,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/import-export/aqbanking/Makefile.in b/src/import-export/aqbanking/Makefile.in
-index 6b712c6..aa69809 100644
---- a/src/import-export/aqbanking/Makefile.in
-+++ b/src/import-export/aqbanking/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -212,6 +211,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -219,29 +220,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -303,6 +285,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -324,7 +307,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -358,7 +340,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . schemas
-@@ -443,8 +424,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -654,7 +635,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/import-export/aqbanking/schemas/Makefile.in b/src/import-export/aqbanking/schemas/Makefile.in
-index b6bfb7c..798759c 100644
---- a/src/import-export/aqbanking/schemas/Makefile.in
-+++ b/src/import-export/aqbanking/schemas/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- schemadir = @GCONF_SCHEMA_FILE_DIR@
-@@ -322,8 +303,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/import-export/hbci/Makefile.in b/src/import-export/hbci/Makefile.in
-index f84f7b0..3b02edd 100644
---- a/src/import-export/hbci/Makefile.in
-+++ b/src/import-export/hbci/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -211,6 +210,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -218,29 +219,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -302,6 +284,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -323,7 +306,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -357,7 +339,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . glade schemas test
-@@ -454,8 +435,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -650,7 +631,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/import-export/hbci/glade/Makefile.in b/src/import-export/hbci/glade/Makefile.in
-index d20320f..09462e0 100644
---- a/src/import-export/hbci/glade/Makefile.in
-+++ b/src/import-export/hbci/glade/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- gladedir = $(GNC_GLADE_DIR)
-@@ -322,8 +303,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/import-export/hbci/schemas/Makefile.in b/src/import-export/hbci/schemas/Makefile.in
-index 7cbcead..5db711a 100644
---- a/src/import-export/hbci/schemas/Makefile.in
-+++ b/src/import-export/hbci/schemas/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- schemadir = @GCONF_SCHEMA_FILE_DIR@
-@@ -322,8 +303,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/import-export/hbci/test/Makefile.in b/src/import-export/hbci/test/Makefile.in
-index 074022c..3bdd775 100644
---- a/src/import-export/hbci/test/Makefile.in
-+++ b/src/import-export/hbci/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -168,6 +167,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -175,29 +176,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -259,6 +241,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -280,7 +263,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -314,7 +296,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- test_link_module_SOURCES = test-link-module.c
-@@ -327,8 +308,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -403,7 +384,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -446,7 +427,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -457,7 +438,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -469,7 +450,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -483,36 +464,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/import-export/log-replay/Makefile.in b/src/import-export/log-replay/Makefile.in
-index 89c72a3..fe92cbf 100644
---- a/src/import-export/log-replay/Makefile.in
-+++ b/src/import-export/log-replay/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -205,6 +204,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -212,29 +213,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -296,6 +278,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -317,7 +300,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -351,7 +333,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = .
-@@ -404,8 +385,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -588,7 +569,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/import-export/ofx/Makefile.in b/src/import-export/ofx/Makefile.in
-index fc6df42..f92a355 100644
---- a/src/import-export/ofx/Makefile.in
-+++ b/src/import-export/ofx/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -205,6 +204,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -212,29 +213,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -296,6 +278,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -317,7 +300,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -351,7 +333,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -408,8 +389,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -592,7 +573,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/import-export/ofx/test/Makefile.in b/src/import-export/ofx/test/Makefile.in
-index f8098ad..dda9288 100644
---- a/src/import-export/ofx/test/Makefile.in
-+++ b/src/import-export/ofx/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -168,6 +167,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -175,29 +176,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -259,6 +241,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -280,7 +263,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -314,7 +296,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CFLAGS = ${LIBOFX_CFLAGS}
-@@ -328,8 +309,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -404,7 +385,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -447,7 +428,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -458,7 +439,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -470,7 +451,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -484,36 +465,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/import-export/qif-import/Makefile.in b/src/import-export/qif-import/Makefile.in
-index 62968da..913aa1f 100644
---- a/src/import-export/qif-import/Makefile.in
-+++ b/src/import-export/qif-import/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -215,6 +214,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -222,29 +223,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -306,6 +288,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -327,7 +310,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -361,7 +343,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test schemas
-@@ -453,8 +434,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -690,7 +671,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/import-export/qif-import/schemas/Makefile.in b/src/import-export/qif-import/schemas/Makefile.in
-index d0b1cc2..fa5dd44 100644
---- a/src/import-export/qif-import/schemas/Makefile.in
-+++ b/src/import-export/qif-import/schemas/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- schemadir = @GCONF_SCHEMA_FILE_DIR@
-@@ -322,8 +303,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/import-export/qif-import/test/Makefile.in b/src/import-export/qif-import/test/Makefile.in
-index 3ec751e..3b96ea0 100644
---- a/src/import-export/qif-import/test/Makefile.in
-+++ b/src/import-export/qif-import/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -175,6 +174,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -182,29 +183,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -266,6 +248,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -287,7 +270,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -321,7 +303,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- test_link_SOURCES = \
-@@ -344,8 +325,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -420,7 +401,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -463,7 +444,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -474,7 +455,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -486,7 +467,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -500,36 +481,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/import-export/qif-io-core/Makefile.in b/src/import-export/qif-io-core/Makefile.in
-index 821b714..ca63190 100644
---- a/src/import-export/qif-io-core/Makefile.in
-+++ b/src/import-export/qif-io-core/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -191,6 +190,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -198,29 +199,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -282,6 +264,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -303,7 +286,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -337,7 +319,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -372,8 +353,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -571,7 +552,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/import-export/qif-io-core/test/Makefile.in b/src/import-export/qif-io-core/test/Makefile.in
-index 7ed1350..d2e6e4a 100644
---- a/src/import-export/qif-io-core/test/Makefile.in
-+++ b/src/import-export/qif-io-core/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -149,6 +148,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -156,29 +157,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -240,6 +222,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -261,7 +244,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -295,7 +277,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- LDADD = ${top_builddir}/src/gnc-module/libgnc-module.la ${GLIB_LIBS}
-@@ -329,8 +310,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -368,7 +349,7 @@ CTAGS:
-
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -379,7 +360,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -391,7 +372,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -405,36 +386,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/import-export/qif/Makefile.in b/src/import-export/qif/Makefile.in
-index 73b24d0..5424466 100644
---- a/src/import-export/qif/Makefile.in
-+++ b/src/import-export/qif/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -195,6 +194,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -202,29 +203,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -286,6 +268,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -307,7 +290,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -341,7 +323,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-
-@@ -390,8 +371,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -559,7 +540,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/import-export/qif/test/Makefile.in b/src/import-export/qif/test/Makefile.in
-index 676aedf..e3d3942 100644
---- a/src/import-export/qif/test/Makefile.in
-+++ b/src/import-export/qif/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -182,6 +181,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,29 +190,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -273,6 +255,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -294,7 +277,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -328,7 +310,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CFLAGS = \
-@@ -385,8 +366,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -465,7 +446,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -508,7 +489,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -519,7 +500,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -531,7 +512,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -545,36 +526,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/import-export/schemas/Makefile.in b/src/import-export/schemas/Makefile.in
-index 7489f65..8d2c3b0 100644
---- a/src/import-export/schemas/Makefile.in
-+++ b/src/import-export/schemas/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- schemadir = @GCONF_SCHEMA_FILE_DIR@
-@@ -322,8 +303,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/import-export/test/Makefile.in b/src/import-export/test/Makefile.in
-index 9865124..caa0e03 100644
---- a/src/import-export/test/Makefile.in
-+++ b/src/import-export/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -186,6 +185,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -193,29 +194,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -277,6 +259,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -298,7 +281,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -332,7 +314,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CFLAGS = \
-@@ -379,8 +360,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -459,7 +440,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -502,7 +483,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -513,7 +494,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -525,7 +506,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -539,36 +520,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/optional/Makefile.in b/src/optional/Makefile.in
-index 9a90d5a..7ab7e26 100644
---- a/src/optional/Makefile.in
-+++ b/src/optional/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = xsl
-@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/optional/xsl/Makefile.in b/src/optional/xsl/Makefile.in
-index 9de9957..e38e90b 100644
---- a/src/optional/xsl/Makefile.in
-+++ b/src/optional/xsl/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xsldir = ${datadir}/xml/gnucash/xsl
-@@ -327,8 +308,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/pixmaps/Makefile.in b/src/pixmaps/Makefile.in
-index 835efa8..3a424d3 100644
---- a/src/pixmaps/Makefile.in
-+++ b/src/pixmaps/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -172,6 +171,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -179,29 +180,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -263,6 +245,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -284,7 +267,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -318,7 +300,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- gncpixmapdir = ${GNC_PIXMAP_DIR}
-@@ -389,8 +370,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/quotes/Makefile.in b/src/quotes/Makefile.in
-index 4ff062e..575ccf9 100644
---- a/src/quotes/Makefile.in
-+++ b/src/quotes/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -153,6 +152,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -160,29 +161,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -244,6 +226,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -265,7 +248,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -299,7 +281,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- bin_SCRIPTS = gnc-fq-check gnc-fq-dump gnc-fq-helper gnc-fq-update
-@@ -319,8 +300,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/register/Makefile.in b/src/register/Makefile.in
-index 0b1633a..668c501 100644
---- a/src/register/Makefile.in
-+++ b/src/register/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = register-core register-gnome ledger-core
-@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/register/ledger-core/Makefile.in b/src/register/ledger-core/Makefile.in
-index 4d05a15..4d9ee9d 100644
---- a/src/register/ledger-core/Makefile.in
-+++ b/src/register/ledger-core/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -207,6 +206,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -214,29 +215,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -298,6 +280,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -319,7 +302,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -353,7 +335,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -419,8 +400,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -593,7 +574,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/register/ledger-core/test/Makefile.in b/src/register/ledger-core/test/Makefile.in
-index 87dbee8..35e9e2b 100644
---- a/src/register/ledger-core/test/Makefile.in
-+++ b/src/register/ledger-core/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -168,6 +167,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -175,29 +176,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -259,6 +241,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -280,7 +263,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -314,7 +296,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- test_link_module_SOURCES = test-link-module.c
-@@ -328,8 +309,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -404,7 +385,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -447,7 +428,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -458,7 +439,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -470,7 +451,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -484,36 +465,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/register/register-core/Makefile.in b/src/register/register-core/Makefile.in
-index e33b72a..4d45f62 100644
---- a/src/register/register-core/Makefile.in
-+++ b/src/register/register-core/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -207,6 +206,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -214,29 +215,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -298,6 +280,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -319,7 +302,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -353,7 +335,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -427,8 +408,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -624,7 +605,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/register/register-core/test/Makefile.in b/src/register/register-core/test/Makefile.in
-index 7e3854b..9516602 100644
---- a/src/register/register-core/test/Makefile.in
-+++ b/src/register/register-core/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -171,6 +170,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -178,29 +179,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -262,6 +244,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -283,7 +266,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -317,7 +299,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- test_link_module_SOURCES = test-link-module.c
-@@ -337,8 +318,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -413,7 +394,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -456,7 +437,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -467,7 +448,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -479,7 +460,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -493,36 +474,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/register/register-gnome/Makefile.in b/src/register/register-gnome/Makefile.in
-index 7e73b3f..ab24d2c 100644
---- a/src/register/register-gnome/Makefile.in
-+++ b/src/register/register-gnome/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -208,6 +207,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -215,29 +216,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -299,6 +281,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -320,7 +303,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -354,7 +336,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -431,8 +412,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -612,7 +593,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/register/register-gnome/test/Makefile.in b/src/register/register-gnome/test/Makefile.in
-index bd9883d..832367d 100644
---- a/src/register/register-gnome/test/Makefile.in
-+++ b/src/register/register-gnome/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -171,6 +170,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -178,29 +179,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -262,6 +244,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -283,7 +266,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -317,7 +299,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- test_link_module_SOURCES = test-link-module.c
-@@ -337,8 +318,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -413,7 +394,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -456,7 +437,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -467,7 +448,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -479,7 +460,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -493,36 +474,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/report/Makefile.in b/src/report/Makefile.in
-index 1b4d512..4dc5c8a 100644
---- a/src/report/Makefile.in
-+++ b/src/report/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -160,6 +159,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -167,29 +168,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -251,6 +233,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -272,7 +255,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -306,7 +288,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- NONGUI_SUBDIRS = \
-@@ -329,8 +310,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -436,7 +417,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/report/locale-specific/Makefile.in b/src/report/locale-specific/Makefile.in
-index a712fb7..934974b 100644
---- a/src/report/locale-specific/Makefile.in
-+++ b/src/report/locale-specific/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = us
-@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/report/locale-specific/us/Makefile.in b/src/report/locale-specific/us/Makefile.in
-index 53a5e08..478ce23 100644
---- a/src/report/locale-specific/us/Makefile.in
-+++ b/src/report/locale-specific/us/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -200,6 +199,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -207,29 +208,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -291,6 +273,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -312,7 +295,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -346,7 +328,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -391,8 +372,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -590,7 +571,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/report/locale-specific/us/test/Makefile.in b/src/report/locale-specific/us/test/Makefile.in
-index b63d02d..2781b08 100644
---- a/src/report/locale-specific/us/test/Makefile.in
-+++ b/src/report/locale-specific/us/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -168,6 +167,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -175,29 +176,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -259,6 +241,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -280,7 +263,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -314,7 +296,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
-@@ -348,8 +329,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -424,7 +405,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -467,7 +448,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -478,7 +459,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -490,7 +471,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -504,36 +485,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/report/report-gnome/Makefile.in b/src/report/report-gnome/Makefile.in
-index 9ac4f5b..c902948 100644
---- a/src/report/report-gnome/Makefile.in
-+++ b/src/report/report-gnome/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -215,6 +214,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -222,29 +223,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -306,6 +288,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -327,7 +310,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -361,7 +343,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -442,8 +423,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -680,7 +661,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/report/report-gnome/test/Makefile.in b/src/report/report-gnome/test/Makefile.in
-index 714dcf2..ae5529d 100644
---- a/src/report/report-gnome/test/Makefile.in
-+++ b/src/report/report-gnome/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -169,6 +168,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -176,29 +177,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -260,6 +242,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -281,7 +264,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -315,7 +297,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
-@@ -347,8 +328,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -423,7 +404,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -466,7 +447,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -477,7 +458,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -489,7 +470,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -503,36 +484,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/report/report-system/Makefile.in b/src/report/report-system/Makefile.in
-index 437b717..cc4122e 100644
---- a/src/report/report-system/Makefile.in
-+++ b/src/report/report-system/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -205,6 +204,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -212,29 +213,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -296,6 +278,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -317,7 +300,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -351,7 +333,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -418,8 +399,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -636,7 +617,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/report/report-system/test/Makefile.in b/src/report/report-system/test/Makefile.in
-index 1174b99..0ff4733 100644
---- a/src/report/report-system/test/Makefile.in
-+++ b/src/report/report-system/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -168,6 +167,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -175,29 +176,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -259,6 +241,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -280,7 +263,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -314,7 +296,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
-@@ -341,8 +322,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -417,7 +398,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -460,7 +441,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -471,7 +452,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -483,7 +464,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -497,36 +478,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/report/standard-reports/Makefile.in b/src/report/standard-reports/Makefile.in
-index ec30eb0..73359ba 100644
---- a/src/report/standard-reports/Makefile.in
-+++ b/src/report/standard-reports/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -197,6 +196,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -204,29 +205,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -288,6 +270,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -309,7 +292,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -343,7 +325,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -401,8 +382,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -583,7 +564,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/report/standard-reports/test/Makefile.in b/src/report/standard-reports/test/Makefile.in
-index 340205a..b5d9b07 100644
---- a/src/report/standard-reports/test/Makefile.in
-+++ b/src/report/standard-reports/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -149,6 +148,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -156,29 +157,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -240,6 +222,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -261,7 +244,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -295,7 +277,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- TESTS = test-load-module
-@@ -323,8 +304,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -362,7 +343,7 @@ CTAGS:
-
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -373,7 +354,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -385,7 +366,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -399,36 +380,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/report/stylesheets/Makefile.in b/src/report/stylesheets/Makefile.in
-index 74ac9b1..4b58834 100644
---- a/src/report/stylesheets/Makefile.in
-+++ b/src/report/stylesheets/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -205,6 +204,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -212,29 +213,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -296,6 +278,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -317,7 +300,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -351,7 +333,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -412,8 +393,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -612,7 +593,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/report/stylesheets/test/Makefile.in b/src/report/stylesheets/test/Makefile.in
-index 6823fba..69d4a74 100644
---- a/src/report/stylesheets/test/Makefile.in
-+++ b/src/report/stylesheets/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
++ item = gtk_ui_manager_get_widget (window->ui_merge,
++ "/menubar/Help/HelpAbout");
++ if (GTK_IS_MENU_ITEM (item))
++ ige_mac_menu_add_app_menu_item (group, GTK_MENU_ITEM (item),
++ _("About GnuCash"));
++
++ /* the preferences group */
++ group = ige_mac_menu_add_app_menu_group ();
++
++ item = gtk_ui_manager_get_widget (window->ui_merge,
++ "/menubar/Edit/EditPreferences");
++ if (GTK_IS_MENU_ITEM (item))
++ ige_mac_menu_add_app_menu_item (group, GTK_MENU_ITEM (item), NULL);
++
++}
++#endif //MAC_INTEGRATION
++
+ /* Callbacks */
+ static void
+ gnc_main_window_add_widget (GtkUIManager *merge,
+@@ -3103,6 +3156,9 @@ gnc_main_window_page_reordered (GtkNotebook *notebook,
+ LEAVE(" ");
+ }
+ #endif
++#ifdef MAC_INTEGRATION
++#include <igemacintegration/ige-mac-menu.h>
++#endif
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -149,6 +148,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -156,29 +157,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -240,6 +222,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -261,7 +244,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -295,7 +277,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- TESTS = test-load-module
-@@ -327,8 +308,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -366,7 +347,7 @@ CTAGS:
+ static void
+ gnc_main_window_plugin_added (GncPlugin *manager,
+ --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
+index 3a9f056..0fc611a 100644
+--- a/src/gnome-utils/Makefile.am
++++ b/src/gnome-utils/Makefile.am
+@@ -20,7 +20,8 @@ AM_CFLAGS = \
+ ${GTKHTML_CFLAGS} \
+ ${GUILE_INCS} \
+ ${QOF_CFLAGS} \
+- ${GOFFICE_CFLAGS}
++ ${GOFFICE_CFLAGS} \
++ $(IGE_MAC_CFLAGS)
+ libgncmod_gnome_utils_la_SOURCES = \
+ QuickFill.c \
+@@ -193,11 +194,14 @@ libgncmod_gnome_utils_la_LIBADD = \
+ ${QOF_LIBS} \
+ ${GOFFICE_LIBS} \
+ ${REGEX_LIBS} \
+- ${LIBXML2_LIBS}
++ ${LIBXML2_LIBS} \
++ ${IGE_MAC_LIBS}
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -377,7 +358,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -389,7 +370,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -403,36 +384,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/report/utility-reports/Makefile.in b/src/report/utility-reports/Makefile.in
-index a682e3d..004b254 100644
---- a/src/report/utility-reports/Makefile.in
-+++ b/src/report/utility-reports/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+-if HAVE_X11_XLIB_H
++if HAVE_X11_XLIB_H
++if !GDK_TARGET_QUARTZ
+ libgncmod_gnome_utils_la_LIBADD += -lX11
+ endif
++endif
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -197,6 +196,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -204,29 +205,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -288,6 +270,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -309,7 +292,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -343,7 +325,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -389,8 +370,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -571,7 +552,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/report/utility-reports/test/Makefile.in b/src/report/utility-reports/test/Makefile.in
-index 2fb60cb..404dc66 100644
---- a/src/report/utility-reports/test/Makefile.in
-+++ b/src/report/utility-reports/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+ if BUILDING_FROM_SVN
+ swig-gnome-utils.c: gnome-utils.i gnc-html.h \
+ --git a/src/engine/binreloc.c b/src/engine/binreloc.c
+index d582a5d..032f2af 100644
+--- a/src/engine/binreloc.c
++++ b/src/engine/binreloc.c
+@@ -18,6 +18,9 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#ifdef MAC_INTEGRATION
++#include <igemacintegration/ige-mac-bundle.h>
++#endif
+ #endif /* ENABLE_BINRELOC */
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -27,7 +30,9 @@
+ #include <glib.h>
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -149,6 +148,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -156,29 +157,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -240,6 +222,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -261,7 +244,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -295,7 +277,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- TESTS = test-load-module
-@@ -323,8 +304,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -362,7 +343,7 @@ CTAGS:
+ G_BEGIN_DECLS
+-
++#if defined ENABLE_BINRELOC && defined MAC_INTEGRATION
++static IgeMacBundle *bundle = NULL;
++#endif
+ /** @internal
+ * Find the canonical filename of the executable. Returns the filename
+@@ -61,6 +66,23 @@ _br_find_exe (GbrInitError *error)
+ (char*)NULL);
+ g_free (prefix);
+ return result;
++#elif MAC_INTEGRATION
++ gchar *prefix = NULL, *result = NULL;
++ bundle = ige_mac_bundle_get_default();
++ if (!bundle) {
++ *error = GBR_INIT_ERROR_DISABLED;
++ return NULL;
++ }
++ if (!ige_mac_bundle_get_is_app_bundle (bundle)) {
++ *error = GBR_INIT_ERROR_OPEN_MAPS;
++ return NULL;
++ }
++ ige_mac_bundle_setup_environment(bundle);
++ prefix = g_strdup(ige_mac_bundle_get_path(bundle));
++ result = g_build_filename(prefix, "Contents/MacOS",
++ "gnucash-bin.exe", NULL);
++ g_free(prefix);
++ return result;
+ #else
+ char *path, *path2, *line, *result;
+ size_t buf_size;
+@@ -202,7 +224,7 @@ _br_find_exe_for_symbol (const void *symbol, GbrInitError *error)
+ *error = GBR_INIT_ERROR_DISABLED;
+ return (char *) NULL;
+ #else
+-#ifdef G_OS_WIN32
++#if defined G_OS_WIN32 || defined MAC_INTEGRATION
+ g_warning ("_br_find_exe_for_symbol not implemented on win32.");
+ if (error)
+ *error = GBR_INIT_ERROR_DISABLED;
+@@ -474,18 +496,33 @@ gbr_find_prefix (const gchar *default_prefix)
+ {
+ gchar *dir1, *dir2;
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -373,7 +354,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -385,7 +366,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -399,36 +380,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/scm/Makefile.in b/src/scm/Makefile.in
-index d09a7f1..bcda222 100644
---- a/src/scm/Makefile.in
-+++ b/src/scm/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+- if (exe == NULL) {
++#if defined ENABLE_BINRELOC && defined MAC_INTEGRATION
++ gchar *prefix = NULL, *result = NULL;
++ if (bundle == NULL) {
+ /* BinReloc not initialized. */
+ if (default_prefix != NULL)
+ return g_strdup (default_prefix);
+ else
+ return NULL;
+ }
++ prefix = g_strdup(ige_mac_bundle_get_path(bundle));
++ result = g_build_filename(prefix, "Contents/Resources", NULL);
++ g_free(prefix);
++ return result;
++#else
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -174,6 +173,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -181,29 +182,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -265,6 +247,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -286,7 +269,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -320,7 +302,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = gnumeric
-@@ -364,8 +345,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -522,7 +503,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/scm/gnumeric/Makefile.in b/src/scm/gnumeric/Makefile.in
-index a0713c0..b324e02 100644
---- a/src/scm/gnumeric/Makefile.in
-+++ b/src/scm/gnumeric/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
++ if (exe == NULL) {
++ /* BinReloc not initialized. */
++ if (default_prefix != NULL)
++ return g_strdup (default_prefix);
++ else
++ return NULL;
++ }
+ dir1 = g_path_get_dirname (exe);
+ dir2 = g_path_get_dirname (dir1);
+ g_free (dir1);
+ return dir2;
++#endif //ENABLE_BINRELOC && MAC_INTEGRATION
+ }
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- gncscmdir = ${GNC_SCM_INSTALL_DIR}/gnumeric
-@@ -329,8 +310,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-diff --git a/src/tax/Makefile.in b/src/tax/Makefile.in
-index 39f79c7..6b49d62 100644
---- a/src/tax/Makefile.in
-+++ b/src/tax/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = us
-@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/tax/us/Makefile.in b/src/tax/us/Makefile.in
-index 2e09c59..cd15682 100644
---- a/src/tax/us/Makefile.in
-+++ b/src/tax/us/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+@@ -506,6 +543,19 @@ gchar *
+ gbr_find_bin_dir (const gchar *default_bin_dir)
+ {
+ gchar *prefix, *dir;
++#if defined ENABLE_BINRELOC && defined MAC_INTEGRATION
++ if (bundle == NULL) {
++ /* BinReloc not initialized. */
++ if (default_bin_dir != NULL)
++ return g_strdup (default_bin_dir);
++ else
++ return NULL;
++ }
++ prefix = g_strdup(ige_mac_bundle_get_path(bundle));
++ dir = g_build_filename(prefix, "Contents/MacOS", NULL);
++ g_free(prefix);
++ return dir;
++#else
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -196,6 +195,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -203,29 +204,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -287,6 +269,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -308,7 +291,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -342,7 +324,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = . test
-@@ -385,8 +366,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -584,7 +565,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff --git a/src/tax/us/test/Makefile.in b/src/tax/us/test/Makefile.in
-index e8323f4..f49476f 100644
---- a/src/tax/us/test/Makefile.in
-+++ b/src/tax/us/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+ prefix = gbr_find_prefix (NULL);
+ if (prefix == NULL) {
+@@ -519,6 +569,7 @@ gbr_find_bin_dir (const gchar *default_bin_dir)
+ dir = g_build_filename (prefix, "bin", NULL);
+ g_free (prefix);
+ return dir;
++#endif //ENABLE_BINRELOC && MAC_INTEGRATION
+ }
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -170,6 +169,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -177,29 +178,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -261,6 +243,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -282,7 +265,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -316,7 +298,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-@@ -342,8 +323,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -418,7 +399,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -461,7 +442,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ --git a/src/engine/Makefile.am b/src/engine/Makefile.am
+index bbc65e8..e96dbbf 100644
+--- a/src/engine/Makefile.am
++++ b/src/engine/Makefile.am
+@@ -10,6 +10,7 @@ AM_CFLAGS = \
+ -I${top_srcdir}/src/gnc-module \
+ ${QOF_CFLAGS} \
+ ${GLIB_CFLAGS} \
++ ${IGE_MAC_CFLAGS} \
+ ${GUILE_INCS}
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -472,7 +453,7 @@ check-TESTS: $(TESTS)
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -484,7 +465,7 @@ check-TESTS: $(TESTS)
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -498,36 +479,23 @@ check-TESTS: $(TESTS)
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff --git a/src/test-core/Makefile.in b/src/test-core/Makefile.in
-index 4db0eee..608f67f 100644
---- a/src/test-core/Makefile.in
-+++ b/src/test-core/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+ libgncmod_engine_la_SOURCES = \
+@@ -116,6 +117,7 @@ libgncmod_engine_la_LIBADD = \
+ ${REGEX_LIBS} \
+ ${GLIB_LIBS} \
+ ${BINRELOC_LIBS} \
++ ${IGE_MAC_LIBS} \
+ ${top_builddir}/lib/libc/libc-missing.la
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
- $(top_srcdir)/macros/as-scrub-include.m4 \
- $(top_srcdir)/macros/binreloc.m4 \
-- $(top_srcdir)/macros/compiler-flags.m4 \
- $(top_srcdir)/macros/gnome-guile-checks.m4 \
- $(top_srcdir)/macros/legacy_macros.m4 \
-- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -177,6 +176,8 @@ GUILE_INCS = @GUILE_INCS@
- GUILE_LIBS = @GUILE_LIBS@
- GUILE_TOOLS = @GUILE_TOOLS@
- HTMLHELP_LIBS = @HTMLHELP_LIBS@
-+IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
-+IGE_MAC_LIBS = @IGE_MAC_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -184,29 +185,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -268,6 +250,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
- USE_LIBQOF = @USE_LIBQOF@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- ZLIB_LIBS = @ZLIB_LIBS@
- abs_builddir = @abs_builddir@
-@@ -289,7 +272,6 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- builddir = @builddir@
--cflags_set = @cflags_set@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -323,7 +305,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- noinst_LTLIBRARIES = libgncmod-test.la
-@@ -348,8 +329,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -426,7 +407,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
commit 06095cec88631e673755f5681524fa6cc7f496a2
Author: John Ralls <jralls at ceridwen.us>
Date: Sun May 31 17:12:11 2009 -0700
Fixed skip-strip typo
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index c76aec8..3fd8eb0 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -89,9 +89,9 @@
autogenargs="--enable-ofx --enable-aqbanking ">
<branch module="gnucash-2.2.9.tar.gz" version="2.2.9"
repo="gnucash.org">
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-xlib.patch" skip="0"/>
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-in.patch" skip="0"/>
- <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-integration.patch" skip="1"/>
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-xlib.patch" strip="0"/>
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-in.patch" strip="0"/>
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-integration.patch" strip="1"/>
</branch>
<dependencies>
<dep package="meta-goffice"/>
commit ac5624ebb4604a8b2e7a77e97ec75fe9afb9b057
Merge: e2ef066 bba68df
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 30 16:37:11 2009 -0700
Integrate changes for Tiger/PPC
Merge commit 'origin/master'
commit e2ef066f65663313b47f4abceab8a0f7492ae6f5
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 30 16:27:58 2009 -0700
New ige-mac-integration patch for gnucash
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index e05b4cd..b400876 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -91,6 +91,7 @@
repo="gnucash.org">
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-xlib.patch" skip="0"/>
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-in.patch" skip="0"/>
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-integration.patch" skip="1"/>
</branch>
<dependencies>
<dep package="meta-goffice"/>
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index 5577ef1..f4249a3 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -81,6 +81,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
<branch module="libgnomeprint/2.18/libgnomeprint-2.18.6.tar.gz"
repo="ftp.gnome.org" version="2.18.6"
md5sum="10a9e58aabecf541bc6852f64b3a9294">
+ <!-- Note: A fix was committed to SVN 9APR2009, so this patch should be removed when this module is upgraded to the next release. -->
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/libgnomeprint.patch" skip="0"/>
</branch>
<dependencies>
diff --git a/patches/gnucash-integration.patch b/patches/gnucash-integration.patch
new file mode 100644
index 0000000..314a531
--- /dev/null
+++ b/patches/gnucash-integration.patch
@@ -0,0 +1,43188 @@
+diff --git a/Makefile.in b/Makefile.in
+index 7a1d24a..50fbde8 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -42,10 +42,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+@@ -185,6 +184,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -192,29 +193,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -276,6 +258,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -297,7 +280,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = ${GNC_DOC_INSTALL_DIR}
+@@ -331,7 +313,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . doc lib src intl-scm packaging po accounts checks
+@@ -482,7 +463,7 @@ clean-libtool:
+ -rm -rf .libs _libs
+
+ distclean-libtool:
+- -rm -f libtool config.lt
++ -rm -f libtool
+ install-dist_docDATA: $(dist_doc_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+@@ -576,7 +557,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/accounts/C/Makefile.in b/accounts/C/Makefile.in
+index 3d3102e..4651081 100644
+--- a/accounts/C/Makefile.in
++++ b/accounts/C/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/C
+@@ -338,8 +319,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/Makefile.in b/accounts/Makefile.in
+index 9e0bf59..e0fcfd6 100644
+--- a/accounts/Makefile.in
++++ b/accounts/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = C da de_AT de_CH de_DE el_GR en_GB es_ES es_MX fi_FI fr_CH fr_CA fr_FR hu_HU it ja nl nb pt_BR pt_PT ru sk tr_TR zh_CN
+@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/accounts/da/Makefile.in b/accounts/da/Makefile.in
+index b46baca..2442524 100644
+--- a/accounts/da/Makefile.in
++++ b/accounts/da/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/da
+@@ -325,8 +306,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/de_AT/Makefile.in b/accounts/de_AT/Makefile.in
+index cf62263..4c288a3 100644
+--- a/accounts/de_AT/Makefile.in
++++ b/accounts/de_AT/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -160,6 +159,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -167,29 +168,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -251,6 +233,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -272,7 +255,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -306,7 +288,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = $(GNC_ACCOUNTS_DIR)/de_AT
+@@ -327,8 +308,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/de_CH/Makefile.in b/accounts/de_CH/Makefile.in
+index a9a51ff..41d02db 100644
+--- a/accounts/de_CH/Makefile.in
++++ b/accounts/de_CH/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/de_CH
+@@ -327,8 +308,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/de_DE/Makefile.in b/accounts/de_DE/Makefile.in
+index 00416d7..a2a144c 100644
+--- a/accounts/de_DE/Makefile.in
++++ b/accounts/de_DE/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/de_DE
+@@ -336,8 +317,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/el_GR/Makefile.in b/accounts/el_GR/Makefile.in
+index 563257e..7e2b852 100644
+--- a/accounts/el_GR/Makefile.in
++++ b/accounts/el_GR/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/el_GR
+@@ -324,8 +305,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/en_GB/Makefile.in b/accounts/en_GB/Makefile.in
+index e2af267..0d69884 100644
+--- a/accounts/en_GB/Makefile.in
++++ b/accounts/en_GB/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/en_GB
+@@ -339,8 +320,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/es_ES/Makefile.in b/accounts/es_ES/Makefile.in
+index ac32a42..cc408c2 100644
+--- a/accounts/es_ES/Makefile.in
++++ b/accounts/es_ES/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/es_ES
+@@ -336,8 +317,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/es_MX/Makefile.in b/accounts/es_MX/Makefile.in
+index fd924ad..72d229a 100644
+--- a/accounts/es_MX/Makefile.in
++++ b/accounts/es_MX/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/es_MX
+@@ -336,8 +317,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/fi_FI/Makefile.in b/accounts/fi_FI/Makefile.in
+index beeda38..ab6f2f5 100644
+--- a/accounts/fi_FI/Makefile.in
++++ b/accounts/fi_FI/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/fi_FI
+@@ -323,8 +304,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/fr_CA/Makefile.in b/accounts/fr_CA/Makefile.in
+index fff9ff4..fc6bdef 100644
+--- a/accounts/fr_CA/Makefile.in
++++ b/accounts/fr_CA/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/fr_CA
+@@ -335,8 +316,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/fr_CH/Makefile.in b/accounts/fr_CH/Makefile.in
+index 532cb46..7fe734e 100644
+--- a/accounts/fr_CH/Makefile.in
++++ b/accounts/fr_CH/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/fr_CH
+@@ -337,8 +318,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/fr_FR/Makefile.in b/accounts/fr_FR/Makefile.in
+index 1f76745..6322232 100644
+--- a/accounts/fr_FR/Makefile.in
++++ b/accounts/fr_FR/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/fr_FR
+@@ -337,8 +318,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/hu_HU/Makefile.in b/accounts/hu_HU/Makefile.in
+index 8608258..ab56b9b 100644
+--- a/accounts/hu_HU/Makefile.in
++++ b/accounts/hu_HU/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/hu_HU
+@@ -337,8 +318,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/it/Makefile.in b/accounts/it/Makefile.in
+index 079f53e..419162b 100644
+--- a/accounts/it/Makefile.in
++++ b/accounts/it/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/it
+@@ -335,8 +316,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/ja/Makefile.in b/accounts/ja/Makefile.in
+index 70dfa0e..b2d81e5 100644
+--- a/accounts/ja/Makefile.in
++++ b/accounts/ja/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/ja
+@@ -337,8 +318,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/nb/Makefile.in b/accounts/nb/Makefile.in
+index 13fb357..d6abd66 100644
+--- a/accounts/nb/Makefile.in
++++ b/accounts/nb/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/nb
+@@ -339,8 +320,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/nl/Makefile.in b/accounts/nl/Makefile.in
+index a1ed440..f4bd3fa 100644
+--- a/accounts/nl/Makefile.in
++++ b/accounts/nl/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/nl
+@@ -322,8 +303,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/pt_BR/Makefile.in b/accounts/pt_BR/Makefile.in
+index 2ef9340..aa5bc98 100644
+--- a/accounts/pt_BR/Makefile.in
++++ b/accounts/pt_BR/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/pt_BR
+@@ -336,8 +317,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/pt_PT/Makefile.in b/accounts/pt_PT/Makefile.in
+index 0ab9196..e6d329c 100644
+--- a/accounts/pt_PT/Makefile.in
++++ b/accounts/pt_PT/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/pt_PT
+@@ -335,8 +316,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/ru/Makefile.in b/accounts/ru/Makefile.in
+index 071c3ed..5120f84 100644
+--- a/accounts/ru/Makefile.in
++++ b/accounts/ru/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/ru
+@@ -325,8 +306,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/sk/Makefile.in b/accounts/sk/Makefile.in
+index 58a578d..9c3331c 100644
+--- a/accounts/sk/Makefile.in
++++ b/accounts/sk/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/sk
+@@ -336,8 +317,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/tr_TR/Makefile.in b/accounts/tr_TR/Makefile.in
+index 169a6e4..aa0e4c6 100644
+--- a/accounts/tr_TR/Makefile.in
++++ b/accounts/tr_TR/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/tr_TR
+@@ -329,8 +310,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/accounts/zh_CN/Makefile.in b/accounts/zh_CN/Makefile.in
+index ba85312..e455cb7 100644
+--- a/accounts/zh_CN/Makefile.in
++++ b/accounts/zh_CN/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ accountdir = ${GNC_ACCOUNTS_DIR}/zh_CN
+@@ -338,8 +319,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/aclocal.m4 b/aclocal.m4
+index 049708b..28b2b52 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
++# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+@@ -13,12 +13,864 @@
+
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+-[m4_warning([this file was generated for autoconf 2.63.
++m4_if(AC_AUTOCONF_VERSION, [2.61],,
++[m4_warning([this file was generated for autoconf 2.61.
+ You have another version of autoconf. It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
++# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_AUTOMAKE_VERSION(VERSION)
++# ----------------------------
++# Automake X.Y traces this macro to ensure aclocal.m4 has been
++# generated from the m4 files accompanying Automake X.Y.
++# (This private macro should not be called outside this file.)
++AC_DEFUN([AM_AUTOMAKE_VERSION],
++[am__api_version='1.10'
++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
++dnl require some minimum version. Point them to the right macro.
++m4_if([$1], [1.10.1], [],
++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
++])
++
++# _AM_AUTOCONF_VERSION(VERSION)
++# -----------------------------
++# aclocal traces this macro to find the Autoconf version.
++# This is a private macro too. Using m4_define simplifies
++# the logic in aclocal, which can simply ignore this definition.
++m4_define([_AM_AUTOCONF_VERSION], [])
++
++# AM_SET_CURRENT_AUTOMAKE_VERSION
++# -------------------------------
++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
++[AM_AUTOMAKE_VERSION([1.10.1])dnl
++m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
++
++# AM_AUX_DIR_EXPAND -*- Autoconf -*-
++
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
++# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
++#
++# Of course, Automake must honor this variable whenever it calls a
++# tool from the auxiliary directory. The problem is that $srcdir (and
++# therefore $ac_aux_dir as well) can be either absolute or relative,
++# depending on how configure is run. This is pretty annoying, since
++# it makes $ac_aux_dir quite unusable in subdirectories: in the top
++# source directory, any form will work fine, but in subdirectories a
++# relative path needs to be adjusted first.
++#
++# $ac_aux_dir/missing
++# fails when called from a subdirectory if $ac_aux_dir is relative
++# $top_srcdir/$ac_aux_dir/missing
++# fails if $ac_aux_dir is absolute,
++# fails when called from a subdirectory in a VPATH build with
++# a relative $ac_aux_dir
++#
++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
++# are both prefixed by $srcdir. In an in-source build this is usually
++# harmless because $srcdir is `.', but things will broke when you
++# start a VPATH build or use an absolute $srcdir.
++#
++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
++# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
++# and then we would define $MISSING as
++# MISSING="\${SHELL} $am_aux_dir/missing"
++# This will work as long as MISSING is not called from configure, because
++# unfortunately $(top_srcdir) has no meaning in configure.
++# However there are other variables, like CC, which are often used in
++# configure, and could therefore not use this "fixed" $ac_aux_dir.
++#
++# Another solution, used here, is to always expand $ac_aux_dir to an
++# absolute PATH. The drawback is that using absolute paths prevent a
++# configured tree to be moved without reconfiguration.
++
++AC_DEFUN([AM_AUX_DIR_EXPAND],
++[dnl Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])dnl
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++])
++
++# AM_CONDITIONAL -*- Autoconf -*-
++
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 8
++
++# AM_CONDITIONAL(NAME, SHELL-CONDITION)
++# -------------------------------------
++# Define a conditional.
++AC_DEFUN([AM_CONDITIONAL],
++[AC_PREREQ(2.52)dnl
++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
++AC_SUBST([$1_TRUE])dnl
++AC_SUBST([$1_FALSE])dnl
++_AM_SUBST_NOTMAKE([$1_TRUE])dnl
++_AM_SUBST_NOTMAKE([$1_FALSE])dnl
++if $2; then
++ $1_TRUE=
++ $1_FALSE='#'
++else
++ $1_TRUE='#'
++ $1_FALSE=
++fi
++AC_CONFIG_COMMANDS_PRE(
++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
++ AC_MSG_ERROR([[conditional "$1" was never defined.
++Usually this means the macro was only invoked conditionally.]])
++fi])])
++
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 9
++
++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
++# written in clear, in which case automake, when reading aclocal.m4,
++# will think it sees a *use*, and therefore will trigger all it's
++# C support machinery. Also note that it means that autoscan, seeing
++# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
++
++
++# _AM_DEPENDENCIES(NAME)
++# ----------------------
++# See how the compiler implements dependency checking.
++# NAME is "CC", "CXX", "GCJ", or "OBJC".
++# We try a few techniques and use that to set a single cache variable.
++#
++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
++# dependency, and given that the user is not expected to run this macro,
++# just rely on AC_PROG_CC.
++AC_DEFUN([_AM_DEPENDENCIES],
++[AC_REQUIRE([AM_SET_DEPDIR])dnl
++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
++AC_REQUIRE([AM_MAKE_INCLUDE])dnl
++AC_REQUIRE([AM_DEP_TRACK])dnl
++
++ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
++ [$1], CXX, [depcc="$CXX" am_compiler_list=],
++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++ [$1], UPC, [depcc="$UPC" am_compiler_list=],
++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
++ [depcc="$$1" am_compiler_list=])
++
++AC_CACHE_CHECK([dependency style of $depcc],
++ [am_cv_$1_dependencies_compiler_type],
++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++ # We make a subdir and do the tests there. Otherwise we can end up
++ # making bogus files that we don't know about and never remove. For
++ # instance it was reported that on HP-UX the gcc test will end up
++ # making a dummy file named `D' -- because `-MD' means `put the output
++ # in D'.
++ mkdir conftest.dir
++ # Copy depcomp to subdir because otherwise we won't find it if we're
++ # using a relative directory.
++ cp "$am_depcomp" conftest.dir
++ cd conftest.dir
++ # We will build objects and dependencies in a subdirectory because
++ # it helps to detect inapplicable dependency modes. For instance
++ # both Tru64's cc and ICC support -MD to output dependencies as a
++ # side effect of compilation, but ICC will put the dependencies in
++ # the current directory while Tru64 will put them in the object
++ # directory.
++ mkdir sub
++
++ am_cv_$1_dependencies_compiler_type=none
++ if test "$am_compiler_list" = ""; then
++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
++ fi
++ for depmode in $am_compiler_list; do
++ # Setup a source with many dependencies, because some compilers
++ # like to wrap large dependency lists on column 80 (with \), and
++ # we should not choose a depcomp mode which is confused by this.
++ #
++ # We need to recreate these files for each test, as the compiler may
++ # overwrite some of them when testing with obscure command lines.
++ # This happens at least with the AIX C compiler.
++ : > sub/conftest.c
++ for i in 1 2 3 4 5 6; do
++ echo '#include "conftst'$i'.h"' >> sub/conftest.c
++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++ # Solaris 8's {/usr,}/bin/sh.
++ touch sub/conftst$i.h
++ done
++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++
++ case $depmode in
++ nosideeffect)
++ # after this tag, mechanisms are not by side-effect, so they'll
++ # only be used when explicitly requested
++ if test "x$enable_dependency_tracking" = xyes; then
++ continue
++ else
++ break
++ fi
++ ;;
++ none) break ;;
++ esac
++ # We check with `-c' and `-o' for the sake of the "dashmstdout"
++ # mode. It turns out that the SunPro C++ compiler does not properly
++ # handle `-M -o', and we need to detect this.
++ if depmode=$depmode \
++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++ >/dev/null 2>conftest.err &&
++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++ # icc doesn't choke on unknown options, it will just issue warnings
++ # or remarks (even with -Werror). So we grep stderr for any message
++ # that says an option was ignored or not supported.
++ # When given -MP, icc 7.0 and 7.1 complain thusly:
++ # icc: Command line warning: ignoring option '-M'; no argument required
++ # The diagnosis changed in icc 8.0:
++ # icc: Command line remark: option '-MP' not supported
++ if (grep 'ignoring option' conftest.err ||
++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++ am_cv_$1_dependencies_compiler_type=$depmode
++ break
++ fi
++ fi
++ done
++
++ cd ..
++ rm -rf conftest.dir
++else
++ am_cv_$1_dependencies_compiler_type=none
++fi
++])
++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
++AM_CONDITIONAL([am__fastdep$1], [
++ test "x$enable_dependency_tracking" != xno \
++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
++])
++
++
++# AM_SET_DEPDIR
++# -------------
++# Choose a directory name for dependency files.
++# This macro is AC_REQUIREd in _AM_DEPENDENCIES
++AC_DEFUN([AM_SET_DEPDIR],
++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
++])
++
++
++# AM_DEP_TRACK
++# ------------
++AC_DEFUN([AM_DEP_TRACK],
++[AC_ARG_ENABLE(dependency-tracking,
++[ --disable-dependency-tracking speeds up one-time build
++ --enable-dependency-tracking do not reject slow dependency extractors])
++if test "x$enable_dependency_tracking" != xno; then
++ am_depcomp="$ac_aux_dir/depcomp"
++ AMDEPBACKSLASH='\'
++fi
++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
++AC_SUBST([AMDEPBACKSLASH])dnl
++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
++])
++
++# Generate code to set up dependency tracking. -*- Autoconf -*-
++
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++#serial 3
++
++# _AM_OUTPUT_DEPENDENCY_COMMANDS
++# ------------------------------
++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
++[for mf in $CONFIG_FILES; do
++ # Strip MF so we end up with the name of the file.
++ mf=`echo "$mf" | sed -e 's/:.*$//'`
++ # Check whether this is an Automake generated Makefile or not.
++ # We used to match only the files named `Makefile.in', but
++ # some people rename them; so instead we look at the file content.
++ # Grep'ing the first line is not enough: some people post-process
++ # each Makefile.in and add a new line on top of each file to say so.
++ # Grep'ing the whole file is not good either: AIX grep has a line
++ # limit of 2048, but all sed's we know have understand at least 4000.
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++ dirpart=`AS_DIRNAME("$mf")`
++ else
++ continue
++ fi
++ # Extract the definition of DEPDIR, am__include, and am__quote
++ # from the Makefile without running `make'.
++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++ test -z "$DEPDIR" && continue
++ am__include=`sed -n 's/^am__include = //p' < "$mf"`
++ test -z "am__include" && continue
++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++ # When using ansi2knr, U may be empty or an underscore; expand it
++ U=`sed -n 's/^U = //p' < "$mf"`
++ # Find all dependency output files, they are included files with
++ # $(DEPDIR) in their names. We invoke sed twice because it is the
++ # simplest approach to changing $(DEPDIR) to its actual value in the
++ # expansion.
++ for file in `sed -n "
++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++ # Make sure the directory exists.
++ test -f "$dirpart/$file" && continue
++ fdir=`AS_DIRNAME(["$file"])`
++ AS_MKDIR_P([$dirpart/$fdir])
++ # echo "creating $dirpart/$file"
++ echo '# dummy' > "$dirpart/$file"
++ done
++done
++])# _AM_OUTPUT_DEPENDENCY_COMMANDS
++
++
++# AM_OUTPUT_DEPENDENCY_COMMANDS
++# -----------------------------
++# This macro should only be invoked once -- use via AC_REQUIRE.
++#
++# This code is only required when automatic dependency tracking
++# is enabled. FIXME. This creates each `.P' file that we will
++# need in order to bootstrap the dependency handling code.
++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
++[AC_CONFIG_COMMANDS([depfiles],
++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
++])
++
++# Do all the work for Automake. -*- Autoconf -*-
++
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005, 2006, 2008 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 13
++
++# This macro actually does too much. Some checks are only needed if
++# your package does certain things. But this isn't really a big deal.
++
++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
++# AM_INIT_AUTOMAKE([OPTIONS])
++# -----------------------------------------------
++# The call with PACKAGE and VERSION arguments is the old style
++# call (pre autoconf-2.50), which is being phased out. PACKAGE
++# and VERSION should now be passed to AC_INIT and removed from
++# the call to AM_INIT_AUTOMAKE.
++# We support both call styles for the transition. After
++# the next Automake release, Autoconf can make the AC_INIT
++# arguments mandatory, and then we can depend on a new Autoconf
++# release and drop the old call support.
++AC_DEFUN([AM_INIT_AUTOMAKE],
++[AC_PREREQ([2.60])dnl
++dnl Autoconf wants to disallow AM_ names. We explicitly allow
++dnl the ones we care about.
++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
++AC_REQUIRE([AC_PROG_INSTALL])dnl
++if test "`cd $srcdir && pwd`" != "`pwd`"; then
++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
++ # is not polluted with repeated "-I."
++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
++ # test to see if srcdir already configured
++ if test -f $srcdir/config.status; then
++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++ fi
++fi
++
++# test whether we have cygpath
++if test -z "$CYGPATH_W"; then
++ if (cygpath --version) >/dev/null 2>/dev/null; then
++ CYGPATH_W='cygpath -w'
++ else
++ CYGPATH_W=echo
++ fi
++fi
++AC_SUBST([CYGPATH_W])
++
++# Define the identity of the package.
++dnl Distinguish between old-style and new-style calls.
++m4_ifval([$2],
++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
++ AC_SUBST([PACKAGE], [$1])dnl
++ AC_SUBST([VERSION], [$2])],
++[_AM_SET_OPTIONS([$1])dnl
++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
++
++_AM_IF_OPTION([no-define],,
++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++
++# Some tools Automake needs.
++AC_REQUIRE([AM_SANITY_CHECK])dnl
++AC_REQUIRE([AC_ARG_PROGRAM])dnl
++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
++AM_MISSING_PROG(AUTOCONF, autoconf)
++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
++AM_MISSING_PROG(AUTOHEADER, autoheader)
++AM_MISSING_PROG(MAKEINFO, makeinfo)
++AM_PROG_INSTALL_SH
++AM_PROG_INSTALL_STRIP
++AC_REQUIRE([AM_PROG_MKDIR_P])dnl
++# We need awk for the "check" target. The system "awk" is bad on
++# some platforms.
++AC_REQUIRE([AC_PROG_AWK])dnl
++AC_REQUIRE([AC_PROG_MAKE_SET])dnl
++AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
++ [_AM_PROG_TAR([v7])])])
++_AM_IF_OPTION([no-dependencies],,
++[AC_PROVIDE_IFELSE([AC_PROG_CC],
++ [_AM_DEPENDENCIES(CC)],
++ [define([AC_PROG_CC],
++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_CXX],
++ [_AM_DEPENDENCIES(CXX)],
++ [define([AC_PROG_CXX],
++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_OBJC],
++ [_AM_DEPENDENCIES(OBJC)],
++ [define([AC_PROG_OBJC],
++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
++])
++])
++
++
++# When config.status generates a header, we must update the stamp-h file.
++# This file resides in the same directory as the config header
++# that is generated. The stamp files are numbered to have different names.
++
++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
++# loop where config.status creates the headers, so we can generate
++# our stamp files there.
++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
++[# Compute $1's index in $config_headers.
++_am_arg=$1
++_am_stamp_count=1
++for _am_header in $config_headers :; do
++ case $_am_header in
++ $_am_arg | $_am_arg:* )
++ break ;;
++ * )
++ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++ esac
++done
++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
++
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_PROG_INSTALL_SH
++# ------------------
++# Define $install_sh.
++AC_DEFUN([AM_PROG_INSTALL_SH],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
++AC_SUBST(install_sh)])
++
++# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 2
++
++# Check whether the underlying file-system supports filenames
++# with a leading dot. For instance MS-DOS doesn't.
++AC_DEFUN([AM_SET_LEADING_DOT],
++[rm -rf .tst 2>/dev/null
++mkdir .tst 2>/dev/null
++if test -d .tst; then
++ am__leading_dot=.
++else
++ am__leading_dot=_
++fi
++rmdir .tst 2>/dev/null
++AC_SUBST([am__leading_dot])])
++
++# Check to see how 'make' treats includes. -*- Autoconf -*-
++
++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 3
++
++# AM_MAKE_INCLUDE()
++# -----------------
++# Check to see how make treats includes.
++AC_DEFUN([AM_MAKE_INCLUDE],
++[am_make=${MAKE-make}
++cat > confinc << 'END'
++am__doit:
++ @echo done
++.PHONY: am__doit
++END
++# If we don't find an include directive, just comment out the code.
++AC_MSG_CHECKING([for style of include used by $am_make])
++am__include="#"
++am__quote=
++_am_result=none
++# First try GNU make style include.
++echo "include confinc" > confmf
++# We grep out `Entering directory' and `Leaving directory'
++# messages which can occur if `w' ends up in MAKEFLAGS.
++# In particular we don't look at `^make:' because GNU make might
++# be invoked under some other name (usually "gmake"), in which
++# case it prints its new name instead of `make'.
++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
++ am__include=include
++ am__quote=
++ _am_result=GNU
++fi
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++ echo '.include "confinc"' > confmf
++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
++ am__include=.include
++ am__quote="\""
++ _am_result=BSD
++ fi
++fi
++AC_SUBST([am__include])
++AC_SUBST([am__quote])
++AC_MSG_RESULT([$_am_result])
++rm -f confinc confmf
++])
++
++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
++
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 5
++
++# AM_MISSING_PROG(NAME, PROGRAM)
++# ------------------------------
++AC_DEFUN([AM_MISSING_PROG],
++[AC_REQUIRE([AM_MISSING_HAS_RUN])
++$1=${$1-"${am_missing_run}$2"}
++AC_SUBST($1)])
++
++
++# AM_MISSING_HAS_RUN
++# ------------------
++# Define MISSING if not defined so far and test if it supports --run.
++# If it does, set am_missing_run to use it, otherwise, to nothing.
++AC_DEFUN([AM_MISSING_HAS_RUN],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++AC_REQUIRE_AUX_FILE([missing])dnl
++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++ am_missing_run="$MISSING --run "
++else
++ am_missing_run=
++ AC_MSG_WARN([`missing' script is too old or missing])
++fi
++])
++
++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_PROG_MKDIR_P
++# ---------------
++# Check for `mkdir -p'.
++AC_DEFUN([AM_PROG_MKDIR_P],
++[AC_PREREQ([2.60])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
++dnl while keeping a definition of mkdir_p for backward compatibility.
++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
++dnl Makefile.ins that do not define MKDIR_P, so we do our own
++dnl adjustment using top_builddir (which is defined more often than
++dnl MKDIR_P).
++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
++case $mkdir_p in
++ [[\\/$]]* | ?:[[\\/]]*) ;;
++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
++])
++
++# Helper functions for option handling. -*- Autoconf -*-
++
++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 3
++
++# _AM_MANGLE_OPTION(NAME)
++# -----------------------
++AC_DEFUN([_AM_MANGLE_OPTION],
++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++
++# _AM_SET_OPTION(NAME)
++# ------------------------------
++# Set option NAME. Presently that only means defining a flag for this option.
++AC_DEFUN([_AM_SET_OPTION],
++[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++
++# _AM_SET_OPTIONS(OPTIONS)
++# ----------------------------------
++# OPTIONS is a space-separated list of Automake options.
++AC_DEFUN([_AM_SET_OPTIONS],
++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++
++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
++# -------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++AC_DEFUN([_AM_IF_OPTION],
++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
++
++# Check to make sure that the build environment is sane. -*- Autoconf -*-
++
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 4
++
++# AM_SANITY_CHECK
++# ---------------
++AC_DEFUN([AM_SANITY_CHECK],
++[AC_MSG_CHECKING([whether build environment is sane])
++# Just in case
++sleep 1
++echo timestamp > conftest.file
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments. Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++ if test "$[*]" = "X"; then
++ # -L didn't work.
++ set X `ls -t $srcdir/configure conftest.file`
++ fi
++ rm -f conftest.file
++ if test "$[*]" != "X $srcdir/configure conftest.file" \
++ && test "$[*]" != "X conftest.file $srcdir/configure"; then
++
++ # If neither matched, then we have a broken ls. This can happen
++ # if, for instance, CONFIG_SHELL is bash and it inherits a
++ # broken ls alias from the environment. This has actually
++ # happened. Such a system could not be considered "sane".
++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
++alias in your environment])
++ fi
++
++ test "$[2]" = conftest.file
++ )
++then
++ # Ok.
++ :
++else
++ AC_MSG_ERROR([newly created file is older than distributed files!
++Check your system clock])
++fi
++AC_MSG_RESULT(yes)])
++
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_PROG_INSTALL_STRIP
++# ---------------------
++# One issue with vendor `install' (even GNU) is that you can't
++# specify the program used to strip binaries. This is especially
++# annoying in cross-compiling environments, where the build's strip
++# is unlikely to handle the host's binaries.
++# Fortunately install-sh will honor a STRIPPROG variable, so we
++# always use install-sh in `make install-strip', and initialize
++# STRIPPROG with the value of the STRIP variable (set by the user).
++AC_DEFUN([AM_PROG_INSTALL_STRIP],
++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'. However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
++if test "$cross_compiling" != no; then
++ AC_CHECK_TOOL([STRIP], [strip], :)
++fi
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++AC_SUBST([INSTALL_STRIP_PROGRAM])])
++
++# Copyright (C) 2006 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# _AM_SUBST_NOTMAKE(VARIABLE)
++# ---------------------------
++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
++# This macro is traced by Automake.
++AC_DEFUN([_AM_SUBST_NOTMAKE])
++
++# Check how to create a tarball. -*- Autoconf -*-
++
++# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 2
++
++# _AM_PROG_TAR(FORMAT)
++# --------------------
++# Check how to create a tarball in format FORMAT.
++# FORMAT should be one of `v7', `ustar', or `pax'.
++#
++# Substitute a variable $(am__tar) that is a command
++# writing to stdout a FORMAT-tarball containing the directory
++# $tardir.
++# tardir=directory && $(am__tar) > result.tar
++#
++# Substitute a variable $(am__untar) that extract such
++# a tarball read from stdin.
++# $(am__untar) < result.tar
++AC_DEFUN([_AM_PROG_TAR],
++[# Always define AMTAR for backward compatibility.
++AM_MISSING_PROG([AMTAR], [tar])
++m4_if([$1], [v7],
++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
++ [m4_case([$1], [ustar],, [pax],,
++ [m4_fatal([Unknown tar format])])
++AC_MSG_CHECKING([how to create a $1 tar archive])
++# Loop over all known methods to create a tar archive until one works.
++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
++_am_tools=${am_cv_prog_tar_$1-$_am_tools}
++# Do not fold the above two line into one, because Tru64 sh and
++# Solaris sh will not grok spaces in the rhs of `-'.
++for _am_tool in $_am_tools
++do
++ case $_am_tool in
++ gnutar)
++ for _am_tar in tar gnutar gtar;
++ do
++ AM_RUN_LOG([$_am_tar --version]) && break
++ done
++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
++ am__untar="$_am_tar -xf -"
++ ;;
++ plaintar)
++ # Must skip GNU tar: if it does not support --format= it doesn't create
++ # ustar tarball either.
++ (tar --version) >/dev/null 2>&1 && continue
++ am__tar='tar chf - "$$tardir"'
++ am__tar_='tar chf - "$tardir"'
++ am__untar='tar xf -'
++ ;;
++ pax)
++ am__tar='pax -L -x $1 -w "$$tardir"'
++ am__tar_='pax -L -x $1 -w "$tardir"'
++ am__untar='pax -r'
++ ;;
++ cpio)
++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
++ am__untar='cpio -i -H $1 -d'
++ ;;
++ none)
++ am__tar=false
++ am__tar_=false
++ am__untar=false
++ ;;
++ esac
++
++ # If the value was cached, stop now. We just wanted to have am__tar
++ # and am__untar set.
++ test -n "${am_cv_prog_tar_$1}" && break
++
++ # tar/untar a dummy directory, and stop if the command works
++ rm -rf conftest.dir
++ mkdir conftest.dir
++ echo GrepMe > conftest.dir/file
++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
++ rm -rf conftest.dir
++ if test -s conftest.tar; then
++ AM_RUN_LOG([$am__untar <conftest.tar])
++ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
++ fi
++done
++rm -rf conftest.dir
++
++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
++AC_MSG_RESULT([$am_cv_prog_tar_$1])])
++AC_SUBST([am__tar])
++AC_SUBST([am__untar])
++]) # _AM_PROG_TAR
++
++m4_include([macros/ac_pkg_swig.m4])
++m4_include([macros/as-scrub-include.m4])
++m4_include([macros/binreloc.m4])
++m4_include([macros/gnome-guile-checks.m4])
++m4_include([macros/legacy_macros.m4])
+ dnl AM_GCONF_SOURCE_2
+ dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
+ dnl (i.e. pass to gconftool-2
+@@ -34,8 +886,10 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
+ fi
+
+- AC_ARG_WITH(gconf-source,
+- [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
++ AC_ARG_WITH([gconf-source],
++ AC_HELP_STRING([--with-gconf-source=sourceaddress],
++ [Config database for installing schema files.]),
++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
+
+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+@@ -44,8 +898,10 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+ fi
+
+- AC_ARG_WITH(gconf-schema-file-dir,
+- [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
++ AC_ARG_WITH([gconf-schema-file-dir],
++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++ [Directory for installing schema files.]),
++ [GCONF_SCHEMA_FILE_DIR="$withval"],)
+
+ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+@@ -154,8 +1010,9 @@ main ()
+ {
+ int major, minor, micro;
+ char *tmp_version;
++ int ignored;
+
+- system ("touch conf.glibtest");
++ ignored = system ("touch conf.glibtest");
+
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
+ tmp_version = g_strdup("$min_glib_version");
+@@ -704,6 +1561,148 @@ sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+ fi])
+
+
++dnl GNOME_COMPILE_WARNINGS
++dnl Turn on many useful compiler warnings
++dnl For now, only works on GCC
++AC_DEFUN([GNOME_COMPILE_WARNINGS],[
++ dnl ******************************
++ dnl More compiler warnings
++ dnl ******************************
++
++ AC_ARG_ENABLE(compile-warnings,
++ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
++ [Turn on compiler warnings]),,
++ [enable_compile_warnings="m4_default([$1],[yes])"])
++
++ warnCFLAGS=
++ if test "x$GCC" != xyes; then
++ enable_compile_warnings=no
++ fi
++
++ warning_flags=
++ realsave_CFLAGS="$CFLAGS"
++
++ case "$enable_compile_warnings" in
++ no)
++ warning_flags=
++ ;;
++ minimum)
++ warning_flags="-Wall"
++ ;;
++ yes)
++ warning_flags="-Wall -Wmissing-prototypes"
++ ;;
++ maximum|error)
++ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
++ CFLAGS="$warning_flags $CFLAGS"
++ for option in -Wno-sign-compare; do
++ SAVE_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS $option"
++ AC_MSG_CHECKING([whether gcc understands $option])
++ AC_TRY_COMPILE([], [],
++ has_option=yes,
++ has_option=no,)
++ CFLAGS="$SAVE_CFLAGS"
++ AC_MSG_RESULT($has_option)
++ if test $has_option = yes; then
++ warning_flags="$warning_flags $option"
++ fi
++ unset has_option
++ unset SAVE_CFLAGS
++ done
++ unset option
++ if test "$enable_compile_warnings" = "error" ; then
++ warning_flags="$warning_flags -Werror"
++ fi
++ ;;
++ *)
++ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
++ ;;
++ esac
++ CFLAGS="$realsave_CFLAGS"
++ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
++ AC_MSG_RESULT($warning_flags)
++
++ AC_ARG_ENABLE(iso-c,
++ AC_HELP_STRING([--enable-iso-c],
++ [Try to warn if code is not ISO C ]),,
++ [enable_iso_c=no])
++
++ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
++ complCFLAGS=
++ if test "x$enable_iso_c" != "xno"; then
++ if test "x$GCC" = "xyes"; then
++ case " $CFLAGS " in
++ *[\ \ ]-ansi[\ \ ]*) ;;
++ *) complCFLAGS="$complCFLAGS -ansi" ;;
++ esac
++ case " $CFLAGS " in
++ *[\ \ ]-pedantic[\ \ ]*) ;;
++ *) complCFLAGS="$complCFLAGS -pedantic" ;;
++ esac
++ fi
++ fi
++ AC_MSG_RESULT($complCFLAGS)
++
++ WARN_CFLAGS="$warning_flags $complCFLAGS"
++ AC_SUBST(WARN_CFLAGS)
++])
++
++dnl For C++, do basically the same thing.
++
++AC_DEFUN([GNOME_CXX_WARNINGS],[
++ AC_ARG_ENABLE(cxx-warnings,
++ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
++ [Turn on compiler warnings.]),,
++ [enable_cxx_warnings="m4_default([$1],[minimum])"])
++
++ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
++ warnCXXFLAGS=
++ if test "x$GXX" != xyes; then
++ enable_cxx_warnings=no
++ fi
++ if test "x$enable_cxx_warnings" != "xno"; then
++ if test "x$GXX" = "xyes"; then
++ case " $CXXFLAGS " in
++ *[\ \ ]-Wall[\ \ ]*) ;;
++ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
++ esac
++
++ ## -W is not all that useful. And it cannot be controlled
++ ## with individual -Wno-xxx flags, unlike -Wall
++ if test "x$enable_cxx_warnings" = "xyes"; then
++ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
++ fi
++ fi
++ fi
++ AC_MSG_RESULT($warnCXXFLAGS)
++
++ AC_ARG_ENABLE(iso-cxx,
++ AC_HELP_STRING([--enable-iso-cxx],
++ [Try to warn if code is not ISO C++ ]),,
++ [enable_iso_cxx=no])
++
++ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
++ complCXXFLAGS=
++ if test "x$enable_iso_cxx" != "xno"; then
++ if test "x$GXX" = "xyes"; then
++ case " $CXXFLAGS " in
++ *[\ \ ]-ansi[\ \ ]*) ;;
++ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
++ esac
++
++ case " $CXXFLAGS " in
++ *[\ \ ]-pedantic[\ \ ]*) ;;
++ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
++ esac
++ fi
++ fi
++ AC_MSG_RESULT($complCXXFLAGS)
++
++ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
++ AC_SUBST(WARN_CXXFLAGS)
++])
++
+
+
+
+@@ -869,9 +1868,10 @@ AC_DEFUN([GUILE_MODULE_REQUIRED_EXPORT],
+
+
+ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+-# serial 36 IT_PROG_INTLTOOL
+-AC_DEFUN([IT_PROG_INTLTOOL],
+-[AC_PREREQ([2.50])dnl
++# serial 40 IT_PROG_INTLTOOL
++AC_DEFUN([IT_PROG_INTLTOOL], [
++AC_PREREQ([2.50])dnl
++AC_REQUIRE([AM_NLS])dnl
+
+ case "$am__api_version" in
+ 1.[01234])
+@@ -885,14 +1885,21 @@ if test -n "$1"; then
+ AC_MSG_CHECKING([for intltool >= $1])
+
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
++ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
++ [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ ]
+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
+ fi
+
++AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
++AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
++AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
++if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
++ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
++fi
++
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+@@ -913,30 +1920,31 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+
+-AC_SUBST(INTLTOOL_DESKTOP_RULE)
+-AC_SUBST(INTLTOOL_DIRECTORY_RULE)
+-AC_SUBST(INTLTOOL_KEYS_RULE)
+-AC_SUBST(INTLTOOL_PROP_RULE)
+-AC_SUBST(INTLTOOL_OAF_RULE)
+-AC_SUBST(INTLTOOL_PONG_RULE)
+-AC_SUBST(INTLTOOL_SERVER_RULE)
+-AC_SUBST(INTLTOOL_SHEET_RULE)
+-AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
+-AC_SUBST(INTLTOOL_UI_RULE)
+-AC_SUBST(INTLTOOL_XAM_RULE)
+-AC_SUBST(INTLTOOL_KBD_RULE)
+-AC_SUBST(INTLTOOL_XML_RULE)
+-AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+-AC_SUBST(INTLTOOL_CAVES_RULE)
+-AC_SUBST(INTLTOOL_SCHEMAS_RULE)
+-AC_SUBST(INTLTOOL_THEME_RULE)
+-AC_SUBST(INTLTOOL_SERVICE_RULE)
+-AC_SUBST(INTLTOOL_POLICY_RULE)
++_IT_SUBST(INTLTOOL_DESKTOP_RULE)
++_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
++_IT_SUBST(INTLTOOL_KEYS_RULE)
++_IT_SUBST(INTLTOOL_PROP_RULE)
++_IT_SUBST(INTLTOOL_OAF_RULE)
++_IT_SUBST(INTLTOOL_PONG_RULE)
++_IT_SUBST(INTLTOOL_SERVER_RULE)
++_IT_SUBST(INTLTOOL_SHEET_RULE)
++_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
++_IT_SUBST(INTLTOOL_UI_RULE)
++_IT_SUBST(INTLTOOL_XAM_RULE)
++_IT_SUBST(INTLTOOL_KBD_RULE)
++_IT_SUBST(INTLTOOL_XML_RULE)
++_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
++_IT_SUBST(INTLTOOL_CAVES_RULE)
++_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
++_IT_SUBST(INTLTOOL_THEME_RULE)
++_IT_SUBST(INTLTOOL_SERVICE_RULE)
++_IT_SUBST(INTLTOOL_POLICY_RULE)
+
+ # Check the gettext tools to make sure they are GNU
+ AC_PATH_PROG(XGETTEXT, xgettext)
+ AC_PATH_PROG(MSGMERGE, msgmerge)
+ AC_PATH_PROG(MSGFMT, msgfmt)
++AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+ if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+ fi
+@@ -947,17 +1955,17 @@ if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+ fi
+
+-# Use the tools built into the package, not the ones that are installed.
+-AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
+-AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
+-AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
+-
+ AC_PATH_PROG(INTLTOOL_PERL, perl)
+ if test -z "$INTLTOOL_PERL"; then
+- AC_MSG_ERROR([perl not found; required for intltool])
++ AC_MSG_ERROR([perl not found])
+ fi
+-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+- AC_MSG_ERROR([perl 5.x required for intltool])
++AC_MSG_CHECKING([for perl >= 5.8.1])
++$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
++if test $? -ne 0; then
++ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
++else
++ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
++ AC_MSG_RESULT([$IT_PERL_VERSION])
+ fi
+ if test "x$2" != "xno-xml"; then
+ AC_MSG_CHECKING([for XML::Parser])
+@@ -998,42 +2006,6 @@ AC_SUBST(DATADIRNAME)
+
+ IT_PO_SUBDIR([po])
+
+-dnl The following is very similar to
+-dnl
+-dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
+-dnl
+-dnl with the following slight differences:
+-dnl - the *.in files are in ac_aux_dir,
+-dnl - if the file haven't changed upon reconfigure, it's not touched,
+-dnl - the evaluation of the third parameter enables a hack which computes
+-dnl the actual value of $libdir,
+-dnl - the user sees "executing intltool commands", instead of
+-dnl "creating intltool-extract" and such.
+-dnl
+-dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
+-dnl a reason for it.
+-
+-AC_CONFIG_COMMANDS([intltool], [
+-
+-for file in intltool-extract intltool-merge intltool-update; do
+- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
+- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+- < ${ac_aux_dir}/${file}.in > ${file}.out
+- if cmp -s ${file} ${file}.out 2>/dev/null; then
+- rm -f ${file}.out
+- else
+- mv -f ${file}.out ${file}
+- fi
+- chmod ugo+x ${file}
+- chmod u+w ${file}
+-done
+-
+-],
+-[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
+-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
+-
+ ])
+
+
+@@ -1049,6 +2021,9 @@ dnl The following CONFIG_COMMANDS should be exetuted at the very end
+ dnl of config.status.
+ AC_CONFIG_COMMANDS_PRE([
+ AC_CONFIG_COMMANDS([$1/stamp-it], [
++ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
++ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
++ fi
+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+ >"$1/stamp-it.tmp"
+ [sed '/^#/d
+@@ -1057,21 +2032,27 @@ AC_CONFIG_COMMANDS_PRE([
+ '"s|^| $ac_top_srcdir/|" \
+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+ ]
+- if test ! -f "$1/Makefile"; then
+- AC_MSG_ERROR([$1/Makefile is not ready.])
+- fi
+- mv "$1/Makefile" "$1/Makefile.tmp"
+ [sed '/^POTFILES =/,/[^\\]$/ {
+ /^POTFILES =/!d
+ r $1/POTFILES
+ }
+- ' "$1/Makefile.tmp" >"$1/Makefile"]
++ ' "$1/Makefile.in" >"$1/Makefile"]
+ rm -f "$1/Makefile.tmp"
+ mv "$1/stamp-it.tmp" "$1/stamp-it"
+ ])
+ ])dnl
+ ])
+
++# _IT_SUBST(VARIABLE)
++# -------------------
++# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
++#
++AC_DEFUN([_IT_SUBST],
++[
++AC_SUBST([$1])
++m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
++]
++)
+
+ # deprecated macros
+ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+@@ -1288,14 +2269,6 @@ AC_ARG_WITH([pic],
+ [pic_mode=default])
+ test -z "$pic_mode" && pic_mode=default
+
+-# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
+-#
+-# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
+-# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
+-# calls AC_LIBTOOL_CONFIG and creates libtool.
+-#
+-_LT_VERSION_CHECK
+-
+ # Use C for the default configuration in the libtool script
+ tagname=
+ AC_LIBTOOL_LANG_C_CONFIG
+@@ -1303,41 +2276,6 @@ _LT_AC_TAGCONFIG
+ ])# AC_LIBTOOL_SETUP
+
+
+-# _LT_VERSION_CHECK
+-# -----------------
+-AC_DEFUN([_LT_VERSION_CHECK],
+-[AC_MSG_CHECKING([for correct ltmain.sh version])
+-if test "x$ltmain" = "x" ; then
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR([
+-
+-*** @<:@Gentoo@:>@ sanity check failed! ***
+-*** \$ltmain is not defined, please check the patch for consistency! ***
+-])
+-fi
+-gentoo_lt_version="1.5.26"
+-gentoo_ltmain_version=`sed -n '/^[[ ]]*VERSION=/{s/^[[ ]]*VERSION=//;p;q;}' "$ltmain"`
+-if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR([
+-
+-*** @<:@Gentoo@:>@ sanity check failed! ***
+-*** libtool.m4 and ltmain.sh have a version mismatch! ***
+-*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
+-
+-Please run:
+-
+- libtoolize --copy --force
+-
+-if appropriate, please contact the maintainer of this
+-package (or your distribution) for help.
+-])
+-else
+- AC_MSG_RESULT(yes)
+-fi
+-])# _LT_VERSION_CHECK
+-
+-
+ # _LT_AC_SYS_COMPILER
+ # -------------------
+ AC_DEFUN([_LT_AC_SYS_COMPILER],
+@@ -1748,6 +2686,7 @@ s390*-*linux*|sparc*-*linux*)
+ esac
+ ;;
+ *64-bit*)
++ libsuff=64
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+@@ -2653,14 +3592,7 @@ freebsd* | dragonfly*)
+ *) objformat=elf ;;
+ esac
+ fi
+- # Handle Gentoo/FreeBSD as it was Linux
+- case $host_vendor in
+- gentoo)
+- version_type=linux ;;
+- *)
+- version_type=freebsd-$objformat ;;
+- esac
+-
++ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+@@ -2671,12 +3603,6 @@ freebsd* | dragonfly*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
+ ;;
+- linux)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- need_lib_prefix=no
+- need_version=no
+- ;;
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+@@ -2823,11 +3749,13 @@ linux* | k*bsd*-gnu)
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -7771,6 +8699,38 @@ AC_SUBST([SED])
+ AC_MSG_RESULT([$SED])
+ ])
+
++# nls.m4 serial 3 (gettext-0.15)
++dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++dnl
++dnl This file can can be used in projects which are not available under
++dnl the GNU General Public License or the GNU Library General Public
++dnl License but which still want to provide support for the GNU gettext
++dnl functionality.
++dnl Please note that the actual code of the GNU gettext library is covered
++dnl by the GNU Library General Public License, and the rest of the GNU
++dnl gettext package package is covered by the GNU General Public License.
++dnl They are *not* in the public domain.
++
++dnl Authors:
++dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
++dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
++
++AC_PREREQ(2.50)
++
++AC_DEFUN([AM_NLS],
++[
++ AC_MSG_CHECKING([whether NLS is requested])
++ dnl Default is enabled NLS
++ AC_ARG_ENABLE(nls,
++ [ --disable-nls do not use Native Language Support],
++ USE_NLS=$enableval, USE_NLS=yes)
++ AC_MSG_RESULT($USE_NLS)
++ AC_SUBST(USE_NLS)
++])
++
+ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+ #
+ # Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+@@ -7927,866 +8887,3 @@ else
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+
+-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# AM_AUTOMAKE_VERSION(VERSION)
+-# ----------------------------
+-# Automake X.Y traces this macro to ensure aclocal.m4 has been
+-# generated from the m4 files accompanying Automake X.Y.
+-# (This private macro should not be called outside this file.)
+-AC_DEFUN([AM_AUTOMAKE_VERSION],
+-[am__api_version='1.10'
+-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+-dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.10.2], [],
+- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+-])
+-
+-# _AM_AUTOCONF_VERSION(VERSION)
+-# -----------------------------
+-# aclocal traces this macro to find the Autoconf version.
+-# This is a private macro too. Using m4_define simplifies
+-# the logic in aclocal, which can simply ignore this definition.
+-m4_define([_AM_AUTOCONF_VERSION], [])
+-
+-# AM_SET_CURRENT_AUTOMAKE_VERSION
+-# -------------------------------
+-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.10.2])dnl
+-m4_ifndef([AC_AUTOCONF_VERSION],
+- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+-
+-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+-
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+-#
+-# Of course, Automake must honor this variable whenever it calls a
+-# tool from the auxiliary directory. The problem is that $srcdir (and
+-# therefore $ac_aux_dir as well) can be either absolute or relative,
+-# depending on how configure is run. This is pretty annoying, since
+-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+-# source directory, any form will work fine, but in subdirectories a
+-# relative path needs to be adjusted first.
+-#
+-# $ac_aux_dir/missing
+-# fails when called from a subdirectory if $ac_aux_dir is relative
+-# $top_srcdir/$ac_aux_dir/missing
+-# fails if $ac_aux_dir is absolute,
+-# fails when called from a subdirectory in a VPATH build with
+-# a relative $ac_aux_dir
+-#
+-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+-# are both prefixed by $srcdir. In an in-source build this is usually
+-# harmless because $srcdir is `.', but things will broke when you
+-# start a VPATH build or use an absolute $srcdir.
+-#
+-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+-# and then we would define $MISSING as
+-# MISSING="\${SHELL} $am_aux_dir/missing"
+-# This will work as long as MISSING is not called from configure, because
+-# unfortunately $(top_srcdir) has no meaning in configure.
+-# However there are other variables, like CC, which are often used in
+-# configure, and could therefore not use this "fixed" $ac_aux_dir.
+-#
+-# Another solution, used here, is to always expand $ac_aux_dir to an
+-# absolute PATH. The drawback is that using absolute paths prevent a
+-# configured tree to be moved without reconfiguration.
+-
+-AC_DEFUN([AM_AUX_DIR_EXPAND],
+-[dnl Rely on autoconf to set up CDPATH properly.
+-AC_PREREQ([2.50])dnl
+-# expand $ac_aux_dir to an absolute path
+-am_aux_dir=`cd $ac_aux_dir && pwd`
+-])
+-
+-# AM_CONDITIONAL -*- Autoconf -*-
+-
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 8
+-
+-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+-# -------------------------------------
+-# Define a conditional.
+-AC_DEFUN([AM_CONDITIONAL],
+-[AC_PREREQ(2.52)dnl
+- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+-AC_SUBST([$1_TRUE])dnl
+-AC_SUBST([$1_FALSE])dnl
+-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+-if $2; then
+- $1_TRUE=
+- $1_FALSE='#'
+-else
+- $1_TRUE='#'
+- $1_FALSE=
+-fi
+-AC_CONFIG_COMMANDS_PRE(
+-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+- AC_MSG_ERROR([[conditional "$1" was never defined.
+-Usually this means the macro was only invoked conditionally.]])
+-fi])])
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 9
+-
+-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+-# written in clear, in which case automake, when reading aclocal.m4,
+-# will think it sees a *use*, and therefore will trigger all it's
+-# C support machinery. Also note that it means that autoscan, seeing
+-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+-
+-
+-# _AM_DEPENDENCIES(NAME)
+-# ----------------------
+-# See how the compiler implements dependency checking.
+-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+-# We try a few techniques and use that to set a single cache variable.
+-#
+-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+-# dependency, and given that the user is not expected to run this macro,
+-# just rely on AC_PROG_CC.
+-AC_DEFUN([_AM_DEPENDENCIES],
+-[AC_REQUIRE([AM_SET_DEPDIR])dnl
+-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+-AC_REQUIRE([AM_DEP_TRACK])dnl
+-
+-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+- [$1], CXX, [depcc="$CXX" am_compiler_list=],
+- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+- [$1], UPC, [depcc="$UPC" am_compiler_list=],
+- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+- [depcc="$$1" am_compiler_list=])
+-
+-AC_CACHE_CHECK([dependency style of $depcc],
+- [am_cv_$1_dependencies_compiler_type],
+-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+- # We make a subdir and do the tests there. Otherwise we can end up
+- # making bogus files that we don't know about and never remove. For
+- # instance it was reported that on HP-UX the gcc test will end up
+- # making a dummy file named `D' -- because `-MD' means `put the output
+- # in D'.
+- mkdir conftest.dir
+- # Copy depcomp to subdir because otherwise we won't find it if we're
+- # using a relative directory.
+- cp "$am_depcomp" conftest.dir
+- cd conftest.dir
+- # We will build objects and dependencies in a subdirectory because
+- # it helps to detect inapplicable dependency modes. For instance
+- # both Tru64's cc and ICC support -MD to output dependencies as a
+- # side effect of compilation, but ICC will put the dependencies in
+- # the current directory while Tru64 will put them in the object
+- # directory.
+- mkdir sub
+-
+- am_cv_$1_dependencies_compiler_type=none
+- if test "$am_compiler_list" = ""; then
+- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+- fi
+- for depmode in $am_compiler_list; do
+- # Setup a source with many dependencies, because some compilers
+- # like to wrap large dependency lists on column 80 (with \), and
+- # we should not choose a depcomp mode which is confused by this.
+- #
+- # We need to recreate these files for each test, as the compiler may
+- # overwrite some of them when testing with obscure command lines.
+- # This happens at least with the AIX C compiler.
+- : > sub/conftest.c
+- for i in 1 2 3 4 5 6; do
+- echo '#include "conftst'$i'.h"' >> sub/conftest.c
+- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
+- touch sub/conftst$i.h
+- done
+- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+-
+- case $depmode in
+- nosideeffect)
+- # after this tag, mechanisms are not by side-effect, so they'll
+- # only be used when explicitly requested
+- if test "x$enable_dependency_tracking" = xyes; then
+- continue
+- else
+- break
+- fi
+- ;;
+- none) break ;;
+- esac
+- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+- # mode. It turns out that the SunPro C++ compiler does not properly
+- # handle `-M -o', and we need to detect this.
+- if depmode=$depmode \
+- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+- >/dev/null 2>conftest.err &&
+- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+- # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
+- # that says an option was ignored or not supported.
+- # When given -MP, icc 7.0 and 7.1 complain thusly:
+- # icc: Command line warning: ignoring option '-M'; no argument required
+- # The diagnosis changed in icc 8.0:
+- # icc: Command line remark: option '-MP' not supported
+- if (grep 'ignoring option' conftest.err ||
+- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+- am_cv_$1_dependencies_compiler_type=$depmode
+- break
+- fi
+- fi
+- done
+-
+- cd ..
+- rm -rf conftest.dir
+-else
+- am_cv_$1_dependencies_compiler_type=none
+-fi
+-])
+-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+-AM_CONDITIONAL([am__fastdep$1], [
+- test "x$enable_dependency_tracking" != xno \
+- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+-])
+-
+-
+-# AM_SET_DEPDIR
+-# -------------
+-# Choose a directory name for dependency files.
+-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+-AC_DEFUN([AM_SET_DEPDIR],
+-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+-])
+-
+-
+-# AM_DEP_TRACK
+-# ------------
+-AC_DEFUN([AM_DEP_TRACK],
+-[AC_ARG_ENABLE(dependency-tracking,
+-[ --disable-dependency-tracking speeds up one-time build
+- --enable-dependency-tracking do not reject slow dependency extractors])
+-if test "x$enable_dependency_tracking" != xno; then
+- am_depcomp="$ac_aux_dir/depcomp"
+- AMDEPBACKSLASH='\'
+-fi
+-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+-AC_SUBST([AMDEPBACKSLASH])dnl
+-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+-])
+-
+-# Generate code to set up dependency tracking. -*- Autoconf -*-
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-#serial 4
+-
+-# _AM_OUTPUT_DEPENDENCY_COMMANDS
+-# ------------------------------
+-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
+-# are listed without --file. Let's play safe and only enable the eval
+-# if we detect the quoting.
+-case $CONFIG_FILES in
+-*\'*) eval set x "$CONFIG_FILES" ;;
+-*) set x $CONFIG_FILES ;;
+-esac
+-shift
+-for mf
+-do
+- # Strip MF so we end up with the name of the file.
+- mf=`echo "$mf" | sed -e 's/:.*$//'`
+- # Check whether this is an Automake generated Makefile or not.
+- # We used to match only the files named `Makefile.in', but
+- # some people rename them; so instead we look at the file content.
+- # Grep'ing the first line is not enough: some people post-process
+- # each Makefile.in and add a new line on top of each file to say so.
+- # Grep'ing the whole file is not good either: AIX grep has a line
+- # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+- dirpart=`AS_DIRNAME("$mf")`
+- else
+- continue
+- fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+- test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+- # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+- # Make sure the directory exists.
+- test -f "$dirpart/$file" && continue
+- fdir=`AS_DIRNAME(["$file"])`
+- AS_MKDIR_P([$dirpart/$fdir])
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
+- done
+-done
+-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+-
+-
+-# AM_OUTPUT_DEPENDENCY_COMMANDS
+-# -----------------------------
+-# This macro should only be invoked once -- use via AC_REQUIRE.
+-#
+-# This code is only required when automatic dependency tracking
+-# is enabled. FIXME. This creates each `.P' file that we will
+-# need in order to bootstrap the dependency handling code.
+-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[AC_CONFIG_COMMANDS([depfiles],
+- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+-])
+-
+-# Do all the work for Automake. -*- Autoconf -*-
+-
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2008 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 13
+-
+-# This macro actually does too much. Some checks are only needed if
+-# your package does certain things. But this isn't really a big deal.
+-
+-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+-# AM_INIT_AUTOMAKE([OPTIONS])
+-# -----------------------------------------------
+-# The call with PACKAGE and VERSION arguments is the old style
+-# call (pre autoconf-2.50), which is being phased out. PACKAGE
+-# and VERSION should now be passed to AC_INIT and removed from
+-# the call to AM_INIT_AUTOMAKE.
+-# We support both call styles for the transition. After
+-# the next Automake release, Autoconf can make the AC_INIT
+-# arguments mandatory, and then we can depend on a new Autoconf
+-# release and drop the old call support.
+-AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.60])dnl
+-dnl Autoconf wants to disallow AM_ names. We explicitly allow
+-dnl the ones we care about.
+-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+-AC_REQUIRE([AC_PROG_INSTALL])dnl
+-if test "`cd $srcdir && pwd`" != "`pwd`"; then
+- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+- # is not polluted with repeated "-I."
+- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+- # test to see if srcdir already configured
+- if test -f $srcdir/config.status; then
+- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+- fi
+-fi
+-
+-# test whether we have cygpath
+-if test -z "$CYGPATH_W"; then
+- if (cygpath --version) >/dev/null 2>/dev/null; then
+- CYGPATH_W='cygpath -w'
+- else
+- CYGPATH_W=echo
+- fi
+-fi
+-AC_SUBST([CYGPATH_W])
+-
+-# Define the identity of the package.
+-dnl Distinguish between old-style and new-style calls.
+-m4_ifval([$2],
+-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+- AC_SUBST([PACKAGE], [$1])dnl
+- AC_SUBST([VERSION], [$2])],
+-[_AM_SET_OPTIONS([$1])dnl
+-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+-
+-_AM_IF_OPTION([no-define],,
+-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+-
+-# Some tools Automake needs.
+-AC_REQUIRE([AM_SANITY_CHECK])dnl
+-AC_REQUIRE([AC_ARG_PROGRAM])dnl
+-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+-AM_MISSING_PROG(AUTOCONF, autoconf)
+-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+-AM_MISSING_PROG(AUTOHEADER, autoheader)
+-AM_MISSING_PROG(MAKEINFO, makeinfo)
+-AM_PROG_INSTALL_SH
+-AM_PROG_INSTALL_STRIP
+-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+-# We need awk for the "check" target. The system "awk" is bad on
+-# some platforms.
+-AC_REQUIRE([AC_PROG_AWK])dnl
+-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+- [_AM_PROG_TAR([v7])])])
+-_AM_IF_OPTION([no-dependencies],,
+-[AC_PROVIDE_IFELSE([AC_PROG_CC],
+- [_AM_DEPENDENCIES(CC)],
+- [define([AC_PROG_CC],
+- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_CXX],
+- [_AM_DEPENDENCIES(CXX)],
+- [define([AC_PROG_CXX],
+- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+- [_AM_DEPENDENCIES(OBJC)],
+- [define([AC_PROG_OBJC],
+- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+-])
+-])
+-
+-
+-# When config.status generates a header, we must update the stamp-h file.
+-# This file resides in the same directory as the config header
+-# that is generated. The stamp files are numbered to have different names.
+-
+-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+-# loop where config.status creates the headers, so we can generate
+-# our stamp files there.
+-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+-[# Compute $1's index in $config_headers.
+-_am_arg=$1
+-_am_stamp_count=1
+-for _am_header in $config_headers :; do
+- case $_am_header in
+- $_am_arg | $_am_arg:* )
+- break ;;
+- * )
+- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+- esac
+-done
+-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+-
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# AM_PROG_INSTALL_SH
+-# ------------------
+-# Define $install_sh.
+-AC_DEFUN([AM_PROG_INSTALL_SH],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+-AC_SUBST(install_sh)])
+-
+-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 2
+-
+-# Check whether the underlying file-system supports filenames
+-# with a leading dot. For instance MS-DOS doesn't.
+-AC_DEFUN([AM_SET_LEADING_DOT],
+-[rm -rf .tst 2>/dev/null
+-mkdir .tst 2>/dev/null
+-if test -d .tst; then
+- am__leading_dot=.
+-else
+- am__leading_dot=_
+-fi
+-rmdir .tst 2>/dev/null
+-AC_SUBST([am__leading_dot])])
+-
+-# Check to see how 'make' treats includes. -*- Autoconf -*-
+-
+-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 3
+-
+-# AM_MAKE_INCLUDE()
+-# -----------------
+-# Check to see how make treats includes.
+-AC_DEFUN([AM_MAKE_INCLUDE],
+-[am_make=${MAKE-make}
+-cat > confinc << 'END'
+-am__doit:
+- @echo done
+-.PHONY: am__doit
+-END
+-# If we don't find an include directive, just comment out the code.
+-AC_MSG_CHECKING([for style of include used by $am_make])
+-am__include="#"
+-am__quote=
+-_am_result=none
+-# First try GNU make style include.
+-echo "include confinc" > confmf
+-# We grep out `Entering directory' and `Leaving directory'
+-# messages which can occur if `w' ends up in MAKEFLAGS.
+-# In particular we don't look at `^make:' because GNU make might
+-# be invoked under some other name (usually "gmake"), in which
+-# case it prints its new name instead of `make'.
+-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+- am__include=include
+- am__quote=
+- _am_result=GNU
+-fi
+-# Now try BSD make style include.
+-if test "$am__include" = "#"; then
+- echo '.include "confinc"' > confmf
+- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+- am__include=.include
+- am__quote="\""
+- _am_result=BSD
+- fi
+-fi
+-AC_SUBST([am__include])
+-AC_SUBST([am__quote])
+-AC_MSG_RESULT([$_am_result])
+-rm -f confinc confmf
+-])
+-
+-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+-
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 5
+-
+-# AM_MISSING_PROG(NAME, PROGRAM)
+-# ------------------------------
+-AC_DEFUN([AM_MISSING_PROG],
+-[AC_REQUIRE([AM_MISSING_HAS_RUN])
+-$1=${$1-"${am_missing_run}$2"}
+-AC_SUBST($1)])
+-
+-
+-# AM_MISSING_HAS_RUN
+-# ------------------
+-# Define MISSING if not defined so far and test if it supports --run.
+-# If it does, set am_missing_run to use it, otherwise, to nothing.
+-AC_DEFUN([AM_MISSING_HAS_RUN],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-AC_REQUIRE_AUX_FILE([missing])dnl
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+-# Use eval to expand $SHELL
+-if eval "$MISSING --run true"; then
+- am_missing_run="$MISSING --run "
+-else
+- am_missing_run=
+- AC_MSG_WARN([`missing' script is too old or missing])
+-fi
+-])
+-
+-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# AM_PROG_MKDIR_P
+-# ---------------
+-# Check for `mkdir -p'.
+-AC_DEFUN([AM_PROG_MKDIR_P],
+-[AC_PREREQ([2.60])dnl
+-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+-dnl while keeping a definition of mkdir_p for backward compatibility.
+-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+-dnl Makefile.ins that do not define MKDIR_P, so we do our own
+-dnl adjustment using top_builddir (which is defined more often than
+-dnl MKDIR_P).
+-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+-case $mkdir_p in
+- [[\\/$]]* | ?:[[\\/]]*) ;;
+- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+-esac
+-])
+-
+-# Helper functions for option handling. -*- Autoconf -*-
+-
+-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 4
+-
+-# _AM_MANGLE_OPTION(NAME)
+-# -----------------------
+-AC_DEFUN([_AM_MANGLE_OPTION],
+-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+-
+-# _AM_SET_OPTION(NAME)
+-# ------------------------------
+-# Set option NAME. Presently that only means defining a flag for this option.
+-AC_DEFUN([_AM_SET_OPTION],
+-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+-
+-# _AM_SET_OPTIONS(OPTIONS)
+-# ----------------------------------
+-# OPTIONS is a space-separated list of Automake options.
+-AC_DEFUN([_AM_SET_OPTIONS],
+-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+-
+-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+-# -------------------------------------------
+-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+-AC_DEFUN([_AM_IF_OPTION],
+-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+-
+-# Check to make sure that the build environment is sane. -*- Autoconf -*-
+-
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 4
+-
+-# AM_SANITY_CHECK
+-# ---------------
+-AC_DEFUN([AM_SANITY_CHECK],
+-[AC_MSG_CHECKING([whether build environment is sane])
+-# Just in case
+-sleep 1
+-echo timestamp > conftest.file
+-# Do `set' in a subshell so we don't clobber the current shell's
+-# arguments. Must try -L first in case configure is actually a
+-# symlink; some systems play weird games with the mod time of symlinks
+-# (eg FreeBSD returns the mod time of the symlink's containing
+-# directory).
+-if (
+- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+- if test "$[*]" = "X"; then
+- # -L didn't work.
+- set X `ls -t $srcdir/configure conftest.file`
+- fi
+- rm -f conftest.file
+- if test "$[*]" != "X $srcdir/configure conftest.file" \
+- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+-
+- # If neither matched, then we have a broken ls. This can happen
+- # if, for instance, CONFIG_SHELL is bash and it inherits a
+- # broken ls alias from the environment. This has actually
+- # happened. Such a system could not be considered "sane".
+- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+-alias in your environment])
+- fi
+-
+- test "$[2]" = conftest.file
+- )
+-then
+- # Ok.
+- :
+-else
+- AC_MSG_ERROR([newly created file is older than distributed files!
+-Check your system clock])
+-fi
+-AC_MSG_RESULT(yes)])
+-
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# AM_PROG_INSTALL_STRIP
+-# ---------------------
+-# One issue with vendor `install' (even GNU) is that you can't
+-# specify the program used to strip binaries. This is especially
+-# annoying in cross-compiling environments, where the build's strip
+-# is unlikely to handle the host's binaries.
+-# Fortunately install-sh will honor a STRIPPROG variable, so we
+-# always use install-sh in `make install-strip', and initialize
+-# STRIPPROG with the value of the STRIP variable (set by the user).
+-AC_DEFUN([AM_PROG_INSTALL_STRIP],
+-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'. However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+-if test "$cross_compiling" != no; then
+- AC_CHECK_TOOL([STRIP], [strip], :)
+-fi
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+-AC_SUBST([INSTALL_STRIP_PROGRAM])])
+-
+-# Copyright (C) 2006 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# _AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
+-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+-# This macro is traced by Automake.
+-AC_DEFUN([_AM_SUBST_NOTMAKE])
+-
+-# Check how to create a tarball. -*- Autoconf -*-
+-
+-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 2
+-
+-# _AM_PROG_TAR(FORMAT)
+-# --------------------
+-# Check how to create a tarball in format FORMAT.
+-# FORMAT should be one of `v7', `ustar', or `pax'.
+-#
+-# Substitute a variable $(am__tar) that is a command
+-# writing to stdout a FORMAT-tarball containing the directory
+-# $tardir.
+-# tardir=directory && $(am__tar) > result.tar
+-#
+-# Substitute a variable $(am__untar) that extract such
+-# a tarball read from stdin.
+-# $(am__untar) < result.tar
+-AC_DEFUN([_AM_PROG_TAR],
+-[# Always define AMTAR for backward compatibility.
+-AM_MISSING_PROG([AMTAR], [tar])
+-m4_if([$1], [v7],
+- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+- [m4_case([$1], [ustar],, [pax],,
+- [m4_fatal([Unknown tar format])])
+-AC_MSG_CHECKING([how to create a $1 tar archive])
+-# Loop over all known methods to create a tar archive until one works.
+-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+-# Do not fold the above two line into one, because Tru64 sh and
+-# Solaris sh will not grok spaces in the rhs of `-'.
+-for _am_tool in $_am_tools
+-do
+- case $_am_tool in
+- gnutar)
+- for _am_tar in tar gnutar gtar;
+- do
+- AM_RUN_LOG([$_am_tar --version]) && break
+- done
+- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+- am__untar="$_am_tar -xf -"
+- ;;
+- plaintar)
+- # Must skip GNU tar: if it does not support --format= it doesn't create
+- # ustar tarball either.
+- (tar --version) >/dev/null 2>&1 && continue
+- am__tar='tar chf - "$$tardir"'
+- am__tar_='tar chf - "$tardir"'
+- am__untar='tar xf -'
+- ;;
+- pax)
+- am__tar='pax -L -x $1 -w "$$tardir"'
+- am__tar_='pax -L -x $1 -w "$tardir"'
+- am__untar='pax -r'
+- ;;
+- cpio)
+- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+- am__untar='cpio -i -H $1 -d'
+- ;;
+- none)
+- am__tar=false
+- am__tar_=false
+- am__untar=false
+- ;;
+- esac
+-
+- # If the value was cached, stop now. We just wanted to have am__tar
+- # and am__untar set.
+- test -n "${am_cv_prog_tar_$1}" && break
+-
+- # tar/untar a dummy directory, and stop if the command works
+- rm -rf conftest.dir
+- mkdir conftest.dir
+- echo GrepMe > conftest.dir/file
+- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+- rm -rf conftest.dir
+- if test -s conftest.tar; then
+- AM_RUN_LOG([$am__untar <conftest.tar])
+- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+- fi
+-done
+-rm -rf conftest.dir
+-
+-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+-AC_SUBST([am__tar])
+-AC_SUBST([am__untar])
+-]) # _AM_PROG_TAR
+-
+-m4_include([macros/ac_pkg_swig.m4])
+-m4_include([macros/as-scrub-include.m4])
+-m4_include([macros/binreloc.m4])
+-m4_include([macros/compiler-flags.m4])
+-m4_include([macros/gnome-guile-checks.m4])
+-m4_include([macros/legacy_macros.m4])
+-m4_include([macros/pkg.m4])
+diff --git a/checks/Makefile.in b/checks/Makefile.in
+index 439b9d8..e3a96e4 100644
+--- a/checks/Makefile.in
++++ b/checks/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ checksdir = ${GNC_CHECKS_DIR}
+@@ -336,8 +317,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/config.guess b/config.guess
+index 2313a17..f32079a 100755
+--- a/config.guess
++++ b/config.guess
+@@ -139,23 +139,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+-if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
+- eval $set_cc_for_build
+- cat << EOF > $dummy.c
+- #include <features.h>
+- #ifdef __UCLIBC__
+- # ifdef __UCLIBC_CONFIG_VERSION__
+- LIBC=uclibc __UCLIBC_CONFIG_VERSION__
+- # else
+- LIBC=uclibc
+- # endif
+- #else
+- LIBC=gnu
+- #endif
+-EOF
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
+-fi
+-
+ # Note: order is significant - the case branches are not exclusive.
+
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -857,31 +840,31 @@ EOF
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ cris:Linux:*:*)
+- echo cris-axis-linux-${LIBC}
++ echo cris-axis-linux-gnu
+ exit ;;
+ crisv32:Linux:*:*)
+- echo crisv32-axis-linux-${LIBC}
++ echo crisv32-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
+- echo frv-unknown-linux-${LIBC}
++ echo frv-unknown-linux-gnu
+ exit ;;
+ ia64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ m32r*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ m68*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ mips:Linux:*:*)
+ eval $set_cc_for_build
+@@ -904,7 +887,7 @@ EOF
+ s: ::g
+ p
+ }'`"
+- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
+@@ -927,16 +910,16 @@ EOF
+ s: ::g
+ p
+ }'`"
+- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+- echo or32-unknown-linux-${LIBC}
++ echo or32-unknown-linux-gnu
+ exit ;;
+ ppc:Linux:*:*)
+- echo powerpc-unknown-linux-${LIBC}
++ echo powerpc-unknown-linux-gnu
+ exit ;;
+ ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-${LIBC}
++ echo powerpc64-unknown-linux-gnu
+ exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -949,40 +932,40 @@ EOF
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+- *) echo hppa-unknown-linux-${LIBC} ;;
++ PA7*) echo hppa1.1-unknown-linux-gnu ;;
++ PA8*) echo hppa2.0-unknown-linux-gnu ;;
++ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-${LIBC}
++ echo hppa64-unknown-linux-gnu
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit ;;
+ sh64*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ sh*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ vax:Linux:*:*)
+- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
++ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
+ x86_64:Linux:*:*)
+- echo x86_64-unknown-linux-${LIBC}
++ echo x86_64-unknown-linux-gnu
+ exit ;;
+ xtensa*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ i*86:Linux:*:*)
+ # The BFD linker knows what the default object file format is, so
+@@ -997,22 +980,20 @@ EOF
+ p'`
+ case "$ld_supported_targets" in
+ elf32-i386)
+- TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
++ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ ;;
+ a.out-i386-linux)
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
++ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit ;;
+ coff-i386)
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
++ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ exit ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
++ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ exit ;;
+ esac
+- # This should get integrated into the C code below, but now we hack
+- if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
+ # Determine whether the default compiler is a.out or elf
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+diff --git a/config.h.in b/config.h.in
+index a1a19ad..6f10214 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -1,8 +1,5 @@
+ /* config.h.in. Generated from configure.in by autoheader. */
+
+-/* Define if building universal (internal helper macro) */
+-#undef AC_APPLE_UNIVERSAL_BUILD
+-
+ /* Include pthread support for binary relocation? */
+ #undef BR_PTHREAD
+
+@@ -297,49 +294,14 @@
+ /* We are using EFence */
+ #undef USE_EFENCE
+
+-/* Enable extensions on AIX 3, Interix. */
+-#ifndef _ALL_SOURCE
+-# undef _ALL_SOURCE
+-#endif
+-/* Enable GNU extensions on systems that have them. */
+-#ifndef _GNU_SOURCE
+-# undef _GNU_SOURCE
+-#endif
+-/* Enable threading extensions on Solaris. */
+-#ifndef _POSIX_PTHREAD_SEMANTICS
+-# undef _POSIX_PTHREAD_SEMANTICS
+-#endif
+-/* Enable extensions on HP NonStop. */
+-#ifndef _TANDEM_SOURCE
+-# undef _TANDEM_SOURCE
+-#endif
+-/* Enable general extensions on Solaris. */
+-#ifndef __EXTENSIONS__
+-# undef __EXTENSIONS__
+-#endif
+-
+-
+ /* Version number of package */
+ #undef VERSION
+
+-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+- significant byte first (like Motorola and SPARC, unlike Intel). */
+-#if defined AC_APPLE_UNIVERSAL_BUILD
+-# if defined __BIG_ENDIAN__
+-# define WORDS_BIGENDIAN 1
+-# endif
+-#else
+-# ifndef WORDS_BIGENDIAN
+-# undef WORDS_BIGENDIAN
+-# endif
+-#endif
+-
+-/* Define to 1 if on MINIX. */
+-#undef _MINIX
+-
+-/* Define to 2 if the system does not provide POSIX.1 features except with
+- this defined. */
+-#undef _POSIX_1_SOURCE
++/* Define to 1 if your processor stores words with the most significant byte
++ first (like Motorola and SPARC, unlike Intel and VAX). */
++#undef WORDS_BIGENDIAN
+
+-/* Define to 1 if you need to in order for `stat' and other things to work. */
+-#undef _POSIX_SOURCE
++/* Enable GNU extensions on systems that have them. */
++#ifndef _GNU_SOURCE
++# undef _GNU_SOURCE
++#endif
+diff --git a/config.sub b/config.sub
+index ba16ebf..6759825 100755
+--- a/config.sub
++++ b/config.sub
+@@ -244,7 +244,7 @@ case $basic_machine in
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | bfin \
+ | c4x | clipper \
+- | d10v | d30v | dlx | dsp16xx | dvp \
++ | d10v | d30v | dlx | dsp16xx \
+ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+@@ -277,7 +277,7 @@ case $basic_machine in
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
+ | score \
+- | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+@@ -358,7 +358,7 @@ case $basic_machine in
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+ | romp-* | rs6000-* \
+- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
++ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+@@ -714,24 +714,6 @@ case $basic_machine in
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
+- mipsEE* | ee | ps2)
+- basic_machine=mips64r5900el-scei
+- case $os in
+- -linux*)
+- ;;
+- *)
+- os=-elf
+- ;;
+- esac
+- ;;
+- iop)
+- basic_machine=mipsel-scei
+- os=-irx
+- ;;
+- dvp)
+- basic_machine=dvp-scei
+- os=-elf
+- ;;
+ mips3*-*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ ;;
+@@ -1276,7 +1258,7 @@ case $os in
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+diff --git a/configure b/configure
+index d0a5ad8..b7989cc 100755
+--- a/configure
++++ b/configure
+@@ -1,11 +1,11 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.63 for gnucash 2.2.9.
++# Generated by GNU Autoconf 2.61 for gnucash 2.2.9.
+ #
+ # Report bugs to <gnucash-devel at gnucash.org>.
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+@@ -39,45 +39,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+-as_nl='
+-'
+-export as_nl
+-# Printing a long string crashes Solaris 7 /usr/bin/printf.
+-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+- as_echo='printf %s\n'
+- as_echo_n='printf %s'
+-else
+- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+- as_echo_n='/usr/ucb/echo -n'
+- else
+- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+- as_echo_n_body='eval
+- arg=$1;
+- case $arg in
+- *"$as_nl"*)
+- expr "X$arg" : "X\\(.*\\)$as_nl";
+- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+- esac;
+- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+- '
+- export as_echo_n_body
+- as_echo_n='sh -c $as_echo_n_body as_echo'
+- fi
+- export as_echo_body
+- as_echo='sh -c $as_echo_body as_echo'
+-fi
+-
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+- PATH_SEPARATOR=:
+- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+- PATH_SEPARATOR=';'
+- }
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
+ fi
+
+ # Support unset when possible.
+@@ -93,6 +65,8 @@ fi
+ # there to prevent editors from complaining about space-tab.
+ # (If _AS_PATH_WALK were called with IFS unset, it would disable word
+ # splitting by setting IFS to empty value.)
++as_nl='
++'
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
+@@ -115,7 +89,7 @@ if test "x$as_myself" = x; then
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ { (exit 1); exit 1; }
+ fi
+
+@@ -128,10 +102,17 @@ PS2='> '
+ PS4='+ '
+
+ # NLS nuisances.
+-LC_ALL=C
+-export LC_ALL
+-LANGUAGE=C
+-export LANGUAGE
++for as_var in \
++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++ LC_TELEPHONE LC_TIME
++do
++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++ eval $as_var=C; export $as_var
++ else
++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++ fi
++done
+
+ # Required to use basename.
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+@@ -153,7 +134,7 @@ as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X/"$0" |
++echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+@@ -179,7 +160,7 @@ else
+ as_have_required=no
+ fi
+
+- if test $as_have_required = yes && (eval ":
++ if test $as_have_required = yes && (eval ":
+ (as_func_return () {
+ (exit \$1)
+ }
+@@ -261,7 +242,7 @@ IFS=$as_save_IFS
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+@@ -282,7 +263,7 @@ _ASEOF
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+@@ -362,10 +343,10 @@ fi
+
+ if test "x$CONFIG_SHELL" != x; then
+ for as_var in BASH_ENV ENV
+- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+- done
+- export CONFIG_SHELL
+- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++ done
++ export CONFIG_SHELL
++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ fi
+
+
+@@ -434,10 +415,9 @@ fi
+
+ test \$exitcode = 0") || {
+ echo No shell found that supports shell functions.
+- echo Please tell bug-autoconf at gnu.org about your system,
+- echo including any error possibly output before this message.
+- echo This can help us improve future autoconf versions.
+- echo Configuration will now proceed without shell functions.
++ echo Please tell autoconf at gnu.org about your system,
++ echo including any error possibly output before this
++ echo message
+ }
+
+
+@@ -473,7 +453,7 @@ test \$exitcode = 0") || {
+ s/-\n.*//
+ ' >$as_me.lineno &&
+ chmod +x "$as_me.lineno" ||
+- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+@@ -501,6 +481,7 @@ case `echo -n x` in
+ *)
+ ECHO_N='-n';;
+ esac
++
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+@@ -513,22 +494,19 @@ if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+ else
+ rm -f conf$$.dir
+- mkdir conf$$.dir 2>/dev/null
+-fi
+-if (echo >conf$$.file) 2>/dev/null; then
+- if ln -s conf$$.file conf$$ 2>/dev/null; then
+- as_ln_s='ln -s'
+- # ... but there are two gotchas:
+- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+- # In both cases, we have to default to `cp -p'.
+- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+- as_ln_s='cp -p'
+- elif ln conf$$.file conf$$ 2>/dev/null; then
+- as_ln_s=ln
+- else
++ mkdir conf$$.dir
++fi
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s='ln -s'
++ # ... but there are two gotchas:
++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++ # In both cases, we have to default to `cp -p'.
++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+- fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s=ln
+ else
+ as_ln_s='cp -p'
+ fi
+@@ -553,10 +531,10 @@ else
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+- test -d "$1/.";
++ test -d "$1/.";
+ else
+ case $1 in
+- -*)set "./$1";;
++ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+@@ -791,336 +769,291 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+
+-ac_subst_vars='LTLIBOBJS
+-LIBOBJS_SEDSCRIPT
+-LC_MESSAGES_ENUM
+-LIBOBJS
+-EFENCE_LIBS
+-GNOME_PRINT_LIBS
+-GNOME_PRINT_CFLAGS
+-GTKHTML_USES_GTKPRINT_FALSE
+-GTKHTML_USES_GTKPRINT_TRUE
+-GTKHTML_LIBS
+-GTKHTML_CFLAGS
+-GOFFICE_LIBS
+-GOFFICE_CFLAGS
+-GLADE_LIBS
+-GLADE_CFLAGS
+-GDK_PIXBUF_LIBS
+-GDK_PIXBUF_CFLAGS
+-GNOME_LIBS
+-GNOME_CFLAGS
+-HAVE_GTK_2_10_FALSE
+-HAVE_GTK_2_10_TRUE
+-GTK_LIBS
+-GTK_CFLAGS
+-cflags_set
+-GNUCASH_ENABLE_GUI_FALSE
+-GNUCASH_ENABLE_GUI_TRUE
+-enable_latex_docs
+-enable_html_docs
+-enable_dot
+-ENABLE_DOXYGEN_FALSE
+-ENABLE_DOXYGEN_TRUE
+-DOC_FALSE
+-DOC_TRUE
+-DOT
+-DOXYGEN
+-PERLINCL
+-PERL
+-GNC_CTAGS_FILE_FALSE
+-GNC_CTAGS_FILE_TRUE
+-GNC_CTAGS_FILE
+-GNC_ETAGS_FILE_FALSE
+-GNC_ETAGS_FILE_TRUE
+-GNC_ETAGS_FILE
+-GNC_HELPDIR
+-AQBANKING_DIR
+-AQBANKING_LIBS
+-AQBANKING_CFLAGS
+-OFX_DIR
+-LIBOFX_LIBS
+-LIBOFX_CFLAGS
+-SQL_DIR
+-PGSQL_LIBS
+-PGSQL_CFLAGS
+-GNC_LIBEXECDIR
+-GNC_SHAREDIR
+-GNC_SCM_INSTALL_DIR
+-GNC_PIXMAP_DIR
+-GNC_INCLUDE_DIR
+-GNC_UI_DIR
+-GNC_GLADE_DIR
+-GNC_DOC_INSTALL_DIR
+-GNC_CONFIGDIR
+-GNC_CHECKS_DIR
+-GNC_ACCOUNTS_DIR
+-QOF_XML_DIR
+-QOF_LIB_DIR
+-QOF_PREFIX
+-QOF_LIBS
+-QOF_CFLAGS
+-USE_LIBQOF
+-USE_LIBQOF_FALSE
+-USE_LIBQOF_TRUE
+-LIBQOF_BACKEND_QSF_LIBRARY_VERSION
+-LIBQOF_LIBRARY_VERSION
+-ZLIB_LIBS
+-LIBXML_VERSION
+-LIBXML2_LIBS
+-LIBXML2_CFLAGS
+-GCONFTOOL
+-GCONF_LIBS
+-GCONF_CFLAGS
+-GNC_HAVE_GUILE_WWW_FALSE
+-GNC_HAVE_GUILE_WWW_TRUE
+-GUILE_TOOLS
+-GUILE_CONFIG
+-GNC_TEST_SRFI_LOAD_CMD
+-GNC_SRFI_LOAD_PATH
+-GNC_ADD_ON_SRFIS
+-GUILE
+-GUILE_FALSE
+-GUILE_TRUE
+-GUILE_INCS
+-GUILE_LIBS
+-BUILD_GUILE
+-READLINE_LIB
+-TERMCAP_LIB
+-QTTHREADS_LIB
+-DL_LIB
+-HAVE_GLIB_2_8_FALSE
+-HAVE_GLIB_2_8_TRUE
+-GLIB26_LIBS
+-GLIB_MKENUMS
+-GOBJECT_QUERY
+-GLIB_GENMARSHAL
+-GLIB_LIBS
+-GLIB_CFLAGS
+-PKG_CONFIG
+-BINRELOC_LIBS
+-BINRELOC_CFLAGS
+-HAVE_X11_XLIB_H_FALSE
+-HAVE_X11_XLIB_H_TRUE
+-GNUCASH_SEPARATE_BUILDDIR_FALSE
+-GNUCASH_SEPARATE_BUILDDIR_TRUE
+-BUILDING_FROM_SVN_FALSE
+-BUILDING_FROM_SVN_TRUE
+-SWIG
+-HTMLHELP_LIBS
+-REGEX_LIBS
+-PLATFORM_WIN32_FALSE
+-PLATFORM_WIN32_TRUE
+-OS_WIN32_FALSE
+-OS_WIN32_TRUE
+-LIBTOOL_DEPS
+-LIBTOOL
+-ac_ct_F77
+-FFLAGS
+-F77
+-CXXCPP
+-am__fastdepCXX_FALSE
+-am__fastdepCXX_TRUE
+-CXXDEPMODE
+-ac_ct_CXX
+-CXXFLAGS
+-CXX
+-OBJDUMP
+-AS
+-DLLTOOL
+-NMEDIT
+-DSYMUTIL
+-RANLIB
+-AR
+-ECHO
+-LN_S
+-SED
+-host_os
+-host_vendor
+-host_cpu
+-host
+-build_os
+-build_vendor
+-build_cpu
+-build
+-MKINSTALLDIRS
+-POSUB
+-POFILES
+-PO_IN_DATADIR_FALSE
+-PO_IN_DATADIR_TRUE
+-INTLLIBS
+-INSTOBJEXT
+-GMOFILES
+-CATOBJEXT
+-CATALOGS
+-GMSGFMT
+-MSGFMT_OPTS
++ac_subst_vars='SHELL
++PATH_SEPARATOR
++PACKAGE_NAME
++PACKAGE_TARNAME
++PACKAGE_VERSION
++PACKAGE_STRING
++PACKAGE_BUGREPORT
++exec_prefix
++prefix
++program_transform_name
++bindir
++sbindir
++libexecdir
++datarootdir
++datadir
++sysconfdir
++sharedstatedir
++localstatedir
++includedir
++oldincludedir
++docdir
++infodir
++htmldir
++dvidir
++pdfdir
++psdir
++libdir
++localedir
++mandir
++DEFS
++ECHO_C
++ECHO_N
++ECHO_T
++LIBS
++build_alias
++host_alias
++target_alias
++INSTALL_PROGRAM
++INSTALL_SCRIPT
++INSTALL_DATA
++am__isrc
++CYGPATH_W
++PACKAGE
++VERSION
++ACLOCAL
++AUTOCONF
++AUTOMAKE
++AUTOHEADER
++MAKEINFO
++install_sh
++STRIP
++INSTALL_STRIP_PROGRAM
++mkdir_p
++AWK
++SET_MAKE
++am__leading_dot
++AMTAR
++am__tar
++am__untar
++CC
++CFLAGS
++LDFLAGS
++CPPFLAGS
++ac_ct_CC
++EXEEXT
++OBJEXT
++DEPDIR
++am__include
++am__quote
++AMDEP_TRUE
++AMDEP_FALSE
++AMDEPBACKSLASH
++CCDEPMODE
++am__fastdepCC_TRUE
++am__fastdepCC_FALSE
+ USE_NLS
+-GETTEXT_PACKAGE
+-GNUCASH_MICRO_VERSION
+-GNUCASH_MINOR_VERSION
+-GNUCASH_MAJOR_VERSION
+-GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY
+-GCONF_SCHEMAS_INSTALL_FALSE
+-GCONF_SCHEMAS_INSTALL_TRUE
+-GCONF_SCHEMA_FILE_DIR
+-GCONF_SCHEMA_CONFIG_SOURCE
+-DATADIRNAME
+-ALL_LINGUAS
+-INTLTOOL_PERL
+ INTLTOOL_UPDATE
+ INTLTOOL_MERGE
+ INTLTOOL_EXTRACT
+-MSGFMT
+-MSGMERGE
+-XGETTEXT
+-INTLTOOL_POLICY_RULE
+-INTLTOOL_SERVICE_RULE
+-INTLTOOL_THEME_RULE
+-INTLTOOL_SCHEMAS_RULE
+-INTLTOOL_CAVES_RULE
+-INTLTOOL_XML_NOMERGE_RULE
+-INTLTOOL_XML_RULE
+-INTLTOOL_KBD_RULE
+-INTLTOOL_XAM_RULE
+-INTLTOOL_UI_RULE
+-INTLTOOL_SOUNDLIST_RULE
+-INTLTOOL_SHEET_RULE
+-INTLTOOL_SERVER_RULE
+-INTLTOOL_PONG_RULE
+-INTLTOOL_OAF_RULE
+-INTLTOOL_PROP_RULE
+-INTLTOOL_KEYS_RULE
+-INTLTOOL_DIRECTORY_RULE
+ INTLTOOL_DESKTOP_RULE
+-EGREP
+-GREP
++INTLTOOL_DIRECTORY_RULE
++INTLTOOL_KEYS_RULE
++INTLTOOL_PROP_RULE
++INTLTOOL_OAF_RULE
++INTLTOOL_PONG_RULE
++INTLTOOL_SERVER_RULE
++INTLTOOL_SHEET_RULE
++INTLTOOL_SOUNDLIST_RULE
++INTLTOOL_UI_RULE
++INTLTOOL_XAM_RULE
++INTLTOOL_KBD_RULE
++INTLTOOL_XML_RULE
++INTLTOOL_XML_NOMERGE_RULE
++INTLTOOL_CAVES_RULE
++INTLTOOL_SCHEMAS_RULE
++INTLTOOL_THEME_RULE
++INTLTOOL_SERVICE_RULE
++INTLTOOL_POLICY_RULE
++XGETTEXT
++MSGMERGE
++MSGFMT
++GMSGFMT
++INTLTOOL_PERL
++ALL_LINGUAS
++DATADIRNAME
++GCONF_SCHEMA_CONFIG_SOURCE
++GCONF_SCHEMA_FILE_DIR
++GCONF_SCHEMAS_INSTALL_TRUE
++GCONF_SCHEMAS_INSTALL_FALSE
++GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY
++GNUCASH_MAJOR_VERSION
++GNUCASH_MINOR_VERSION
++GNUCASH_MICRO_VERSION
++GETTEXT_PACKAGE
+ CPP
+-am__fastdepCC_FALSE
+-am__fastdepCC_TRUE
+-CCDEPMODE
+-AMDEPBACKSLASH
+-AMDEP_FALSE
+-AMDEP_TRUE
+-am__quote
+-am__include
+-DEPDIR
+-OBJEXT
+-EXEEXT
+-ac_ct_CC
+-CPPFLAGS
+-LDFLAGS
+-CFLAGS
+-CC
+-am__untar
+-am__tar
+-AMTAR
+-am__leading_dot
+-SET_MAKE
+-AWK
+-mkdir_p
+-MKDIR_P
+-INSTALL_STRIP_PROGRAM
+-STRIP
+-install_sh
+-MAKEINFO
+-AUTOHEADER
+-AUTOMAKE
+-AUTOCONF
+-ACLOCAL
+-VERSION
+-PACKAGE
+-CYGPATH_W
+-am__isrc
+-INSTALL_DATA
+-INSTALL_SCRIPT
+-INSTALL_PROGRAM
+-target_alias
+-host_alias
+-build_alias
+-LIBS
+-ECHO_T
+-ECHO_N
+-ECHO_C
+-DEFS
+-mandir
+-localedir
+-libdir
+-psdir
+-pdfdir
+-dvidir
+-htmldir
+-infodir
+-docdir
+-oldincludedir
+-includedir
+-localstatedir
+-sharedstatedir
+-sysconfdir
+-datadir
+-datarootdir
+-libexecdir
+-sbindir
+-bindir
+-program_transform_name
+-prefix
+-exec_prefix
+-PACKAGE_BUGREPORT
+-PACKAGE_STRING
+-PACKAGE_VERSION
+-PACKAGE_TARNAME
+-PACKAGE_NAME
+-PATH_SEPARATOR
+-SHELL'
+-ac_subst_files=''
+-ac_user_opts='
+-enable_option_checking
+-enable_dependency_tracking
+-with_gconf_source
+-with_gconf_schema_file_dir
+-enable_schemas_install
+-enable_static
+-enable_shared
+-enable_fast_install
+-with_gnu_ld
+-enable_libtool_lock
+-with_pic
+-with_tags
+-enable_binreloc
+-enable_binreloc_threads
+-enable_glibtest
+-enable_qof
+-with_qof
+-with_qt3_wizard_package
+-enable_debug
+-enable_profile
+-enable_ref_counts_dumps
+-enable_sql
+-enable_ofx
+-with_ofx_prefix
+-enable_mt940
+-enable_aqbanking
+-enable_hbci
+-enable_locale_specific_tax
+-with_help_prefix
+-enable_etags
+-enable_ctags
+-with_perl
+-with_perl_includes
+-enable_doxygen
++GREP
++EGREP
++MSGFMT_OPTS
++CATALOGS
++CATOBJEXT
++GMOFILES
++INSTOBJEXT
++INTLLIBS
++PO_IN_DATADIR_TRUE
++PO_IN_DATADIR_FALSE
++POFILES
++POSUB
++MKINSTALLDIRS
++build
++build_cpu
++build_vendor
++build_os
++host
++host_cpu
++host_vendor
++host_os
++SED
++LN_S
++ECHO
++AR
++RANLIB
++DSYMUTIL
++NMEDIT
++DLLTOOL
++AS
++OBJDUMP
++CXX
++CXXFLAGS
++ac_ct_CXX
++CXXDEPMODE
++am__fastdepCXX_TRUE
++am__fastdepCXX_FALSE
++CXXCPP
++F77
++FFLAGS
++ac_ct_F77
++LIBTOOL
++LIBTOOL_DEPS
++OS_WIN32_TRUE
++OS_WIN32_FALSE
++PLATFORM_WIN32_TRUE
++PLATFORM_WIN32_FALSE
++REGEX_LIBS
++HTMLHELP_LIBS
++SWIG
++BUILDING_FROM_SVN_TRUE
++BUILDING_FROM_SVN_FALSE
++GNUCASH_SEPARATE_BUILDDIR_TRUE
++GNUCASH_SEPARATE_BUILDDIR_FALSE
++HAVE_X11_XLIB_H_TRUE
++HAVE_X11_XLIB_H_FALSE
++BINRELOC_CFLAGS
++BINRELOC_LIBS
++PKG_CONFIG
++GLIB_CFLAGS
++GLIB_LIBS
++GLIB_GENMARSHAL
++GOBJECT_QUERY
++GLIB_MKENUMS
++GLIB26_LIBS
++HAVE_GLIB_2_8_TRUE
++HAVE_GLIB_2_8_FALSE
++DL_LIB
++GDK_TARGET_QUARTZ_TRUE
++GDK_TARGET_QUARTZ_FALSE
++IGE_MAC_CFLAGS
++IGE_MAC_LIBS
++QTTHREADS_LIB
++TERMCAP_LIB
++READLINE_LIB
++BUILD_GUILE
++GUILE_LIBS
++GUILE_INCS
++GUILE_TRUE
++GUILE_FALSE
++GUILE
++GNC_ADD_ON_SRFIS
++GNC_SRFI_LOAD_PATH
++GNC_TEST_SRFI_LOAD_CMD
++GUILE_CONFIG
++GUILE_TOOLS
++GNC_HAVE_GUILE_WWW_TRUE
++GNC_HAVE_GUILE_WWW_FALSE
++GCONF_CFLAGS
++GCONF_LIBS
++GCONFTOOL
++LIBXML2_CFLAGS
++LIBXML2_LIBS
++LIBXML_VERSION
++ZLIB_LIBS
++LIBQOF_LIBRARY_VERSION
++LIBQOF_BACKEND_QSF_LIBRARY_VERSION
++USE_LIBQOF_TRUE
++USE_LIBQOF_FALSE
++USE_LIBQOF
++QOF_CFLAGS
++QOF_LIBS
++QOF_PREFIX
++QOF_LIB_DIR
++QOF_XML_DIR
++GNC_ACCOUNTS_DIR
++GNC_CHECKS_DIR
++GNC_CONFIGDIR
++GNC_DOC_INSTALL_DIR
++GNC_GLADE_DIR
++GNC_UI_DIR
++GNC_INCLUDE_DIR
++GNC_PIXMAP_DIR
++GNC_SCM_INSTALL_DIR
++GNC_SHAREDIR
++GNC_LIBEXECDIR
++PGSQL_CFLAGS
++PGSQL_LIBS
++SQL_DIR
++LIBOFX_CFLAGS
++LIBOFX_LIBS
++OFX_DIR
++AQBANKING_CFLAGS
++AQBANKING_LIBS
++AQBANKING_DIR
++GNC_HELPDIR
++GNC_ETAGS_FILE
++GNC_ETAGS_FILE_TRUE
++GNC_ETAGS_FILE_FALSE
++GNC_CTAGS_FILE
++GNC_CTAGS_FILE_TRUE
++GNC_CTAGS_FILE_FALSE
++PERL
++PERLINCL
++DOXYGEN
++DOT
++DOC_TRUE
++DOC_FALSE
++ENABLE_DOXYGEN_TRUE
++ENABLE_DOXYGEN_FALSE
+ enable_dot
+ enable_html_docs
+ enable_latex_docs
+-enable_gui
+-enable_compile_warnings
+-enable_iso_c
+-enable_efence
+-enable_deprecated_glib
+-enable_deprecated_gdk
+-enable_deprecated_gtk
+-enable_deprecated_gnome
+-enable_error_on_warning
+-'
++GNUCASH_ENABLE_GUI_TRUE
++GNUCASH_ENABLE_GUI_FALSE
++WARN_CFLAGS
++GTK_CFLAGS
++GTK_LIBS
++HAVE_GTK_2_10_TRUE
++HAVE_GTK_2_10_FALSE
++GNOME_CFLAGS
++GNOME_LIBS
++GDK_PIXBUF_CFLAGS
++GDK_PIXBUF_LIBS
++GLADE_CFLAGS
++GLADE_LIBS
++GOFFICE_CFLAGS
++GOFFICE_LIBS
++GTKHTML_CFLAGS
++GTKHTML_LIBS
++GTKHTML_USES_GTKPRINT_TRUE
++GTKHTML_USES_GTKPRINT_FALSE
++GNOME_PRINT_CFLAGS
++GNOME_PRINT_LIBS
++EFENCE_LIBS
++LIBOBJS
++LC_MESSAGES_ENUM
++LIBOBJS_SEDSCRIPT
++LTLIBOBJS'
++ac_subst_files=''
+ ac_precious_vars='build_alias
+ host_alias
+ target_alias
+@@ -1136,14 +1069,34 @@ CCC
+ CXXCPP
+ F77
+ FFLAGS
+-PKG_CONFIG'
++PKG_CONFIG
++IGE_MAC_CFLAGS
++IGE_MAC_LIBS
++GCONF_CFLAGS
++GCONF_LIBS
++LIBXML2_CFLAGS
++LIBXML2_LIBS
++AQBANKING_CFLAGS
++AQBANKING_LIBS
++GTK_CFLAGS
++GTK_LIBS
++GNOME_CFLAGS
++GNOME_LIBS
++GDK_PIXBUF_CFLAGS
++GDK_PIXBUF_LIBS
++GLADE_CFLAGS
++GLADE_LIBS
++GOFFICE_CFLAGS
++GOFFICE_LIBS
++GTKHTML_CFLAGS
++GTKHTML_LIBS
++GNOME_PRINT_CFLAGS
++GNOME_PRINT_LIBS'
+
+
+ # Initialize some variables set by options.
+ ac_init_help=
+ ac_init_version=false
+-ac_unrecognized_opts=
+-ac_unrecognized_sep=
+ # The variables have the same names as the options, with
+ # dashes changed to underlines.
+ cache_file=/dev/null
+@@ -1242,21 +1195,13 @@ do
+ datarootdir=$ac_optarg ;;
+
+ -disable-* | --disable-*)
+- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+- ac_useropt_orig=$ac_useropt
+- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+- case $ac_user_opts in
+- *"
+-"enable_$ac_useropt"
+-"*) ;;
+- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+- ac_unrecognized_sep=', ';;
+- esac
+- eval enable_$ac_useropt=no ;;
++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
++ eval enable_$ac_feature=no ;;
+
+ -docdir | --docdir | --docdi | --doc | --do)
+ ac_prev=docdir ;;
+@@ -1269,21 +1214,13 @@ do
+ dvidir=$ac_optarg ;;
+
+ -enable-* | --enable-*)
+- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+- ac_useropt_orig=$ac_useropt
+- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+- case $ac_user_opts in
+- *"
+-"enable_$ac_useropt"
+-"*) ;;
+- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+- ac_unrecognized_sep=', ';;
+- esac
+- eval enable_$ac_useropt=\$ac_optarg ;;
++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
++ eval enable_$ac_feature=\$ac_optarg ;;
+
+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -1474,38 +1411,22 @@ do
+ ac_init_version=: ;;
+
+ -with-* | --with-*)
+- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+- ac_useropt_orig=$ac_useropt
+- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+- case $ac_user_opts in
+- *"
+-"with_$ac_useropt"
+-"*) ;;
+- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+- ac_unrecognized_sep=', ';;
+- esac
+- eval with_$ac_useropt=\$ac_optarg ;;
++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
++ eval with_$ac_package=\$ac_optarg ;;
+
+ -without-* | --without-*)
+- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+- ac_useropt_orig=$ac_useropt
+- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+- case $ac_user_opts in
+- *"
+-"with_$ac_useropt"
+-"*) ;;
+- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+- ac_unrecognized_sep=', ';;
+- esac
+- eval with_$ac_useropt=no ;;
++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
++ eval with_$ac_package=no ;;
+
+ --x)
+ # Obsolete; use --with-x.
+@@ -1525,7 +1446,7 @@ do
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
+- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
++ -*) { echo "$as_me: error: unrecognized option: $ac_option
+ Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -1534,16 +1455,16 @@ Try \`$0 --help' for more information." >&2
+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
++ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { (exit 1); exit 1; }; }
+ eval $ac_envvar=\$ac_optarg
+ export $ac_envvar ;;
+
+ *)
+ # FIXME: should be removed in autoconf 3.0.
+- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
++ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ ;;
+
+@@ -1552,38 +1473,22 @@ done
+
+ if test -n "$ac_prev"; then
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
++ { echo "$as_me: error: missing argument to $ac_option" >&2
+ { (exit 1); exit 1; }; }
+ fi
+
+-if test -n "$ac_unrecognized_opts"; then
+- case $enable_option_checking in
+- no) ;;
+- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+- { (exit 1); exit 1; }; } ;;
+- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+- esac
+-fi
+-
+-# Check all directory arguments for consistency.
++# Be sure to have absolute directory names.
+ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ datadir sysconfdir sharedstatedir localstatedir includedir \
+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+ libdir localedir mandir
+ do
+ eval ac_val=\$$ac_var
+- # Remove trailing slashes.
+- case $ac_val in
+- */ )
+- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+- eval $ac_var=\$ac_val;;
+- esac
+- # Be sure to have absolute directory names.
+ case $ac_val in
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
+- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; }
+ done
+
+@@ -1598,7 +1503,7 @@ target=$target_alias
+ if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
++ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used." >&2
+ elif test "x$build_alias" != "x$host_alias"; then
+ cross_compiling=yes
+@@ -1614,10 +1519,10 @@ test "$silent" = yes && exec 6>/dev/null
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+- { $as_echo "$as_me: error: working directory cannot be determined" >&2
++ { echo "$as_me: error: Working directory cannot be determined" >&2
+ { (exit 1); exit 1; }; }
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
++ { echo "$as_me: error: pwd does not report name of working directory" >&2
+ { (exit 1); exit 1; }; }
+
+
+@@ -1625,12 +1530,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+ if test -z "$srcdir"; then
+ ac_srcdir_defaulted=yes
+ # Try the directory containing this script, then the parent directory.
+- ac_confdir=`$as_dirname -- "$as_myself" ||
+-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$as_myself" : 'X\(//\)[^/]' \| \
+- X"$as_myself" : 'X\(//\)$' \| \
+- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_myself" |
++ ac_confdir=`$as_dirname -- "$0" ||
++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$0" : 'X\(//\)[^/]' \| \
++ X"$0" : 'X\(//\)$' \| \
++ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
++echo X"$0" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -1657,12 +1562,12 @@ else
+ fi
+ if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { (exit 1); exit 1; }; }
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
++ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+ { (exit 1); exit 1; }; }
+ pwd)`
+ # When building in place, set srcdir=.
+@@ -1711,9 +1616,9 @@ Configuration:
+
+ Installation directories:
+ --prefix=PREFIX install architecture-independent files in PREFIX
+- [$ac_default_prefix]
++ [$ac_default_prefix]
+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
+- [PREFIX]
++ [PREFIX]
+
+ By default, \`make install' will install all the files in
+ \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
+@@ -1723,25 +1628,25 @@ for instance \`--prefix=\$HOME'.
+ For better control, use the options below.
+
+ Fine tuning of the installation directories:
+- --bindir=DIR user executables [EPREFIX/bin]
+- --sbindir=DIR system admin executables [EPREFIX/sbin]
+- --libexecdir=DIR program executables [EPREFIX/libexec]
+- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+- --libdir=DIR object code libraries [EPREFIX/lib]
+- --includedir=DIR C header files [PREFIX/include]
+- --oldincludedir=DIR C header files for non-gcc [/usr/include]
+- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+- --infodir=DIR info documentation [DATAROOTDIR/info]
+- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+- --mandir=DIR man documentation [DATAROOTDIR/man]
+- --docdir=DIR documentation root [DATAROOTDIR/doc/gnucash]
+- --htmldir=DIR html documentation [DOCDIR]
+- --dvidir=DIR dvi documentation [DOCDIR]
+- --pdfdir=DIR pdf documentation [DOCDIR]
+- --psdir=DIR ps documentation [DOCDIR]
++ --bindir=DIR user executables [EPREFIX/bin]
++ --sbindir=DIR system admin executables [EPREFIX/sbin]
++ --libexecdir=DIR program executables [EPREFIX/libexec]
++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
++ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
++ --libdir=DIR object code libraries [EPREFIX/lib]
++ --includedir=DIR C header files [PREFIX/include]
++ --oldincludedir=DIR C header files for non-gcc [/usr/include]
++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
++ --infodir=DIR info documentation [DATAROOTDIR/info]
++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
++ --mandir=DIR man documentation [DATAROOTDIR/man]
++ --docdir=DIR documentation root [DATAROOTDIR/doc/gnucash]
++ --htmldir=DIR html documentation [DOCDIR]
++ --dvidir=DIR dvi documentation [DOCDIR]
++ --pdfdir=DIR pdf documentation [DOCDIR]
++ --psdir=DIR ps documentation [DOCDIR]
+ _ACEOF
+
+ cat <<\_ACEOF
+@@ -1764,11 +1669,11 @@ if test -n "$ac_init_help"; then
+ cat <<\_ACEOF
+
+ Optional Features:
+- --disable-option-checking ignore unrecognized --enable/--with options
+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors
++ --disable-nls do not use Native Language Support
+ --disable-schemas-install Disable the schemas installation
+ --enable-static[=PKGS] build static libraries [default=no]
+ --enable-shared[=PKGS] build shared libraries [default=yes]
+@@ -1797,7 +1702,8 @@ Optional Features:
+ --enable-html-docs enable HTML generation with doxygen (yes)
+ --enable-latex-docs enable LaTeX documentation generation with doxygen (no)
+ --disable-gui build without the GNOME GUI components of Gnucash
+- --enable-compile-warnings=no/minimum/yes Turn on compiler warnings.
++ --enable-compile-warnings=[no/minimum/yes/maximum/error]
++ Turn on compiler warnings
+ --enable-iso-c Try to warn if code is not ISO C
+ --enable-efence link using efence
+ --disable-deprecated-glib don't use deprecated glib functions
+@@ -1809,8 +1715,10 @@ Optional Features:
+ Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+- --with-gconf-source=sourceaddress Config database for installing schema files.
+- --with-gconf-schema-file-dir=dir Directory for installing schema files.
++ --with-gconf-source=sourceaddress
++ Config database for installing schema files.
++ --with-gconf-schema-file-dir=dir
++ Directory for installing schema files.
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-pic try to use only PIC/non-PIC objects [default=use
+ both]
+@@ -1837,6 +1745,45 @@ Some influential environment variables:
+ F77 Fortran 77 compiler command
+ FFLAGS Fortran 77 compiler flags
+ PKG_CONFIG path to pkg-config utility
++ IGE_MAC_CFLAGS
++ C compiler flags for IGE_MAC, overriding pkg-config
++ IGE_MAC_LIBS
++ linker flags for IGE_MAC, overriding pkg-config
++ GCONF_CFLAGS
++ C compiler flags for GCONF, overriding pkg-config
++ GCONF_LIBS linker flags for GCONF, overriding pkg-config
++ LIBXML2_CFLAGS
++ C compiler flags for LIBXML2, overriding pkg-config
++ LIBXML2_LIBS
++ linker flags for LIBXML2, overriding pkg-config
++ AQBANKING_CFLAGS
++ C compiler flags for AQBANKING, overriding pkg-config
++ AQBANKING_LIBS
++ linker flags for AQBANKING, overriding pkg-config
++ GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
++ GTK_LIBS linker flags for GTK, overriding pkg-config
++ GNOME_CFLAGS
++ C compiler flags for GNOME, overriding pkg-config
++ GNOME_LIBS linker flags for GNOME, overriding pkg-config
++ GDK_PIXBUF_CFLAGS
++ C compiler flags for GDK_PIXBUF, overriding pkg-config
++ GDK_PIXBUF_LIBS
++ linker flags for GDK_PIXBUF, overriding pkg-config
++ GLADE_CFLAGS
++ C compiler flags for GLADE, overriding pkg-config
++ GLADE_LIBS linker flags for GLADE, overriding pkg-config
++ GOFFICE_CFLAGS
++ C compiler flags for GOFFICE, overriding pkg-config
++ GOFFICE_LIBS
++ linker flags for GOFFICE, overriding pkg-config
++ GTKHTML_CFLAGS
++ C compiler flags for GTKHTML, overriding pkg-config
++ GTKHTML_LIBS
++ linker flags for GTKHTML, overriding pkg-config
++ GNOME_PRINT_CFLAGS
++ C compiler flags for GNOME_PRINT, overriding pkg-config
++ GNOME_PRINT_LIBS
++ linker flags for GNOME_PRINT, overriding pkg-config
+
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -1849,17 +1796,15 @@ fi
+ if test "$ac_init_help" = "recursive"; then
+ # If there are subdirs, report their specific --help.
+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+- test -d "$ac_dir" ||
+- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+- continue
++ test -d "$ac_dir" || continue
+ ac_builddir=.
+
+ case "$ac_dir" in
+ .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *)
+- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ # A ".." for each directory in $ac_dir_suffix.
+- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+@@ -1895,7 +1840,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+ echo &&
+ $SHELL "$ac_srcdir/configure" --help=recursive
+ else
+- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi || ac_status=$?
+ cd "$ac_pwd" || { ac_status=$?; break; }
+ done
+@@ -1905,10 +1850,10 @@ test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ gnucash configure 2.2.9
+-generated by GNU Autoconf 2.63
++generated by GNU Autoconf 2.61
+
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1919,7 +1864,7 @@ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by gnucash $as_me 2.2.9, which was
+-generated by GNU Autoconf 2.63. Invocation command line was
++generated by GNU Autoconf 2.61. Invocation command line was
+
+ $ $0 $@
+
+@@ -1955,7 +1900,7 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- $as_echo "PATH: $as_dir"
++ echo "PATH: $as_dir"
+ done
+ IFS=$as_save_IFS
+
+@@ -1990,7 +1935,7 @@ do
+ | -silent | --silent | --silen | --sile | --sil)
+ continue ;;
+ *\'*)
+- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ case $ac_pass in
+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+@@ -2042,12 +1987,11 @@ _ASBOX
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+@@ -2077,9 +2021,9 @@ _ASBOX
+ do
+ eval ac_val=\$$ac_var
+ case $ac_val in
+- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+- $as_echo "$ac_var='\''$ac_val'\''"
++ echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+
+@@ -2094,9 +2038,9 @@ _ASBOX
+ do
+ eval ac_val=\$$ac_var
+ case $ac_val in
+- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+- $as_echo "$ac_var='\''$ac_val'\''"
++ echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+ fi
+@@ -2112,8 +2056,8 @@ _ASBOX
+ echo
+ fi
+ test "$ac_signal" != 0 &&
+- $as_echo "$as_me: caught signal $ac_signal"
+- $as_echo "$as_me: exit $exit_status"
++ echo "$as_me: caught signal $ac_signal"
++ echo "$as_me: exit $exit_status"
+ } >&5
+ rm -f core *.core core.conftest.* &&
+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+@@ -2155,24 +2099,21 @@ _ACEOF
+
+
+ # Let the site file select an alternate cache file if it wants to.
+-# Prefer an explicitly selected file to automatically selected ones.
+-ac_site_file1=NONE
+-ac_site_file2=NONE
++# Prefer explicitly selected file to automatically selected ones.
+ if test -n "$CONFIG_SITE"; then
+- ac_site_file1=$CONFIG_SITE
++ set x "$CONFIG_SITE"
+ elif test "x$prefix" != xNONE; then
+- ac_site_file1=$prefix/share/config.site
+- ac_site_file2=$prefix/etc/config.site
++ set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ else
+- ac_site_file1=$ac_default_prefix/share/config.site
+- ac_site_file2=$ac_default_prefix/etc/config.site
++ set x "$ac_default_prefix/share/config.site" \
++ "$ac_default_prefix/etc/config.site"
+ fi
+-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
++shift
++for ac_site_file
+ do
+- test "x$ac_site_file" = xNONE && continue
+ if test -r "$ac_site_file"; then
+- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
++ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
+ . "$ac_site_file"
+ fi
+@@ -2182,16 +2123,16 @@ if test -r "$cache_file"; then
+ # Some versions of bash will fail to source /dev/null (special
+ # files actually), so we avoid doing that.
+ if test -f "$cache_file"; then
+- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+-$as_echo "$as_me: loading cache $cache_file" >&6;}
++ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
++echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
+ *) . "./$cache_file";;
+ esac
+ fi
+ else
+- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+-$as_echo "$as_me: creating cache $cache_file" >&6;}
++ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
++echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+ fi
+
+@@ -2205,38 +2146,29 @@ for ac_var in $ac_precious_vars; do
+ eval ac_new_val=\$ac_env_${ac_var}_value
+ case $ac_old_set,$ac_new_set in
+ set,)
+- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
++ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,set)
+- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
++ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
++echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,);;
+ *)
+ if test "x$ac_old_val" != "x$ac_new_val"; then
+- # differences in whitespace do not lead to failure.
+- ac_old_val_w=`echo x $ac_old_val`
+- ac_new_val_w=`echo x $ac_new_val`
+- if test "$ac_old_val_w" != "$ac_new_val_w"; then
+- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+- ac_cache_corrupted=:
+- else
+- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+- eval $ac_var=\$ac_old_val
+- fi
+- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
+-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
+-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
++ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
++echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
++ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
++echo "$as_me: former value: $ac_old_val" >&2;}
++ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
++echo "$as_me: current value: $ac_new_val" >&2;}
++ ac_cache_corrupted=:
+ fi;;
+ esac
+ # Pass precious variables to config.status.
+ if test "$ac_new_set" = set; then
+ case $ac_new_val in
+- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *) ac_arg=$ac_var=$ac_new_val ;;
+ esac
+ case " $ac_configure_args " in
+@@ -2246,12 +2178,10 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
+ fi
+ done
+ if $ac_cache_corrupted; then
+- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
++ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
++echo "$as_me: error: changes in the environment can compromise the build" >&2;}
++ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+@@ -2310,8 +2240,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+ fi
+ done
+ if test -z "$ac_aux_dir"; then
+- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
++echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+@@ -2337,12 +2267,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+-# Reject install programs that cannot install multiple files.
+-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-$as_echo_n "checking for a BSD-compatible install... " >&6; }
++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -2371,29 +2300,17 @@ case $as_dir/ in
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+- rm -rf conftest.one conftest.two conftest.dir
+- echo one > conftest.one
+- echo two > conftest.two
+- mkdir conftest.dir
+- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+- test -s conftest.one && test -s conftest.two &&
+- test -s conftest.dir/conftest.one &&
+- test -s conftest.dir/conftest.two
+- then
+- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+- break 3
+- fi
++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++ break 3
+ fi
+ fi
+ done
+ done
+ ;;
+ esac
+-
+ done
+ IFS=$as_save_IFS
+
+-rm -rf conftest.one conftest.two conftest.dir
+
+ fi
+ if test "${ac_cv_path_install+set}" = set; then
+@@ -2406,8 +2323,8 @@ fi
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+-$as_echo "$INSTALL" >&6; }
++{ echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6; }
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -2417,8 +2334,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+-$as_echo_n "checking whether build environment is sane... " >&6; }
++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
+@@ -2441,9 +2358,9 @@ if (
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
++ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" >&5
+-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
++echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -2454,23 +2371,26 @@ then
+ # Ok.
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
++ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+ Check your system clock" >&5
+-$as_echo "$as_me: error: newly created file is older than distributed files!
++echo "$as_me: error: newly created file is older than distributed files!
+ Check your system clock" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ test "$program_prefix" != NONE &&
+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+ test "$program_suffix" != NONE &&
+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+-# Double any \ or $.
++# Double any \ or $. echo might interpret backslashes.
+ # By default was `s,x,x', remove it if useless.
+-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
++cat <<\_ACEOF >conftest.sed
++s/[\\$]/&&/g;s/;s,x,x,$//
++_ACEOF
++program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
++rm -f conftest.sed
+
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+@@ -2481,15 +2401,15 @@ if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
+ else
+ am_missing_run=
+- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
++ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
++echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
++{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
++echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+ if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+@@ -2524,8 +2444,8 @@ fi
+ MKDIR_P="$ac_install_sh -d"
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+-$as_echo "$MKDIR_P" >&6; }
++{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
++echo "${ECHO_T}$MKDIR_P" >&6; }
+
+ mkdir_p="$MKDIR_P"
+ case $mkdir_p in
+@@ -2537,10 +2457,10 @@ for ac_prog in gawk mawk nawk awk
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_AWK+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$AWK"; then
+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
+@@ -2553,7 +2473,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AWK="$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -2564,23 +2484,22 @@ fi
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+-$as_echo "$AWK" >&6; }
++ { echo "$as_me:$LINENO: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+ test -n "$AWK" && break
+ done
+
+-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+-set x ${MAKE-make}
+-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.make <<\_ACEOF
+ SHELL = /bin/sh
+@@ -2597,12 +2516,12 @@ esac
+ rm -f conftest.make
+ fi
+ if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ SET_MAKE=
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+
+@@ -2621,8 +2540,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
++echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+@@ -2677,10 +2596,10 @@ if test "$cross_compiling" != no; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+@@ -2693,7 +2612,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -2704,11 +2623,11 @@ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+-$as_echo "$STRIP" >&6; }
++ { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -2717,10 +2636,10 @@ if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+@@ -2733,7 +2652,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -2744,11 +2663,11 @@ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-$as_echo "$ac_ct_STRIP" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ if test "x$ac_ct_STRIP" = x; then
+@@ -2756,8 +2675,12 @@ fi
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ STRIP=$ac_ct_STRIP
+@@ -2810,10 +2733,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -2826,7 +2749,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -2837,11 +2760,11 @@ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -2850,10 +2773,10 @@ if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -2866,7 +2789,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -2877,11 +2800,11 @@ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-$as_echo "$ac_ct_CC" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ if test "x$ac_ct_CC" = x; then
+@@ -2889,8 +2812,12 @@ fi
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ CC=$ac_ct_CC
+@@ -2903,10 +2830,10 @@ if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -2919,7 +2846,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -2930,11 +2857,11 @@ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -2943,10 +2870,10 @@ fi
+ if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -2964,7 +2891,7 @@ do
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -2987,11 +2914,11 @@ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -3002,10 +2929,10 @@ if test -z "$CC"; then
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -3018,7 +2945,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -3029,11 +2956,11 @@ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -3046,10 +2973,10 @@ if test -z "$CC"; then
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -3062,7 +2989,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -3073,11 +3000,11 @@ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-$as_echo "$ac_ct_CC" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -3089,8 +3016,12 @@ done
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ CC=$ac_ct_CC
+@@ -3100,50 +3031,44 @@ fi
+ fi
+
+
+-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
++echo "$as_me: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ { (exit 1); exit 1; }; }
+
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+-set X $ac_compile
+-ac_compiler=$2
++echo "$as_me:$LINENO: checking for C compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
+ { (ac_try="$ac_compiler --version >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ { (ac_try="$ac_compiler -v >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ { (ac_try="$ac_compiler -V >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -3162,22 +3087,27 @@ main ()
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
++ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
+-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-
+-# The possible output files:
+-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+-
++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
++ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++#
++# List of possible output files, starting from the most likely.
++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
++# only as a last resort. b.out is created by i960 compilers.
++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
++#
++# The IRIX 6 linker writes into existing files which may not be
++# executable, retaining their permissions. Remove them first so a
++# subsequent execution test works.
+ ac_rmfiles=
+ for ac_file in $ac_files
+ do
+ case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+ esac
+ done
+@@ -3188,11 +3118,10 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link_default") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+ # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+@@ -3203,7 +3132,7 @@ for ac_file in $ac_files ''
+ do
+ test -f "$ac_file" || continue
+ case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ ;;
+ [ab].out )
+ # We found the default executable, but exeext='' is most
+@@ -3230,27 +3159,25 @@ else
+ ac_file=''
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
+ if test -z "$ac_file"; then
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C compiler cannot create executables
++echo "$as_me: error: C compiler cannot create executables
+ See \`config.log' for more details." >&2;}
+- { (exit 77); exit 77; }; }; }
++ { (exit 77); exit 77; }; }
+ fi
+
+ ac_exeext=$ac_cv_exeext
+
+ # Check that the compiler produces executables we can run. If not, either
+ # the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+@@ -3259,53 +3186,49 @@ if test "$cross_compiling" != yes; then
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
++ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run C compiled programs.
++echo "$as_me: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ { (exit 1); exit 1; }; }
+ fi
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
++rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+ # Check that the compiler produces executables we can run. If not, either
+ # the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6; }
+
+-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+-$as_echo_n "checking for suffix of executables... " >&6; }
++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
+@@ -3314,33 +3237,31 @@ $as_echo "$ac_try_echo") >&5
+ for ac_file in conftest.exe conftest conftest.*; do
+ test -f "$ac_file" || continue
+ case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ break;;
+ * ) break;;
+ esac
+ done
+ else
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ { (exit 1); exit 1; }; }
+ fi
+
+ rm -f conftest$ac_cv_exeext
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-$as_echo "$ac_cv_exeext" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++echo "${ECHO_T}$ac_cv_exeext" >&6; }
+
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+-$as_echo_n "checking for suffix of object files... " >&6; }
++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+ if test "${ac_cv_objext+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -3363,43 +3284,40 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ for ac_file in conftest.o conftest.obj conftest.*; do
+ test -f "$ac_file" || continue;
+ case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+ break;;
+ esac
+ done
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
++echo "$as_me: error: cannot compute suffix of object files: cannot compile
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ { (exit 1); exit 1; }; }
+ fi
+
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+-$as_echo "$ac_cv_objext" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6; }
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -3425,21 +3343,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_compiler_gnu=no
+@@ -3449,19 +3366,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+-if test $ac_compiler_gnu = yes; then
+- GCC=yes
+-else
+- GCC=
+-fi
++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
++GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-$as_echo_n "checking whether $CC accepts -g... " >&6; }
++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+@@ -3488,21 +3401,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ CFLAGS=""
+@@ -3527,21 +3439,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_c_werror_flag=$ac_save_c_werror_flag
+@@ -3567,21 +3478,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+@@ -3596,8 +3506,8 @@ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-$as_echo "$ac_cv_prog_cc_g" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+@@ -3613,10 +3523,10 @@ else
+ CFLAGS=
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cc_c89+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+@@ -3687,21 +3597,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_c89=$ac_arg
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+@@ -3717,15 +3626,15 @@ fi
+ # AC_CACHE_VAL
+ case "x$ac_cv_prog_cc_c89" in
+ x)
+- { $as_echo "$as_me:$LINENO: result: none needed" >&5
+-$as_echo "none needed" >&6; } ;;
++ { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
+ xno)
+- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+-$as_echo "unsupported" >&6; } ;;
++ { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
+
+
+@@ -3746,8 +3655,8 @@ am__doit:
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+-$as_echo_n "checking for style of include used by $am_make... " >&6; }
++{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
++echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+ am__include="#"
+ am__quote=
+ _am_result=none
+@@ -3774,8 +3683,8 @@ if test "$am__include" = "#"; then
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+-$as_echo "$_am_result" >&6; }
++{ echo "$as_me:$LINENO: result: $_am_result" >&5
++echo "${ECHO_T}$_am_result" >&6; }
+ rm -f confinc confmf
+
+ # Check whether --enable-dependency-tracking was given.
+@@ -3799,10 +3708,10 @@ fi
+
+ depcc="$CC" am_compiler_list=
+
+-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-$as_echo_n "checking dependency style of $depcc... " >&6; }
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+@@ -3890,8 +3799,8 @@ else
+ fi
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+@@ -3906,20 +3815,798 @@ fi
+
+
+
++cat >>confdefs.h <<\_ACEOF
++#define _GNU_SOURCE 1
++_ACEOF
++
++
++
++ { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
++echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
++ # Check whether --enable-nls was given.
++if test "${enable_nls+set}" = set; then
++ enableval=$enable_nls; USE_NLS=$enableval
++else
++ USE_NLS=yes
++fi
++
++ { echo "$as_me:$LINENO: result: $USE_NLS" >&5
++echo "${ECHO_T}$USE_NLS" >&6; }
++
++
++
++
++
++case "$am__api_version" in
++ 1.01234)
++ { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
++echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
++ { (exit 1); exit 1; }; }
++ ;;
++ *)
++ ;;
++esac
++
++if test -n ""; then
++ { echo "$as_me:$LINENO: checking for intltool >= " >&5
++echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6; }
++
++ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
++ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
++ INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
++
++ { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
++echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
++ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
++ { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool or later." >&5
++echo "$as_me: error: Your intltool is too old. You need intltool or later." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++# Extract the first word of "intltool-update", so it can be a program name with args.
++set dummy intltool-update; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $INTLTOOL_UPDATE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
++if test -n "$INTLTOOL_UPDATE"; then
++ { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
++echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++# Extract the first word of "intltool-merge", so it can be a program name with args.
++set dummy intltool-merge; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $INTLTOOL_MERGE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
++if test -n "$INTLTOOL_MERGE"; then
++ { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
++echo "${ECHO_T}$INTLTOOL_MERGE" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++# Extract the first word of "intltool-extract", so it can be a program name with args.
++set dummy intltool-extract; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $INTLTOOL_EXTRACT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
++if test -n "$INTLTOOL_EXTRACT"; then
++ { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
++echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
++ { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
++echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
++ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
++ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++# Check the gettext tools to make sure they are GNU
++# Extract the first word of "xgettext", so it can be a program name with args.
++set dummy xgettext; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_XGETTEXT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $XGETTEXT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++XGETTEXT=$ac_cv_path_XGETTEXT
++if test -n "$XGETTEXT"; then
++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++# Extract the first word of "msgmerge", so it can be a program name with args.
++set dummy msgmerge; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_MSGMERGE+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $MSGMERGE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++MSGMERGE=$ac_cv_path_MSGMERGE
++if test -n "$MSGMERGE"; then
++ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
++echo "${ECHO_T}$MSGMERGE" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++# Extract the first word of "msgfmt", so it can be a program name with args.
++set dummy msgfmt; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_MSGFMT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $MSGFMT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++MSGFMT=$ac_cv_path_MSGFMT
++if test -n "$MSGFMT"; then
++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++# Extract the first word of "gmsgfmt", so it can be a program name with args.
++set dummy gmsgfmt; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_GMSGFMT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $GMSGFMT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
++ ;;
++esac
++fi
++GMSGFMT=$ac_cv_path_GMSGFMT
++if test -n "$GMSGFMT"; then
++ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++echo "${ECHO_T}$GMSGFMT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++# Extract the first word of "perl", so it can be a program name with args.
++set dummy perl; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $INTLTOOL_PERL in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
++if test -n "$INTLTOOL_PERL"; then
++ { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
++echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++if test -z "$INTLTOOL_PERL"; then
++ { { echo "$as_me:$LINENO: error: perl not found" >&5
++echo "$as_me: error: perl not found" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++{ echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
++echo $ECHO_N "checking for perl >= 5.8.1... $ECHO_C" >&6; }
++$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
++if test $? -ne 0; then
++ { { echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
++echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++else
++ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
++ { echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
++echo "${ECHO_T}$IT_PERL_VERSION" >&6; }
++fi
++if test "x" != "xno-xml"; then
++ { echo "$as_me:$LINENO: checking for XML::Parser" >&5
++echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
++ { echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6; }
++ else
++ { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
++echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++fi
++
++# Substitute ALL_LINGUAS so we can use it in po/Makefile
++
++
++# Set DATADIRNAME correctly if it is not set yet
++# (copied from glib-gettext.m4)
++if test -z "$DATADIRNAME"; then
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++extern int _nl_msg_cat_cntr;
++ return _nl_msg_cat_cntr
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ DATADIRNAME=share
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ case $host in
++ *-*-solaris*)
++ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
++echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
++if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
++ For example, HP-UX 11i <limits.h> declares gettimeofday. */
++#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
++
++/* System header to define __stub macros and hopefully few prototypes,
++ which can conflict with char bind_textdomain_codeset (); below.
++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ <limits.h> exists even on freestanding compilers. */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef bind_textdomain_codeset
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char bind_textdomain_codeset ();
++/* The GNU C library defines this for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
++choke me
++#endif
++
++int
++main ()
++{
++return bind_textdomain_codeset ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_func_bind_textdomain_codeset=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_func_bind_textdomain_codeset=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
++echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
++if test $ac_cv_func_bind_textdomain_codeset = yes; then
++ DATADIRNAME=share
++else
++ DATADIRNAME=lib
++fi
++
++ ;;
++ *)
++ DATADIRNAME=lib
++ ;;
++ esac
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++
++
++
++
++
++
++
++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++ else
++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++ fi
++
++
++# Check whether --with-gconf-source was given.
++if test "${with_gconf_source+set}" = set; then
++ withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
++fi
++
++
++
++ { echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
++echo "${ECHO_T}Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
++
++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++ fi
++
++
++# Check whether --with-gconf-schema-file-dir was given.
++if test "${with_gconf_schema_file_dir+set}" = set; then
++ withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
++fi
++
++
++
++ { echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
++echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
++
++ # Check whether --enable-schemas-install was given.
++if test "${enable_schemas_install+set}" = set; then
++ enableval=$enable_schemas_install; case ${enableval} in
++ yes|no) ;;
++ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
++echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
++ { (exit 1); exit 1; }; } ;;
++ esac
++fi
++
++ if test "$enable_schemas_install" != no; then
++ GCONF_SCHEMAS_INSTALL_TRUE=
++ GCONF_SCHEMAS_INSTALL_FALSE='#'
++else
++ GCONF_SCHEMAS_INSTALL_TRUE='#'
++ GCONF_SCHEMAS_INSTALL_FALSE=
++fi
++
++
++
++# Override gconf default install locations. The default is to always
++# put them into /etc. This change puts them into $(prefix)/etc.
++if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++ GCONF_SCHEMA_CONFIG_SOURCE="xml::${sysconfdir}/gconf/gconf.xml.defaults"
++fi
++GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY=`echo $GCONF_SCHEMA_CONFIG_SOURCE | cut -d ':' -f 3`
++
++
++
++
++
++
++
++
++cat >>confdefs.h <<_ACEOF
++#define GNUCASH_MAJOR_VERSION $GNUCASH_MAJOR_VERSION
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++#define GNUCASH_MINOR_VERSION $GNUCASH_MINOR_VERSION
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++#define GNUCASH_MICRO_VERSION $GNUCASH_MICRO_VERSION
++_ACEOF
++
++
++ALL_LINGUAS="ca cs da de de_CH el en_GB es_NI es eu fi fr he hu it ja nb ne nl pl pt_BR pt ro ru rw sk sv ta tr uk vi zh_CN zh_TW"
++
++GETTEXT_PACKAGE=gnucash
++
++
++cat >>confdefs.h <<_ACEOF
++#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
++_ACEOF
++
++
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+-$as_echo_n "checking how to run the C preprocessor... " >&6; }
++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+ fi
+ if test -z "$CPP"; then
+ if test "${ac_cv_prog_CPP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+@@ -3951,21 +4638,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+@@ -3989,14 +4675,13 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+@@ -4004,7 +4689,7 @@ $as_echo "$ac_try_echo") >&5
+ # Broken: success on invalid input.
+ continue
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+@@ -4029,8 +4714,8 @@ fi
+ else
+ ac_cv_prog_CPP=$CPP
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+-$as_echo "$CPP" >&6; }
++{ echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6; }
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+ do
+@@ -4058,21 +4743,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+@@ -4096,14 +4780,13 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+@@ -4111,7 +4794,7 @@ $as_echo "$ac_try_echo") >&5
+ # Broken: success on invalid input.
+ continue
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+@@ -4127,13 +4810,11 @@ rm -f conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ { (exit 1); exit 1; }; }
+ fi
+
+ ac_ext=c
+@@ -4143,37 +4824,42 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
++if test "${ac_cv_path_GREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ # Extract the first word of "grep ggrep" to use in msg output
++if test -z "$GREP"; then
++set dummy grep ggrep; ac_prog_name=$2
+ if test "${ac_cv_path_GREP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -z "$GREP"; then
+ ac_path_GREP_found=false
+- # Loop through the user's path and test for each of PROGNAME-LIST
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in grep ggrep; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+-# Check for GNU ac_path_GREP and select it if it is found.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
++ # Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+ case `"$ac_path_GREP" --version 2>&1` in
+ *GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+ *)
+ ac_count=0
+- $as_echo_n 0123456789 >"conftest.in"
++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+- $as_echo 'GREP' >> "conftest.nl"
++ echo 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+@@ -4188,60 +4874,74 @@ case `"$ac_path_GREP" --version 2>&1` in
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+ esac
+
+- $ac_path_GREP_found && break 3
+- done
++
++ $ac_path_GREP_found && break 3
+ done
+ done
++
++done
+ IFS=$as_save_IFS
+- if test -z "$ac_cv_path_GREP"; then
+- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++
++
++fi
++
++GREP="$ac_cv_path_GREP"
++if test -z "$GREP"; then
++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+- fi
++fi
++
+ else
+ ac_cv_path_GREP=$GREP
+ fi
+
++
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+-$as_echo "$ac_cv_path_GREP" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
++echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+-$as_echo_n "checking for egrep... " >&6; }
++{ echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+ if test "${ac_cv_path_EGREP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+- if test -z "$EGREP"; then
++ # Extract the first word of "egrep" to use in msg output
++if test -z "$EGREP"; then
++set dummy egrep; ac_prog_name=$2
++if test "${ac_cv_path_EGREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ ac_path_EGREP_found=false
+- # Loop through the user's path and test for each of PROGNAME-LIST
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in egrep; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+-# Check for GNU ac_path_EGREP and select it if it is found.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++ # Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+ case `"$ac_path_EGREP" --version 2>&1` in
+ *GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+ *)
+ ac_count=0
+- $as_echo_n 0123456789 >"conftest.in"
++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+- $as_echo 'EGREP' >> "conftest.nl"
++ echo 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+@@ -4256,31 +4956,40 @@ case `"$ac_path_EGREP" --version 2>&1` in
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+ esac
+
+- $ac_path_EGREP_found && break 3
+- done
++
++ $ac_path_EGREP_found && break 3
+ done
+ done
++
++done
+ IFS=$as_save_IFS
+- if test -z "$ac_cv_path_EGREP"; then
+- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++
++
++fi
++
++EGREP="$ac_cv_path_EGREP"
++if test -z "$EGREP"; then
++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+- fi
++fi
++
+ else
+ ac_cv_path_EGREP=$EGREP
+ fi
+
++
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+-$as_echo "$ac_cv_path_EGREP" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-$as_echo_n "checking for ANSI C header files... " >&6; }
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -4307,21 +5016,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_stdc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_stdc=no
+@@ -4413,40 +5121,37 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+
+
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-$as_echo "$ac_cv_header_stdc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -4468,11 +5173,11 @@ fi
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -4490,21 +5195,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
+@@ -4512,802 +5216,37 @@ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+-
+- if test "${ac_cv_header_minix_config_h+set}" = set; then
+- { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+-$as_echo_n "checking for minix/config.h... " >&6; }
+-if test "${ac_cv_header_minix_config_h+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+-$as_echo "$ac_cv_header_minix_config_h" >&6; }
+-else
+- # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+-$as_echo_n "checking minix/config.h usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <minix/config.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+-$as_echo_n "checking minix/config.h presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <minix/config.h>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
+- ( cat <<\_ASBOX
+-## ---------------------------------------- ##
+-## Report this to gnucash-devel at gnucash.org ##
+-## ---------------------------------------- ##
+-_ASBOX
+- ) | sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+-$as_echo_n "checking for minix/config.h... " >&6; }
+-if test "${ac_cv_header_minix_config_h+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_cv_header_minix_config_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+-$as_echo "$ac_cv_header_minix_config_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_minix_config_h" = x""yes; then
+- MINIX=yes
+-else
+- MINIX=
+-fi
+-
+-
+- if test "$MINIX" = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define _POSIX_SOURCE 1
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define _POSIX_1_SOURCE 2
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define _MINIX 1
+-_ACEOF
+-
+- fi
+-
+-
+-
+- { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-# define __EXTENSIONS__ 1
+- $ac_includes_default
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_cv_safe_to_define___extensions__=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_safe_to_define___extensions__=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+- test $ac_cv_safe_to_define___extensions__ = yes &&
+- cat >>confdefs.h <<\_ACEOF
+-#define __EXTENSIONS__ 1
+-_ACEOF
+-
+- cat >>confdefs.h <<\_ACEOF
+-#define _ALL_SOURCE 1
+-_ACEOF
+-
+- cat >>confdefs.h <<\_ACEOF
+-#define _GNU_SOURCE 1
+-_ACEOF
+-
+- cat >>confdefs.h <<\_ACEOF
+-#define _POSIX_PTHREAD_SEMANTICS 1
+-_ACEOF
+-
+- cat >>confdefs.h <<\_ACEOF
+-#define _TANDEM_SOURCE 1
+-_ACEOF
+-
+-
+-
+-case "$am__api_version" in
+- 1.01234)
+- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+- { (exit 1); exit 1; }; }
+- ;;
+- *)
+- ;;
+-esac
+-
+-if test -n ""; then
+- { $as_echo "$as_me:$LINENO: checking for intltool >= " >&5
+-$as_echo_n "checking for intltool >= ... " >&6; }
+-
+- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+- INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+-
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+-$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
+- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool or later." >&5
+-$as_echo "$as_me: error: Your intltool is too old. You need intltool or later." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-
+- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
+- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
+- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-# Check the gettext tools to make sure they are GNU
+-# Extract the first word of "xgettext", so it can be a program name with args.
+-set dummy xgettext; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- case $XGETTEXT in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- ;;
+-esac
+-fi
+-XGETTEXT=$ac_cv_path_XGETTEXT
+-if test -n "$XGETTEXT"; then
+- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+-$as_echo "$XGETTEXT" >&6; }
+-else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-# Extract the first word of "msgmerge", so it can be a program name with args.
+-set dummy msgmerge; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGMERGE+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- case $MSGMERGE in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- ;;
+-esac
+-fi
+-MSGMERGE=$ac_cv_path_MSGMERGE
+-if test -n "$MSGMERGE"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+-$as_echo "$MSGMERGE" >&6; }
+-else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-# Extract the first word of "msgfmt", so it can be a program name with args.
+-set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGFMT+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- case $MSGFMT in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+
+- ;;
+-esac
+ fi
+-MSGFMT=$ac_cv_path_MSGFMT
+-if test -n "$MSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+-$as_echo "$MSGFMT" >&6; }
+-else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-
+-# Use the tools built into the package, not the ones that are installed.
+-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
+-
+-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
+
+-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
+-
+-
+-# Extract the first word of "perl", so it can be a program name with args.
+-set dummy perl; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- case $INTLTOOL_PERL in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+ done
+-done
+-IFS=$as_save_IFS
+-
+- ;;
+-esac
+-fi
+-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+-if test -n "$INTLTOOL_PERL"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
+-$as_echo "$INTLTOOL_PERL" >&6; }
+-else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-if test -z "$INTLTOOL_PERL"; then
+- { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
+-$as_echo "$as_me: error: perl not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+- { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
+-$as_echo "$as_me: error: perl 5.x required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-if test "x" != "xno-xml"; then
+- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
+-$as_echo_n "checking for XML::Parser... " >&6; }
+- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+- { $as_echo "$as_me:$LINENO: result: ok" >&5
+-$as_echo "ok" >&6; }
+- else
+- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
+- fi
+-fi
+-
+-# Substitute ALL_LINGUAS so we can use it in po/Makefile
+-
+-
+-# Set DATADIRNAME correctly if it is not set yet
+-# (copied from glib-gettext.m4)
+-if test -z "$DATADIRNAME"; then
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-extern int _nl_msg_cat_cntr;
+- return _nl_msg_cat_cntr
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- DATADIRNAME=share
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- case $host in
+- *-*-solaris*)
+- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
+-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char bind_textdomain_codeset (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef bind_textdomain_codeset
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char bind_textdomain_codeset ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return bind_textdomain_codeset ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_func_bind_textdomain_codeset=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_bind_textdomain_codeset=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
+- DATADIRNAME=share
+-else
+- DATADIRNAME=lib
+-fi
+-
+- ;;
+- *)
+- DATADIRNAME=lib
+- ;;
+- esac
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-
+-
+-
+-
+-
+-ac_config_commands="$ac_config_commands intltool"
+-
+-
+-
+-
+-
+- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+- else
+- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
+- fi
+-
+-
+-# Check whether --with-gconf-source was given.
+-if test "${with_gconf_source+set}" = set; then
+- withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
+-fi
+-
+-
+-
+- { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
+-$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
+-
+- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+- fi
+-
+-
+-# Check whether --with-gconf-schema-file-dir was given.
+-if test "${with_gconf_schema_file_dir+set}" = set; then
+- withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
+-fi
+-
+-
+-
+- { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
+-$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
+-
+- # Check whether --enable-schemas-install was given.
+-if test "${enable_schemas_install+set}" = set; then
+- enableval=$enable_schemas_install; case ${enableval} in
+- yes|no) ;;
+- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
+-$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
+- { (exit 1); exit 1; }; } ;;
+- esac
+-fi
+-
+- if test "$enable_schemas_install" != no; then
+- GCONF_SCHEMAS_INSTALL_TRUE=
+- GCONF_SCHEMAS_INSTALL_FALSE='#'
+-else
+- GCONF_SCHEMAS_INSTALL_TRUE='#'
+- GCONF_SCHEMAS_INSTALL_FALSE=
+-fi
+-
+-
+-
+-# Override gconf default install locations. The default is to always
+-# put them into /etc. This change puts them into $(prefix)/etc.
+-if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+- GCONF_SCHEMA_CONFIG_SOURCE="xml::${sysconfdir}/gconf/gconf.xml.defaults"
+-fi
+-GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY=`echo $GCONF_SCHEMA_CONFIG_SOURCE | cut -d ':' -f 3`
+-
+-
+-
+-
+-
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define GNUCASH_MAJOR_VERSION $GNUCASH_MAJOR_VERSION
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define GNUCASH_MINOR_VERSION $GNUCASH_MINOR_VERSION
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define GNUCASH_MICRO_VERSION $GNUCASH_MICRO_VERSION
+-_ACEOF
+-
+-
+-ALL_LINGUAS="ca cs da de de_CH el en_GB es_NI es eu fi fr he hu it ja nb ne nl pl pt_BR pt ro ru rw sk sv ta tr uk vi zh_CN zh_TW"
+-
+-GETTEXT_PACKAGE=gnucash
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
+-_ACEOF
+
+
+
+
+ for ac_header in locale.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -5323,33 +5262,32 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -5363,52 +5301,51 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to gnucash-devel at gnucash.org ##
+@@ -5417,24 +5354,21 @@ _ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -5442,10 +5376,10 @@ fi
+ done
+
+ if test $ac_cv_header_locale_h = yes; then
+- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+-$as_echo_n "checking for LC_MESSAGES... " >&6; }
++ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
++echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
+ if test "${am_cv_val_LC_MESSAGES+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -5468,35 +5402,31 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ am_cv_val_LC_MESSAGES=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ am_cv_val_LC_MESSAGES=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+-$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
++{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
++echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
+ if test $am_cv_val_LC_MESSAGES = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -5515,17 +5445,17 @@ _ACEOF
+ INTLLIBS=
+
+ if test "${ac_cv_header_libintl_h+set}" = set; then
+- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
+-$as_echo_n "checking for libintl.h... " >&6; }
++ { echo "$as_me:$LINENO: checking for libintl.h" >&5
++echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_libintl_h+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+-$as_echo "$ac_cv_header_libintl_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
++echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
+-$as_echo_n "checking libintl.h usability... " >&6; }
++{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
++echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -5541,33 +5471,32 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
+-$as_echo_n "checking libintl.h presence... " >&6; }
++{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
++echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -5581,52 +5510,51 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to gnucash-devel at gnucash.org ##
+@@ -5635,28 +5563,28 @@ _ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
+-$as_echo_n "checking for libintl.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for libintl.h" >&5
++echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_libintl_h+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_libintl_h=$ac_header_preproc
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+-$as_echo "$ac_cv_header_libintl_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
++echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
+
+ fi
+-if test "x$ac_cv_header_libintl_h" = x""yes; then
++if test $ac_cv_header_libintl_h = yes; then
+ gt_cv_func_dgettext_libintl="no"
+ libintl_extra_libs=""
+
+ #
+ # First check in libc
+ #
+- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
+-$as_echo_n "checking for ngettext in libc... " >&6; }
++ { echo "$as_me:$LINENO: checking for ngettext in libc" >&5
++echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }
+ if test "${gt_cv_func_ngettext_libc+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -5681,42 +5609,38 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ gt_cv_func_ngettext_libc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ gt_cv_func_ngettext_libc=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
+-$as_echo "$gt_cv_func_ngettext_libc" >&6; }
++{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
++echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
+
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
+-$as_echo_n "checking for dgettext in libc... " >&6; }
++ { echo "$as_me:$LINENO: checking for dgettext in libc" >&5
++echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
+ if test "${gt_cv_func_dgettext_libc+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -5741,47 +5665,43 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ gt_cv_func_dgettext_libc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ gt_cv_func_dgettext_libc=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
+-$as_echo "$gt_cv_func_dgettext_libc" >&6; }
++{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
++echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
+ fi
+
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+
+ for ac_func in bind_textdomain_codeset
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -5834,42 +5754,35 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -5884,10 +5797,10 @@ done
+ || test "$gt_cv_func_ngettext_libc" != "yes" \
+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+
+- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
+-$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
++ { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
++echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+@@ -5919,41 +5832,37 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_intl_bindtextdomain=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_intl_bindtextdomain=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
+-$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
+-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+-$as_echo_n "checking for ngettext in -lintl... " >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
++echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
++if test $ac_cv_lib_intl_bindtextdomain = yes; then
++ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_intl_ngettext+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+@@ -5985,41 +5894,37 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_intl_ngettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_intl_ngettext=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+-$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
+-$as_echo_n "checking for dgettext in -lintl... " >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
++if test $ac_cv_lib_intl_ngettext = yes; then
++ { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
++echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_intl_dgettext+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+@@ -6051,37 +5956,33 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_intl_dgettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_intl_dgettext=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
+-$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
++echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }
++if test $ac_cv_lib_intl_dgettext = yes; then
+ gt_cv_func_dgettext_libintl=yes
+ fi
+
+@@ -6091,14 +5992,14 @@ fi
+
+
+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
+-$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
+- { $as_echo "$as_me:$LINENO: result: " >&5
+-$as_echo "" >&6; }
+- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+-$as_echo_n "checking for ngettext in -lintl... " >&6; }
++ { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
++echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: result: " >&5
++echo "${ECHO_T}" >&6; }
++ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_intl_ngettext+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl -liconv $LIBS"
+@@ -6130,41 +6031,37 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_intl_ngettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_intl_ngettext=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+-$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
+-$as_echo_n "checking for dcgettext in -lintl... " >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
++if test $ac_cv_lib_intl_ngettext = yes; then
++ { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
++echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl -liconv $LIBS"
+@@ -6196,37 +6093,33 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_intl_dcgettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_intl_dcgettext=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
+-$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
++echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }
++if test $ac_cv_lib_intl_dcgettext = yes; then
+ gt_cv_func_dgettext_libintl=yes
+ libintl_extra_libs=-liconv
+ else
+@@ -6251,11 +6144,11 @@ fi
+
+ for ac_func in bind_textdomain_codeset
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -6308,42 +6201,35 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -6379,10 +6265,10 @@ _ACEOF
+
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_MSGFMT+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case "$MSGFMT" in
+ /*)
+@@ -6406,11 +6292,11 @@ esac
+ fi
+ MSGFMT="$ac_cv_path_MSGFMT"
+ if test "$MSGFMT" != "no"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+-$as_echo "$MSGFMT" >&6; }
++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ if test "$MSGFMT" != "no"; then
+ glib_save_LIBS="$LIBS"
+@@ -6418,11 +6304,11 @@ fi
+
+ for ac_func in dcgettext
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -6475,50 +6361,43 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+ done
+
+ MSGFMT_OPTS=
+- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
+-$as_echo_n "checking if msgfmt accepts -c... " >&6; }
++ { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
++echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
+ cat >conftest.foo <<_ACEOF
+
+ msgid ""
+@@ -6532,25 +6411,25 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+
+ _ACEOF
+-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
++if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-else { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++else { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ echo "$as_me: failed input was:" >&5
+ sed 's/^/| /' conftest.foo >&5
+ fi
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GMSGFMT+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $GMSGFMT in
+ [\\/]* | ?:[\\/]*)
+@@ -6565,7 +6444,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -6578,20 +6457,20 @@ esac
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+ if test -n "$GMSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+-$as_echo "$GMSGFMT" >&6; }
++ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++echo "${ECHO_T}$GMSGFMT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+ # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_XGETTEXT+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case "$XGETTEXT" in
+ /*)
+@@ -6615,11 +6494,11 @@ esac
+ fi
+ XGETTEXT="$ac_cv_path_XGETTEXT"
+ if test "$XGETTEXT" != ":"; then
+- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+-$as_echo "$XGETTEXT" >&6; }
++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -6644,33 +6523,30 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ CATOBJEXT=.gmo
+ DATADIRNAME=share
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ case $host in
+ *-*-solaris*)
+- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
++ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
++echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
+ if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -6723,36 +6599,32 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_bind_textdomain_codeset=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_bind_textdomain_codeset=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
++echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
++if test $ac_cv_func_bind_textdomain_codeset = yes; then
+ CATOBJEXT=.gmo
+ DATADIRNAME=share
+ else
+@@ -6768,7 +6640,6 @@ fi
+ esac
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$glib_save_LIBS"
+@@ -6794,8 +6665,8 @@ _ACEOF
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ : ;
+ else
+- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+-$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
++ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
++echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
+ XGETTEXT=":"
+ fi
+ fi
+@@ -6827,8 +6698,8 @@ $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
+ else
+- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
+-$as_echo_n "checking for catalogs to be installed... " >&6; }
++ { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
++echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
+ NEW_LINGUAS=
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+@@ -6852,8 +6723,8 @@ $as_echo_n "checking for catalogs to be installed... " >&6; }
+ fi
+ done
+ LINGUAS=$NEW_LINGUAS
+- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
+-$as_echo "$LINGUAS" >&6; }
++ { echo "$as_me:$LINENO: result: $LINGUAS" >&5
++echo "${ECHO_T}$LINGUAS" >&6; }
+ fi
+
+ if test -n "$LINGUAS"; then
+@@ -6904,12 +6775,11 @@ $as_echo "$LINGUAS" >&6; }
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+-# Reject install programs that cannot install multiple files.
+-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-$as_echo_n "checking for a BSD-compatible install... " >&6; }
++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -6938,29 +6808,17 @@ case $as_dir/ in
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+- rm -rf conftest.one conftest.two conftest.dir
+- echo one > conftest.one
+- echo two > conftest.two
+- mkdir conftest.dir
+- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+- test -s conftest.one && test -s conftest.two &&
+- test -s conftest.dir/conftest.one &&
+- test -s conftest.dir/conftest.two
+- then
+- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+- break 3
+- fi
++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++ break 3
+ fi
+ fi
+ done
+ done
+ ;;
+ esac
+-
+ done
+ IFS=$as_save_IFS
+
+-rm -rf conftest.one conftest.two conftest.dir
+
+ fi
+ if test "${ac_cv_path_install+set}" = set; then
+@@ -6973,8 +6831,8 @@ fi
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+-$as_echo "$INSTALL" >&6; }
++{ echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6; }
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -7064,34 +6922,34 @@ fi
+
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
++echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+-$as_echo_n "checking build system type... " >&6; }
++{ echo "$as_me:$LINENO: checking build system type" >&5
++echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+ if test "${ac_cv_build+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_build_alias=$build_alias
+ test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ test "x$ac_build_alias" = x &&
+- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
++echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+-$as_echo "$ac_cv_build" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++echo "${ECHO_T}$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
++echo "$as_me: error: invalid value of canonical build" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+ build=$ac_cv_build
+@@ -7108,27 +6966,27 @@ IFS=$ac_save_IFS
+ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+-$as_echo_n "checking host system type... " >&6; }
++{ echo "$as_me:$LINENO: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+ if test "${ac_cv_host+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+ else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+-$as_echo "$ac_cv_host" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++echo "${ECHO_T}$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
++echo "$as_me: error: invalid value of canonical host" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+ host=$ac_cv_host
+@@ -7145,10 +7003,10 @@ IFS=$ac_save_IFS
+ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
++{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
++echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+ if test "${lt_cv_path_SED+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ # Loop through the user's path and test for sed and gsed.
+ # Then use that list of sed's as ones to test for truncation.
+@@ -7201,8 +7059,8 @@ fi
+
+ SED=$lt_cv_path_SED
+
+-{ $as_echo "$as_me:$LINENO: result: $SED" >&5
+-$as_echo "$SED" >&6; }
++{ echo "$as_me:$LINENO: result: $SED" >&5
++echo "${ECHO_T}$SED" >&6; }
+
+
+ # Check whether --with-gnu-ld was given.
+@@ -7215,8 +7073,8 @@ fi
+ ac_prog=ld
+ if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-$as_echo_n "checking for ld used by $CC... " >&6; }
++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+@@ -7245,14 +7103,14 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
+ ;;
+ esac
+ elif test "$with_gnu_ld" = yes; then
+- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+-$as_echo_n "checking for GNU ld... " >&6; }
++ { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-$as_echo_n "checking for non-GNU ld... " >&6; }
++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -z "$LD"; then
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+@@ -7282,19 +7140,19 @@ fi
+
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+- { $as_echo "$as_me:$LINENO: result: $LD" >&5
+-$as_echo "$LD" >&6; }
++ { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+@@ -7306,20 +7164,20 @@ case `$LD -v 2>&1 </dev/null` in
+ ;;
+ esac
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+-$as_echo_n "checking for $LD option to reload object files... " >&6; }
++{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+ if test "${lt_cv_ld_reload_flag+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_ld_reload_flag='-r'
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+-$as_echo "$lt_cv_ld_reload_flag" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+ reload_flag=$lt_cv_ld_reload_flag
+ case $reload_flag in
+ "" | " "*) ;;
+@@ -7336,10 +7194,10 @@ case $host_os in
+ ;;
+ esac
+
+-{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+-$as_echo_n "checking for BSD-compatible nm... " >&6; }
++{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+ if test "${lt_cv_path_NM+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$NM"; then
+ # Let the user override the test.
+@@ -7385,25 +7243,25 @@ else
+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+-$as_echo "$lt_cv_path_NM" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
++echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+ NM="$lt_cv_path_NM"
+
+-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+-$as_echo_n "checking whether ln -s works... " >&6; }
++{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+ LN_S=$as_ln_s
+ if test "$LN_S" = "ln -s"; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+-$as_echo "no, using $LN_S" >&6; }
++ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6; }
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
++echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_file_magic_cmd='$MAGIC_CMD'
+ lt_cv_file_magic_test_file=
+@@ -7586,8 +7444,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ esac
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+-$as_echo "$lt_cv_deplibs_check_method" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
+ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -7620,7 +7478,7 @@ ia64-*-hpux*)
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *ELF-32*)
+@@ -7635,11 +7493,11 @@ ia64-*-hpux*)
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 7638 "configure"' > conftest.$ac_ext
++ echo '#line 7496 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ case `/usr/bin/file conftest.$ac_objext` in
+@@ -7677,7 +7535,7 @@ s390*-*linux*|sparc*-*linux*)
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+@@ -7700,6 +7558,7 @@ s390*-*linux*|sparc*-*linux*)
+ esac
+ ;;
+ *64-bit*)
++ libsuff=64
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+@@ -7727,10 +7586,10 @@ s390*-*linux*|sparc*-*linux*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
++ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+ if test "${lt_cv_cc_needs_belf+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7759,30 +7618,26 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ lt_cv_cc_needs_belf=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ lt_cv_cc_needs_belf=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
+@@ -7792,8 +7647,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+-$as_echo "$lt_cv_cc_needs_belf" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+ CFLAGS="$SAVE_CFLAGS"
+@@ -7805,7 +7660,7 @@ sparc*-*solaris*)
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+@@ -7827,10 +7682,10 @@ sparc*-*solaris*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_DLLTOOL+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$DLLTOOL"; then
+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+@@ -7843,7 +7698,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -7854,11 +7709,11 @@ fi
+ fi
+ DLLTOOL=$ac_cv_prog_DLLTOOL
+ if test -n "$DLLTOOL"; then
+- { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
+-$as_echo "$DLLTOOL" >&6; }
++ { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
++echo "${ECHO_T}$DLLTOOL" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -7867,10 +7722,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
+ ac_ct_DLLTOOL=$DLLTOOL
+ # Extract the first word of "dlltool", so it can be a program name with args.
+ set dummy dlltool; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_DLLTOOL"; then
+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+@@ -7883,7 +7738,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -7894,11 +7749,11 @@ fi
+ fi
+ ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+ if test -n "$ac_ct_DLLTOOL"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
+-$as_echo "$ac_ct_DLLTOOL" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
++echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ if test "x$ac_ct_DLLTOOL" = x; then
+@@ -7906,8 +7761,12 @@ fi
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ DLLTOOL=$ac_ct_DLLTOOL
+@@ -7919,10 +7778,10 @@ fi
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}as; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_AS+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$AS"; then
+ ac_cv_prog_AS="$AS" # Let the user override the test.
+@@ -7935,7 +7794,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AS="${ac_tool_prefix}as"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -7946,11 +7805,11 @@ fi
+ fi
+ AS=$ac_cv_prog_AS
+ if test -n "$AS"; then
+- { $as_echo "$as_me:$LINENO: result: $AS" >&5
+-$as_echo "$AS" >&6; }
++ { echo "$as_me:$LINENO: result: $AS" >&5
++echo "${ECHO_T}$AS" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -7959,10 +7818,10 @@ if test -z "$ac_cv_prog_AS"; then
+ ac_ct_AS=$AS
+ # Extract the first word of "as", so it can be a program name with args.
+ set dummy as; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_AS"; then
+ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+@@ -7975,7 +7834,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_AS="as"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -7986,11 +7845,11 @@ fi
+ fi
+ ac_ct_AS=$ac_cv_prog_ac_ct_AS
+ if test -n "$ac_ct_AS"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
+-$as_echo "$ac_ct_AS" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
++echo "${ECHO_T}$ac_ct_AS" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ if test "x$ac_ct_AS" = x; then
+@@ -7998,8 +7857,12 @@ fi
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ AS=$ac_ct_AS
+@@ -8011,10 +7874,10 @@ fi
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$OBJDUMP"; then
+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+@@ -8027,7 +7890,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -8038,11 +7901,11 @@ fi
+ fi
+ OBJDUMP=$ac_cv_prog_OBJDUMP
+ if test -n "$OBJDUMP"; then
+- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+-$as_echo "$OBJDUMP" >&6; }
++ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
++echo "${ECHO_T}$OBJDUMP" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -8051,10 +7914,10 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+ ac_ct_OBJDUMP=$OBJDUMP
+ # Extract the first word of "objdump", so it can be a program name with args.
+ set dummy objdump; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_OBJDUMP"; then
+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+@@ -8067,7 +7930,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_OBJDUMP="objdump"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -8078,11 +7941,11 @@ fi
+ fi
+ ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+ if test -n "$ac_ct_OBJDUMP"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+-$as_echo "$ac_ct_OBJDUMP" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
++echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ if test "x$ac_ct_OBJDUMP" = x; then
+@@ -8090,8 +7953,12 @@ fi
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ OBJDUMP=$ac_ct_OBJDUMP
+@@ -8110,21 +7977,20 @@ need_locks="$enable_libtool_lock"
+
+ for ac_header in dlfcn.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -8140,33 +8006,32 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -8180,52 +8045,51 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to gnucash-devel at gnucash.org ##
+@@ -8234,24 +8098,21 @@ _ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -8272,10 +8133,10 @@ if test -z "$CXX"; then
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CXX+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$CXX"; then
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
+@@ -8288,7 +8149,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -8299,11 +8160,11 @@ fi
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+- { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+-$as_echo "$CXX" >&6; }
++ { echo "$as_me:$LINENO: result: $CXX" >&5
++echo "${ECHO_T}$CXX" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -8316,10 +8177,10 @@ if test -z "$CXX"; then
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_CXX"; then
+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+@@ -8332,7 +8193,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -8343,11 +8204,11 @@ fi
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+-$as_echo "$ac_ct_CXX" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
++echo "${ECHO_T}$ac_ct_CXX" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -8359,8 +8220,12 @@ done
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ CXX=$ac_ct_CXX
+@@ -8370,47 +8235,43 @@ fi
+ fi
+ fi
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+-set X $ac_compile
+-ac_compiler=$2
++echo "$as_me:$LINENO: checking for C++ compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
+ { (ac_try="$ac_compiler --version >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ { (ac_try="$ac_compiler -v >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ { (ac_try="$ac_compiler -V >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -8436,21 +8297,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_compiler_gnu=no
+@@ -8460,19 +8320,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+-if test $ac_compiler_gnu = yes; then
+- GXX=yes
+-else
+- GXX=
+-fi
++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
++GXX=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
++{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
++echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cxx_g+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+@@ -8499,21 +8355,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cxx_g=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ CXXFLAGS=""
+@@ -8538,21 +8393,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+@@ -8578,21 +8432,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cxx_g=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+@@ -8607,8 +8460,8 @@ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+-$as_echo "$ac_cv_prog_cxx_g" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+ if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+ elif test $ac_cv_prog_cxx_g = yes; then
+@@ -8632,10 +8485,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ depcc="$CXX" am_compiler_list=
+
+-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-$as_echo_n "checking dependency style of $depcc... " >&6; }
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+@@ -8723,8 +8576,8 @@ else
+ fi
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
++{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+ if
+@@ -8748,11 +8601,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+ if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ # Double quotes because CXXCPP needs to be expanded
+ for CXXCPP in "$CXX -E" "/lib/cpp"
+@@ -8784,21 +8637,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+@@ -8822,14 +8674,13 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+@@ -8837,7 +8688,7 @@ $as_echo "$ac_try_echo") >&5
+ # Broken: success on invalid input.
+ continue
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+@@ -8862,8 +8713,8 @@ fi
+ else
+ ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+-$as_echo "$CXXCPP" >&6; }
++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6; }
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+ do
+@@ -8891,21 +8742,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+@@ -8929,14 +8779,13 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+@@ -8944,7 +8793,7 @@ $as_echo "$ac_try_echo") >&5
+ # Broken: success on invalid input.
+ continue
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+@@ -8960,13 +8809,11 @@ rm -f conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ { (exit 1); exit 1; }; }
+ fi
+
+ ac_ext=cpp
+@@ -8987,10 +8834,10 @@ if test -n "$ac_tool_prefix"; then
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_F77+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$F77"; then
+ ac_cv_prog_F77="$F77" # Let the user override the test.
+@@ -9003,7 +8850,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -9014,11 +8861,11 @@ fi
+ fi
+ F77=$ac_cv_prog_F77
+ if test -n "$F77"; then
+- { $as_echo "$as_me:$LINENO: result: $F77" >&5
+-$as_echo "$F77" >&6; }
++ { echo "$as_me:$LINENO: result: $F77" >&5
++echo "${ECHO_T}$F77" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -9031,10 +8878,10 @@ if test -z "$F77"; then
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_F77"; then
+ ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
+@@ -9047,7 +8894,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_F77="$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -9058,11 +8905,11 @@ fi
+ fi
+ ac_ct_F77=$ac_cv_prog_ac_ct_F77
+ if test -n "$ac_ct_F77"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+-$as_echo "$ac_ct_F77" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
++echo "${ECHO_T}$ac_ct_F77" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -9074,8 +8921,12 @@ done
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ F77=$ac_ct_F77
+@@ -9084,41 +8935,37 @@ fi
+
+
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
+-set X $ac_compile
+-ac_compiler=$2
++echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
+ { (ac_try="$ac_compiler --version >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ { (ac_try="$ac_compiler -v >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ { (ac_try="$ac_compiler -V >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ rm -f a.out
+
+@@ -9126,10 +8973,10 @@ rm -f a.out
+ # input file. (Note that this only needs to work for GNU compilers.)
+ ac_save_ext=$ac_ext
+ ac_ext=F
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+-$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
++{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_f77_compiler_gnu+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ program main
+@@ -9145,21 +8992,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_compiler_gnu=no
+@@ -9169,16 +9015,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+-$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
+ ac_ext=$ac_save_ext
+ ac_test_FFLAGS=${FFLAGS+set}
+ ac_save_FFLAGS=$FFLAGS
+ FFLAGS=
+-{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+-$as_echo_n "checking whether $F77 accepts -g... " >&6; }
++{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_f77_g+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ FFLAGS=-g
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -9192,21 +9038,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_f77_g=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_prog_f77_g=no
+@@ -9215,8 +9060,8 @@ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+-$as_echo "$ac_cv_prog_f77_g" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
++echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
+ if test "$ac_test_FFLAGS" = set; then
+ FFLAGS=$ac_save_FFLAGS
+ elif test $ac_cv_prog_f77_g = yes; then
+@@ -9233,11 +9078,7 @@ else
+ fi
+ fi
+
+-if test $ac_compiler_gnu = yes; then
+- G77=yes
+-else
+- G77=
+-fi
++G77=`test $ac_compiler_gnu = yes && echo yes`
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -9248,10 +9089,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+ # find the maximum length of command line arguments
+-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
++{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
++echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ i=0
+ teststring="ABCD"
+@@ -9360,11 +9201,11 @@ else
+ fi
+
+ if test -n $lt_cv_sys_max_cmd_len ; then
+- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
++ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
++echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: none" >&5
+-$as_echo "none" >&6; }
++ { echo "$as_me:$LINENO: result: none" >&5
++echo "${ECHO_T}none" >&6; }
+ fi
+
+
+@@ -9372,10 +9213,10 @@ fi
+
+
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
++{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
++echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ # These are sane defaults that work on at least a few old systems.
+@@ -9480,14 +9321,14 @@ EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # Now try to grab the symbols.
+ nlist=conftest.nm
+ if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s "$nlist"; then
+ # Try sorting and uniquifying the output.
+ if sort "$nlist" | uniq > "$nlist"T; then
+@@ -9542,7 +9383,7 @@ EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext}; then
+ pipe_works=yes
+ fi
+@@ -9577,17 +9418,17 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
+ lt_cv_sys_global_symbol_to_cdecl=
+ fi
+ if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+- { $as_echo "$as_me:$LINENO: result: failed" >&5
+-$as_echo "failed" >&6; }
++ { echo "$as_me:$LINENO: result: failed" >&5
++echo "${ECHO_T}failed" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: ok" >&5
+-$as_echo "ok" >&6; }
++ { echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6; }
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+-$as_echo_n "checking for objdir... " >&6; }
++{ echo "$as_me:$LINENO: checking for objdir" >&5
++echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+ if test "${lt_cv_objdir+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ rm -f .libs 2>/dev/null
+ mkdir .libs 2>/dev/null
+@@ -9599,8 +9440,8 @@ else
+ fi
+ rmdir .libs 2>/dev/null
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+-$as_echo "$lt_cv_objdir" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
++echo "${ECHO_T}$lt_cv_objdir" >&6; }
+ objdir=$lt_cv_objdir
+
+
+@@ -9651,10 +9492,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_AR+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
+@@ -9667,7 +9508,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -9678,11 +9519,11 @@ fi
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- { $as_echo "$as_me:$LINENO: result: $AR" >&5
+-$as_echo "$AR" >&6; }
++ { echo "$as_me:$LINENO: result: $AR" >&5
++echo "${ECHO_T}$AR" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -9691,10 +9532,10 @@ if test -z "$ac_cv_prog_AR"; then
+ ac_ct_AR=$AR
+ # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+@@ -9707,7 +9548,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_AR="ar"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -9718,11 +9559,11 @@ fi
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+-$as_echo "$ac_ct_AR" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++echo "${ECHO_T}$ac_ct_AR" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ if test "x$ac_ct_AR" = x; then
+@@ -9730,8 +9571,12 @@ fi
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ AR=$ac_ct_AR
+@@ -9743,10 +9588,10 @@ fi
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+@@ -9759,7 +9604,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -9770,11 +9615,11 @@ fi
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+-$as_echo "$RANLIB" >&6; }
++ { echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -9783,10 +9628,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_RANLIB"; then
+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+@@ -9799,7 +9644,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -9810,11 +9655,11 @@ fi
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-$as_echo "$ac_ct_RANLIB" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ if test "x$ac_ct_RANLIB" = x; then
+@@ -9822,8 +9667,12 @@ fi
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ RANLIB=$ac_ct_RANLIB
+@@ -9835,10 +9684,10 @@ fi
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+@@ -9851,7 +9700,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -9862,11 +9711,11 @@ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+-$as_echo "$STRIP" >&6; }
++ { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -9875,10 +9724,10 @@ if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+@@ -9891,7 +9740,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -9902,11 +9751,11 @@ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-$as_echo "$ac_ct_STRIP" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ if test "x$ac_ct_STRIP" = x; then
+@@ -9914,8 +9763,12 @@ fi
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ STRIP=$ac_ct_STRIP
+@@ -9978,10 +9831,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ case $deplibs_check_method in
+ file_magic*)
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
++ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $MAGIC_CMD in
+ [\\/*] | ?:[\\/]*)
+@@ -10031,19 +9884,19 @@ fi
+
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-$as_echo "$MAGIC_CMD" >&6; }
++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+ if test -n "$ac_tool_prefix"; then
+- { $as_echo "$as_me:$LINENO: checking for file" >&5
+-$as_echo_n "checking for file... " >&6; }
++ { echo "$as_me:$LINENO: checking for file" >&5
++echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $MAGIC_CMD in
+ [\\/*] | ?:[\\/]*)
+@@ -10093,11 +9946,11 @@ fi
+
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-$as_echo "$MAGIC_CMD" >&6; }
++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ else
+@@ -10115,10 +9968,10 @@ esac
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$DSYMUTIL"; then
+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+@@ -10131,7 +9984,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -10142,11 +9995,11 @@ fi
+ fi
+ DSYMUTIL=$ac_cv_prog_DSYMUTIL
+ if test -n "$DSYMUTIL"; then
+- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+-$as_echo "$DSYMUTIL" >&6; }
++ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
++echo "${ECHO_T}$DSYMUTIL" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -10155,10 +10008,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+ ac_ct_DSYMUTIL=$DSYMUTIL
+ # Extract the first word of "dsymutil", so it can be a program name with args.
+ set dummy dsymutil; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_DSYMUTIL"; then
+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+@@ -10171,7 +10024,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -10182,11 +10035,11 @@ fi
+ fi
+ ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+ if test -n "$ac_ct_DSYMUTIL"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+-$as_echo "$ac_ct_DSYMUTIL" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ if test "x$ac_ct_DSYMUTIL" = x; then
+@@ -10194,8 +10047,12 @@ fi
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ DSYMUTIL=$ac_ct_DSYMUTIL
+@@ -10207,10 +10064,10 @@ fi
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_NMEDIT+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$NMEDIT"; then
+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+@@ -10223,7 +10080,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -10234,11 +10091,11 @@ fi
+ fi
+ NMEDIT=$ac_cv_prog_NMEDIT
+ if test -n "$NMEDIT"; then
+- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+-$as_echo "$NMEDIT" >&6; }
++ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
++echo "${ECHO_T}$NMEDIT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -10247,10 +10104,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+ ac_ct_NMEDIT=$NMEDIT
+ # Extract the first word of "nmedit", so it can be a program name with args.
+ set dummy nmedit; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_NMEDIT"; then
+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+@@ -10263,7 +10120,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_NMEDIT="nmedit"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -10274,11 +10131,11 @@ fi
+ fi
+ ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+ if test -n "$ac_ct_NMEDIT"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+-$as_echo "$ac_ct_NMEDIT" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
++echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ if test "x$ac_ct_NMEDIT" = x; then
+@@ -10286,8 +10143,12 @@ fi
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ NMEDIT=$ac_ct_NMEDIT
+@@ -10297,10 +10158,10 @@ else
+ fi
+
+
+- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+-$as_echo_n "checking for -single_module linker flag... " >&6; }
++ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+ if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+@@ -10318,12 +10179,12 @@ else
+ rm conftest.c
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
++ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
+ if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+@@ -10350,37 +10211,33 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ lt_cv_ld_exported_symbols_list=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ lt_cv_ld_exported_symbols_list=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+ case $host_os in
+ rhapsody* | darwin1.[0123])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+@@ -10437,67 +10294,6 @@ fi
+
+ test -z "$pic_mode" && pic_mode=default
+
+-# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
+-#
+-# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
+-# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
+-# calls AC_LIBTOOL_CONFIG and creates libtool.
+-#
+-{ $as_echo "$as_me:$LINENO: checking for correct ltmain.sh version" >&5
+-$as_echo_n "checking for correct ltmain.sh version... " >&6; }
+-if test "x$ltmain" = "x" ; then
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- { { $as_echo "$as_me:$LINENO: error:
+-
+-*** [Gentoo] sanity check failed! ***
+-*** \$ltmain is not defined, please check the patch for consistency! ***
+-" >&5
+-$as_echo "$as_me: error:
+-
+-*** [Gentoo] sanity check failed! ***
+-*** \$ltmain is not defined, please check the patch for consistency! ***
+-" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-gentoo_lt_version="1.5.26"
+-gentoo_ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' "$ltmain"`
+-if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- { { $as_echo "$as_me:$LINENO: error:
+-
+-*** [Gentoo] sanity check failed! ***
+-*** libtool.m4 and ltmain.sh have a version mismatch! ***
+-*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
+-
+-Please run:
+-
+- libtoolize --copy --force
+-
+-if appropriate, please contact the maintainer of this
+-package (or your distribution) for help.
+-" >&5
+-$as_echo "$as_me: error:
+-
+-*** [Gentoo] sanity check failed! ***
+-*** libtool.m4 and ltmain.sh have a version mismatch! ***
+-*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
+-
+-Please run:
+-
+- libtoolize --copy --force
+-
+-if appropriate, please contact the maintainer of this
+-package (or your distribution) for help.
+-" >&2;}
+- { (exit 1); exit 1; }; }
+-else
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-fi
+-
+-
+ # Use C for the default configuration in the libtool script
+ tagname=
+ lt_save_CC="$CC"
+@@ -10553,10 +10349,10 @@ if test "$GCC" = yes; then
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_rtti_exceptions=no
+ ac_outfile=conftest.$ac_objext
+@@ -10571,11 +10367,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:10574: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10370: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:10578: \$? = $ac_status" >&5
++ echo "$as_me:10374: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -10588,8 +10384,8 @@ else
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+ if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+@@ -10603,8 +10399,8 @@ lt_prog_compiler_wl=
+ lt_prog_compiler_pic=
+ lt_prog_compiler_static=
+
+-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl='-Wl,'
+@@ -10835,18 +10631,18 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+ esac
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+-$as_echo "$lt_prog_compiler_pic" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic"; then
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_pic_works=no
+ ac_outfile=conftest.$ac_objext
+@@ -10861,11 +10657,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:10864: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10660: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:10868: \$? = $ac_status" >&5
++ echo "$as_me:10664: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -10878,8 +10674,8 @@ else
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+
+ if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+ case $lt_prog_compiler_pic in
+@@ -10906,10 +10702,10 @@ esac
+ # Check to make sure the static flag actually works.
+ #
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_static_works=no
+ save_LDFLAGS="$LDFLAGS"
+@@ -10934,8 +10730,8 @@ else
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+
+ if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+ :
+@@ -10944,10 +10740,10 @@ else
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_c_o=no
+ $rm -r conftest 2>/dev/null
+@@ -10965,11 +10761,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:10968: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10764: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:10972: \$? = $ac_status" >&5
++ echo "$as_me:10768: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -10991,34 +10787,34 @@ else
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-$as_echo_n "checking if we can lock with hard links... " >&6; }
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+-$as_echo "$hard_links" >&6; }
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ need_locks=warn
+ fi
+ else
+ need_locks=no
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ runpath_var=
+ allow_undefined_flag=
+@@ -11448,21 +11244,18 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+@@ -11477,13 +11270,12 @@ if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -11518,21 +11310,18 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+@@ -11547,13 +11336,12 @@ if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12005,8 +11793,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ esac
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+-$as_echo "$ld_shlibs" >&6; }
++{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
++echo "${ECHO_T}$ld_shlibs" >&6; }
+ test "$ld_shlibs" = no && can_build_shared=no
+
+ #
+@@ -12026,15 +11814,15 @@ x|xyes)
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+@@ -12052,7 +11840,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ then
+ archive_cmds_need_lc=no
+@@ -12064,16 +11852,16 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+-$as_echo "$archive_cmds_need_lc" >&6; }
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
++echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-$as_echo_n "checking dynamic linker characteristics... " >&6; }
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+@@ -12324,14 +12112,7 @@ freebsd* | dragonfly*)
+ *) objformat=elf ;;
+ esac
+ fi
+- # Handle Gentoo/FreeBSD as it was Linux
+- case $host_vendor in
+- gentoo)
+- version_type=linux ;;
+- *)
+- version_type=freebsd-$objformat ;;
+- esac
+-
++ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+@@ -12342,12 +12123,6 @@ freebsd* | dragonfly*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
+ ;;
+- linux)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- need_lib_prefix=no
+- need_version=no
+- ;;
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+@@ -12494,11 +12269,13 @@ linux* | k*bsd*-gnu)
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -12687,19 +12464,19 @@ uts4*)
+ dynamic_linker=no
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-$as_echo "$dynamic_linker" >&6; }
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
+ if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+ fi
+
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+ fi
+@@ -12711,8 +12488,8 @@ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ hardcode_action=
+ if test -n "$hardcode_libdir_flag_spec" || \
+ test -n "$runpath_var" || \
+@@ -12736,8 +12513,8 @@ else
+ # directories.
+ hardcode_action=unsupported
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+-$as_echo "$hardcode_action" >&6; }
++{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
++echo "${ECHO_T}$hardcode_action" >&6; }
+
+ if test "$hardcode_action" = relink; then
+ # Fast installation is not supported
+@@ -12750,13 +12527,13 @@ fi
+
+ striplib=
+ old_striplib=
+-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
++{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+ if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ # FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+@@ -12764,16 +12541,16 @@ else
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ ;;
+ *)
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ ;;
+ esac
+ fi
+@@ -12805,10 +12582,10 @@ else
+
+ darwin*)
+ # if libdl is installed we need to link against it
+- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-$as_echo_n "checking for dlopen in -ldl... " >&6; }
++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
+@@ -12840,37 +12617,33 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dl_dlopen=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dl_dlopen=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
++if test $ac_cv_lib_dl_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+
+@@ -12883,10 +12656,10 @@ fi
+ ;;
+
+ *)
+- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+-$as_echo_n "checking for shl_load... " >&6; }
++ { echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+ if test "${ac_cv_func_shl_load+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -12939,42 +12712,38 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_shl_load=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_shl_load=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-$as_echo "$ac_cv_func_shl_load" >&6; }
+-if test "x$ac_cv_func_shl_load" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
++if test $ac_cv_func_shl_load = yes; then
+ lt_cv_dlopen="shl_load"
+ else
+- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-$as_echo_n "checking for shl_load in -ldld... " >&6; }
++ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldld $LIBS"
+@@ -13006,43 +12775,39 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dld_shl_load=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dld_shl_load=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
++if test $ac_cv_lib_dld_shl_load = yes; then
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+-$as_echo_n "checking for dlopen... " >&6; }
++ { echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+ if test "${ac_cv_func_dlopen+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -13095,42 +12860,38 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_dlopen=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_dlopen=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-$as_echo "$ac_cv_func_dlopen" >&6; }
+-if test "x$ac_cv_func_dlopen" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
++if test $ac_cv_func_dlopen = yes; then
+ lt_cv_dlopen="dlopen"
+ else
+- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-$as_echo_n "checking for dlopen in -ldl... " >&6; }
++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
+@@ -13162,43 +12923,39 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dl_dlopen=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dl_dlopen=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
++if test $ac_cv_lib_dl_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
++ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsvld $LIBS"
+@@ -13230,43 +12987,39 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_svld_dlopen=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_svld_dlopen=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
++if test $ac_cv_lib_svld_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-$as_echo_n "checking for dld_link in -ldld... " >&6; }
++ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldld $LIBS"
+@@ -13298,37 +13051,33 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dld_dld_link=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dld_dld_link=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
++if test $ac_cv_lib_dld_dld_link = yes; then
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+
+@@ -13367,10 +13116,10 @@ fi
+ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+
+- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
++ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+ if test "${lt_cv_dlopen_self+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$cross_compiling" = yes; then :
+ lt_cv_dlopen_self=cross
+@@ -13378,7 +13127,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 13381 "configure"
++#line 13130 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -13444,7 +13193,7 @@ EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+@@ -13462,15 +13211,15 @@ rm -fr conftest*
+
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-$as_echo "$lt_cv_dlopen_self" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+
+ if test "x$lt_cv_dlopen_self" = xyes; then
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
++ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+ if test "${lt_cv_dlopen_self_static+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$cross_compiling" = yes; then :
+ lt_cv_dlopen_self_static=cross
+@@ -13478,7 +13227,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 13481 "configure"
++#line 13230 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -13544,7 +13293,7 @@ EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+@@ -13562,8 +13311,8 @@ rm -fr conftest*
+
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-$as_echo "$lt_cv_dlopen_self_static" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+ fi
+
+ CPPFLAGS="$save_CPPFLAGS"
+@@ -13585,13 +13334,13 @@ fi
+
+
+ # Report which library types will actually be built
+-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+-$as_echo "$can_build_shared" >&6; }
++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6; }
+
+-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-$as_echo_n "checking whether to build shared libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+@@ -13611,15 +13360,15 @@ aix[4-9]*)
+ fi
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+-$as_echo "$enable_shared" >&6; }
++{ echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6; }
+
+-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-$as_echo_n "checking whether to build static libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+-$as_echo "$enable_static" >&6; }
++{ echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6; }
+
+ # The else clause should only fire when bootstrapping the
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+@@ -13712,8 +13461,8 @@ if test -f "$ltmain"; then
+ cfgfile="${ofile}T"
+ trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+ $rm -f "$cfgfile"
+- { $as_echo "$as_me:$LINENO: creating $ofile" >&5
+-$as_echo "$as_me: creating $ofile" >&6;}
++ { echo "$as_me:$LINENO: creating $ofile" >&5
++echo "$as_me: creating $ofile" >&6;}
+
+ cat <<__EOF__ >> "$cfgfile"
+ #! $SHELL
+@@ -14125,18 +13874,18 @@ fi
+
+ if test -f "$ltmain" && test -n "$tagnames"; then
+ if test ! -f "${ofile}"; then
+- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
+-$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
++ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
++echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
+ fi
+
+ if test -z "$LTCC"; then
+ eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+ if test -z "$LTCC"; then
+- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
+-$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
++ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
++echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
+ else
+- { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
+-$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
++ { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
++echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+ fi
+ fi
+ if test -z "$LTCFLAGS"; then
+@@ -14153,16 +13902,16 @@ $as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+ # Check whether tagname contains only valid characters
+ case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
+ "") ;;
+- *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
+-$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
++ *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
++echo "$as_me: error: invalid tag name: $tagname" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+
+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+ then
+- { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
+-$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
++ { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
++echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+@@ -14305,8 +14054,8 @@ fi
+ ac_prog=ld
+ if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-$as_echo_n "checking for ld used by $CC... " >&6; }
++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+@@ -14335,14 +14084,14 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
+ ;;
+ esac
+ elif test "$with_gnu_ld" = yes; then
+- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+-$as_echo_n "checking for GNU ld... " >&6; }
++ { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-$as_echo_n "checking for non-GNU ld... " >&6; }
++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -z "$LD"; then
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+@@ -14372,19 +14121,19 @@ fi
+
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+- { $as_echo "$as_me:$LINENO: result: $LD" >&5
+-$as_echo "$LD" >&6; }
++ { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+@@ -14396,8 +14145,8 @@ case `$LD -v 2>&1 </dev/null` in
+ ;;
+ esac
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+@@ -14447,8 +14196,8 @@ else
+ fi
+
+ # PORTME: fill in a description of your system's C++ link characteristics
+-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ ld_shlibs_CXX=yes
+ case $host_os in
+ aix3*)
+@@ -14565,21 +14314,18 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+@@ -14594,13 +14340,12 @@ if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -14636,21 +14381,18 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+@@ -14665,13 +14407,12 @@ if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -15401,8 +15142,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ ld_shlibs_CXX=no
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-$as_echo "$ld_shlibs_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+ GCC_CXX="$GXX"
+@@ -15421,7 +15162,7 @@ EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # Parse the compiler output and extract the necessary
+ # objects, libraries and library flags.
+@@ -15577,8 +15318,8 @@ lt_prog_compiler_wl_CXX=
+ lt_prog_compiler_pic_CXX=
+ lt_prog_compiler_static_CXX=
+
+-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ # C++ specific cases for pic, static, wl, etc.
+ if test "$GXX" = yes; then
+@@ -15861,18 +15602,18 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+ esac
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_CXX"; then
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_pic_works_CXX=no
+ ac_outfile=conftest.$ac_objext
+@@ -15887,11 +15628,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15890: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15631: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:15894: \$? = $ac_status" >&5
++ echo "$as_me:15635: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -15904,8 +15645,8 @@ else
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+-$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
+ if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+ case $lt_prog_compiler_pic_CXX in
+@@ -15932,10 +15673,10 @@ esac
+ # Check to make sure the static flag actually works.
+ #
+ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+@@ -15960,8 +15701,8 @@ else
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+-$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
+ if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+ :
+@@ -15970,10 +15711,10 @@ else
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_c_o_CXX=no
+ $rm -r conftest 2>/dev/null
+@@ -15991,11 +15732,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15994: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15735: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:15998: \$? = $ac_status" >&5
++ echo "$as_me:15739: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -16017,34 +15758,34 @@ else
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-$as_echo_n "checking if we can lock with hard links... " >&6; }
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+-$as_echo "$hard_links" >&6; }
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ need_locks=warn
+ fi
+ else
+ need_locks=no
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+@@ -16069,8 +15810,8 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+ esac
+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+
+-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-$as_echo "$ld_shlibs_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+ #
+@@ -16090,15 +15831,15 @@ x|xyes)
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+@@ -16116,7 +15857,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ then
+ archive_cmds_need_lc_CXX=no
+@@ -16128,16 +15869,16 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+-$as_echo "$archive_cmds_need_lc_CXX" >&6; }
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-$as_echo_n "checking dynamic linker characteristics... " >&6; }
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+@@ -16336,14 +16077,7 @@ freebsd* | dragonfly*)
+ *) objformat=elf ;;
+ esac
+ fi
+- # Handle Gentoo/FreeBSD as it was Linux
+- case $host_vendor in
+- gentoo)
+- version_type=linux ;;
+- *)
+- version_type=freebsd-$objformat ;;
+- esac
+-
++ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+@@ -16354,12 +16088,6 @@ freebsd* | dragonfly*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
+ ;;
+- linux)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- need_lib_prefix=no
+- need_version=no
+- ;;
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+@@ -16506,11 +16234,13 @@ linux* | k*bsd*-gnu)
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -16699,19 +16429,19 @@ uts4*)
+ dynamic_linker=no
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-$as_echo "$dynamic_linker" >&6; }
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
+ if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+ fi
+
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+ fi
+@@ -16723,8 +16453,8 @@ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ hardcode_action_CXX=
+ if test -n "$hardcode_libdir_flag_spec_CXX" || \
+ test -n "$runpath_var_CXX" || \
+@@ -16748,8 +16478,8 @@ else
+ # directories.
+ hardcode_action_CXX=unsupported
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+-$as_echo "$hardcode_action_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
++echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+
+ if test "$hardcode_action_CXX" = relink; then
+ # Fast installation is not supported
+@@ -17287,13 +17017,13 @@ done
+ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
+-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+-$as_echo "$can_build_shared" >&6; }
++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6; }
+
+-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-$as_echo_n "checking whether to build shared libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+@@ -17312,15 +17042,15 @@ aix[4-9]*)
+ fi
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+-$as_echo "$enable_shared" >&6; }
++{ echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6; }
+
+-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-$as_echo_n "checking whether to build static libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+-$as_echo "$enable_static" >&6; }
++{ echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6; }
+
+ GCC_F77="$G77"
+ LD_F77="$LD"
+@@ -17329,8 +17059,8 @@ lt_prog_compiler_wl_F77=
+ lt_prog_compiler_pic_F77=
+ lt_prog_compiler_static_F77=
+
+-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl_F77='-Wl,'
+@@ -17561,18 +17291,18 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+ esac
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+-$as_echo "$lt_prog_compiler_pic_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_F77"; then
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_pic_works_F77=no
+ ac_outfile=conftest.$ac_objext
+@@ -17587,11 +17317,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:17590: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17320: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:17594: \$? = $ac_status" >&5
++ echo "$as_me:17324: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -17604,8 +17334,8 @@ else
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
+-$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
+
+ if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
+ case $lt_prog_compiler_pic_F77 in
+@@ -17632,10 +17362,10 @@ esac
+ # Check to make sure the static flag actually works.
+ #
+ wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
+-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+@@ -17660,8 +17390,8 @@ else
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
+-$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
+
+ if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
+ :
+@@ -17670,10 +17400,10 @@ else
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_c_o_F77=no
+ $rm -r conftest 2>/dev/null
+@@ -17691,11 +17421,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:17694: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17424: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:17698: \$? = $ac_status" >&5
++ echo "$as_me:17428: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -17717,34 +17447,34 @@ else
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+-$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-$as_echo_n "checking if we can lock with hard links... " >&6; }
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+-$as_echo "$hard_links" >&6; }
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ need_locks=warn
+ fi
+ else
+ need_locks=no
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ runpath_var=
+ allow_undefined_flag_F77=
+@@ -18164,21 +17894,18 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+@@ -18193,13 +17920,12 @@ if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -18224,21 +17950,18 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+@@ -18253,13 +17976,12 @@ if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -18711,8 +18433,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ esac
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+-$as_echo "$ld_shlibs_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
++echo "${ECHO_T}$ld_shlibs_F77" >&6; }
+ test "$ld_shlibs_F77" = no && can_build_shared=no
+
+ #
+@@ -18732,15 +18454,15 @@ x|xyes)
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+@@ -18758,7 +18480,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ then
+ archive_cmds_need_lc_F77=no
+@@ -18770,16 +18492,16 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+-$as_echo "$archive_cmds_need_lc_F77" >&6; }
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-$as_echo_n "checking dynamic linker characteristics... " >&6; }
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+@@ -18978,14 +18700,7 @@ freebsd* | dragonfly*)
+ *) objformat=elf ;;
+ esac
+ fi
+- # Handle Gentoo/FreeBSD as it was Linux
+- case $host_vendor in
+- gentoo)
+- version_type=linux ;;
+- *)
+- version_type=freebsd-$objformat ;;
+- esac
+-
++ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+@@ -18996,12 +18711,6 @@ freebsd* | dragonfly*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
+ ;;
+- linux)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- need_lib_prefix=no
+- need_version=no
+- ;;
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+@@ -19148,11 +18857,13 @@ linux* | k*bsd*-gnu)
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -19341,19 +19052,19 @@ uts4*)
+ dynamic_linker=no
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-$as_echo "$dynamic_linker" >&6; }
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
+ if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+ fi
+
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+ fi
+@@ -19365,8 +19076,8 @@ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ hardcode_action_F77=
+ if test -n "$hardcode_libdir_flag_spec_F77" || \
+ test -n "$runpath_var_F77" || \
+@@ -19390,8 +19101,8 @@ else
+ # directories.
+ hardcode_action_F77=unsupported
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+-$as_echo "$hardcode_action_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
++echo "${ECHO_T}$hardcode_action_F77" >&6; }
+
+ if test "$hardcode_action_F77" = relink; then
+ # Fast installation is not supported
+@@ -19901,10 +19612,10 @@ if test "$GCC" = yes; then
+ lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
+
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_rtti_exceptions=no
+ ac_outfile=conftest.$ac_objext
+@@ -19919,11 +19630,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:19922: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19633: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:19926: \$? = $ac_status" >&5
++ echo "$as_me:19637: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -19936,8 +19647,8 @@ else
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+ if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+ lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
+@@ -19951,8 +19662,8 @@ lt_prog_compiler_wl_GCJ=
+ lt_prog_compiler_pic_GCJ=
+ lt_prog_compiler_static_GCJ=
+
+-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl_GCJ='-Wl,'
+@@ -20183,18 +19894,18 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+ esac
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+-$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_GCJ"; then
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_pic_works_GCJ=no
+ ac_outfile=conftest.$ac_objext
+@@ -20209,11 +19920,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:20212: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19923: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:20216: \$? = $ac_status" >&5
++ echo "$as_me:19927: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -20226,8 +19937,8 @@ else
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
+-$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
+
+ if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
+ case $lt_prog_compiler_pic_GCJ in
+@@ -20254,10 +19965,10 @@ esac
+ # Check to make sure the static flag actually works.
+ #
+ wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
+-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_static_works_GCJ=no
+ save_LDFLAGS="$LDFLAGS"
+@@ -20282,8 +19993,8 @@ else
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
+-$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
+
+ if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
+ :
+@@ -20292,10 +20003,10 @@ else
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_prog_compiler_c_o_GCJ=no
+ $rm -r conftest 2>/dev/null
+@@ -20313,11 +20024,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:20316: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20027: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:20320: \$? = $ac_status" >&5
++ echo "$as_me:20031: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -20339,34 +20050,34 @@ else
+ $rm conftest*
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+-$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-$as_echo_n "checking if we can lock with hard links... " >&6; }
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+-$as_echo "$hard_links" >&6; }
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ need_locks=warn
+ fi
+ else
+ need_locks=no
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ runpath_var=
+ allow_undefined_flag_GCJ=
+@@ -20796,21 +20507,18 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+@@ -20825,13 +20533,12 @@ if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -20866,21 +20573,18 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+@@ -20895,13 +20599,12 @@ if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -21353,8 +21056,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ esac
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+-$as_echo "$ld_shlibs_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
+ test "$ld_shlibs_GCJ" = no && can_build_shared=no
+
+ #
+@@ -21374,15 +21077,15 @@ x|xyes)
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+@@ -21400,7 +21103,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ then
+ archive_cmds_need_lc_GCJ=no
+@@ -21412,16 +21115,16 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+-$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-$as_echo_n "checking dynamic linker characteristics... " >&6; }
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+@@ -21620,14 +21323,7 @@ freebsd* | dragonfly*)
+ *) objformat=elf ;;
+ esac
+ fi
+- # Handle Gentoo/FreeBSD as it was Linux
+- case $host_vendor in
+- gentoo)
+- version_type=linux ;;
+- *)
+- version_type=freebsd-$objformat ;;
+- esac
+-
++ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+@@ -21638,12 +21334,6 @@ freebsd* | dragonfly*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
+ ;;
+- linux)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- need_lib_prefix=no
+- need_version=no
+- ;;
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+@@ -21790,11 +21480,13 @@ linux* | k*bsd*-gnu)
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -21983,19 +21675,19 @@ uts4*)
+ dynamic_linker=no
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-$as_echo "$dynamic_linker" >&6; }
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
+ if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+ fi
+
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+ fi
+@@ -22007,8 +21699,8 @@ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ hardcode_action_GCJ=
+ if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+ test -n "$runpath_var_GCJ" || \
+@@ -22032,8 +21724,8 @@ else
+ # directories.
+ hardcode_action_GCJ=unsupported
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+-$as_echo "$hardcode_action_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
+
+ if test "$hardcode_action_GCJ" = relink; then
+ # Fast installation is not supported
+@@ -22956,8 +22648,8 @@ CC="$lt_save_CC"
+ ;;
+
+ *)
+- { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
+-$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
++ { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
++echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+@@ -22976,8 +22668,8 @@ $as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
+ chmod +x "$ofile"
+ else
+ rm -f "${ofile}T"
+- { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
+-$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
++ { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
++echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+@@ -23014,10 +22706,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
+-$as_echo_n "checking for library containing strerror... " >&6; }
++{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
++echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
+ if test "${ac_cv_search_strerror+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -23055,30 +22747,26 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_search_strerror=$ac_res
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_strerror+set}" = set; then
+@@ -23093,86 +22781,36 @@ fi
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+-$as_echo "$ac_cv_search_strerror" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
++echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
+ ac_res=$ac_cv_search_strerror
+ if test "$ac_res" != no; then
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+ fi
+
+-
+- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
++{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+ if test "${ac_cv_c_bigendian+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_c_bigendian=unknown
+- # See if we're dealing with a universal compiler.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#ifndef __APPLE_CC__
+- not a universal capable compiler
+- #endif
+- typedef int dummy;
+-
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+-
+- # Check for potential -arch flags. It is not universal unless
+- # there are some -arch flags. Note that *ppc* also matches
+- # ppc64. This check is also rather less than ideal.
+- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
+- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+- esac
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- if test $ac_cv_c_bigendian = unknown; then
+- # See if sys/param.h defines the BYTE_ORDER macro.
+- cat >conftest.$ac_ext <<_ACEOF
++ # See if sys/param.h defines the BYTE_ORDER macro.
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <sys/types.h>
+- #include <sys/param.h>
++#include <sys/param.h>
+
+ int
+ main ()
+ {
+-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+- && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+- && LITTLE_ENDIAN)
+- bogus endian macros
+- #endif
++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
++ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
++ bogus endian macros
++#endif
+
+ ;
+ return 0;
+@@ -23184,34 +22822,33 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ # It does; now see whether it defined to BIG_ENDIAN or not.
+- cat >conftest.$ac_ext <<_ACEOF
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <sys/types.h>
+- #include <sys/param.h>
++#include <sys/param.h>
+
+ int
+ main ()
+ {
+ #if BYTE_ORDER != BIG_ENDIAN
+- not big endian
+- #endif
++ not big endian
++#endif
+
+ ;
+ return 0;
+@@ -23223,21 +22860,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_c_bigendian=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_c_bigendian=no
+@@ -23245,69 +22881,29 @@ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- fi
+- if test $ac_cv_c_bigendian = unknown; then
+- # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <limits.h>
+-
+-int
+-main ()
+-{
+-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+- bogus endian macros
+- #endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- # It does; now see whether it defined to _BIG_ENDIAN or not.
+- cat >conftest.$ac_ext <<_ACEOF
++ # It does not; compile a test program.
++if test "$cross_compiling" = yes; then
++ # try to guess the endianness by grepping values into an object file
++ ac_cv_c_bigendian=unknown
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <limits.h>
+-
++short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
++short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+ int
+ main ()
+ {
+-#ifndef _BIG_ENDIAN
+- not big endian
+- #endif
+-
++ _ascii (); _ebcdic ();
+ ;
+ return 0;
+ }
+@@ -23318,101 +22914,30 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
++ if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
+ ac_cv_c_bigendian=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_c_bigendian=no
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++ if test "$ac_cv_c_bigendian" = unknown; then
++ ac_cv_c_bigendian=no
++ else
++ # finding both strings is unlikely to happen, but who knows?
++ ac_cv_c_bigendian=unknown
++ fi
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- fi
+- if test $ac_cv_c_bigendian = unknown; then
+- # Compile a test program.
+- if test "$cross_compiling" = yes; then
+- # Try to guess by grepping values from an object file.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-short int ascii_mm[] =
+- { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+- short int ascii_ii[] =
+- { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+- int use_ascii (int i) {
+- return ascii_mm[i] + ascii_ii[i];
+- }
+- short int ebcdic_ii[] =
+- { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+- short int ebcdic_mm[] =
+- { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+- int use_ebcdic (int i) {
+- return ebcdic_mm[i] + ebcdic_ii[i];
+- }
+- extern int foo;
+-
+-int
+-main ()
+-{
+-return use_ascii (foo) == use_ebcdic (foo);
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+- ac_cv_c_bigendian=yes
+- fi
+- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+- if test "$ac_cv_c_bigendian" = unknown; then
+- ac_cv_c_bigendian=no
+- else
+- # finding both strings is unlikely to happen, but who knows?
+- ac_cv_c_bigendian=unknown
+- fi
+- fi
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+@@ -23431,14 +22956,14 @@ int
+ main ()
+ {
+
+- /* Are we little or big endian? From Harbison&Steele. */
+- union
+- {
+- long int l;
+- char c[sizeof (long int)];
+- } u;
+- u.l = 1;
+- return u.c[sizeof (long int) - 1] == 1;
++ /* Are we little or big endian? From Harbison&Steele. */
++ union
++ {
++ long int l;
++ char c[sizeof (long int)];
++ } u;
++ u.l = 1;
++ return u.c[sizeof (long int) - 1] == 1;
+
+ ;
+ return 0;
+@@ -23450,69 +22975,61 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_c_bigendian=no
+ else
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
+ ac_cv_c_bigendian=yes
+ fi
+-rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+
+
+- fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+-$as_echo "$ac_cv_c_bigendian" >&6; }
+- case $ac_cv_c_bigendian in #(
+- yes)
+- cat >>confdefs.h <<\_ACEOF
+-#define WORDS_BIGENDIAN 1
+-_ACEOF
+-;; #(
+- no)
+- ;; #(
+- universal)
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
++case $ac_cv_c_bigendian in
++ yes)
+
+ cat >>confdefs.h <<\_ACEOF
+-#define AC_APPLE_UNIVERSAL_BUILD 1
++#define WORDS_BIGENDIAN 1
+ _ACEOF
+-
+- ;; #(
+- *)
+- { { $as_echo "$as_me:$LINENO: error: unknown endianness
+- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+-$as_echo "$as_me: error: unknown endianness
+- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
++ ;;
++ no)
++ ;;
++ *)
++ { { echo "$as_me:$LINENO: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&5
++echo "$as_me: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+ { (exit 1); exit 1; }; } ;;
+- esac
++esac
+
+-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+-set x ${MAKE-make}
+-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.make <<\_ACEOF
+ SHELL = /bin/sh
+@@ -23529,30 +23046,30 @@ esac
+ rm -f conftest.make
+ fi
+ if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ SET_MAKE=
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+-$as_echo_n "checking whether ln -s works... " >&6; }
++{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+ LN_S=$as_ln_s
+ if test "$LN_S" = "ln -s"; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+-$as_echo "no, using $LN_S" >&6; }
++ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6; }
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-$as_echo_n "checking for ANSI C header files... " >&6; }
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -23579,21 +23096,20 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_stdc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_stdc=no
+@@ -23685,40 +23201,37 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+
+
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-$as_echo "$ac_cv_header_stdc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -23733,21 +23246,20 @@ fi
+
+ for ac_header in limits.h sys/times.h sys/wait.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -23763,33 +23275,32 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -23803,52 +23314,51 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to gnucash-devel at gnucash.org ##
+@@ -23857,24 +23367,21 @@ _ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -23887,11 +23394,11 @@ done
+
+ for ac_func in stpcpy memcpy timegm towupper
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -23944,42 +23451,35 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -23988,11 +23488,11 @@ done
+
+ for ac_func in setenv
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -24045,42 +23545,35 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ else
+@@ -24088,11 +23581,11 @@ else
+
+ for ac_func in putenv
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -24145,48 +23638,41 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ else
+
+- { { $as_echo "$as_me:$LINENO: error: Must have one of the setenv or putenv functions." >&5
+-$as_echo "$as_me: error: Must have one of the setenv or putenv functions." >&2;}
++ { { echo "$as_me:$LINENO: error: Must have one of the setenv or putenv functions." >&5
++echo "$as_me: error: Must have one of the setenv or putenv functions." >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+@@ -24200,8 +23686,8 @@ done
+ ##################################################
+ # Check for win32 platform
+ ##################################################
+-{ $as_echo "$as_me:$LINENO: checking for native Win32" >&5
+-$as_echo_n "checking for native Win32... " >&6; }
++{ echo "$as_me:$LINENO: checking for native Win32" >&5
++echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; }
+ case $host in
+ *-*-mingw*)
+ native_win32=yes
+@@ -24210,8 +23696,8 @@ case $host in
+ native_win32=no
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $native_win32" >&5
+-$as_echo "$native_win32" >&6; }
++{ echo "$as_me:$LINENO: result: $native_win32" >&5
++echo "${ECHO_T}$native_win32" >&6; }
+ if test "x$native_win32" = "xyes"; then
+ OS_WIN32_TRUE=
+ OS_WIN32_FALSE='#'
+@@ -24221,8 +23707,8 @@ else
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: checking for Win32 platform in general" >&5
+-$as_echo_n "checking for Win32 platform in general... " >&6; }
++{ echo "$as_me:$LINENO: checking for Win32 platform in general" >&5
++echo $ECHO_N "checking for Win32 platform in general... $ECHO_C" >&6; }
+ case $host in
+ *-*-mingw*|*-*-cygwin*)
+ platform_win32=yes
+@@ -24231,8 +23717,8 @@ case $host in
+ platform_win32=no
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5
+-$as_echo "$platform_win32" >&6; }
++{ echo "$as_me:$LINENO: result: $platform_win32" >&5
++echo "${ECHO_T}$platform_win32" >&6; }
+ if test "x$platform_win32" = "xyes"; then
+ PLATFORM_WIN32_TRUE=
+ PLATFORM_WIN32_FALSE='#'
+@@ -24251,8 +23737,8 @@ fi
+
+ if test "x$native_win32" = "xyes" ; then
+ HTMLHELP_LIBS=
+- { $as_echo "$as_me:$LINENO: checking for HtmlHelpW" >&5
+-$as_echo_n "checking for HtmlHelpW... " >&6; }
++ { echo "$as_me:$LINENO: checking for HtmlHelpW" >&5
++echo $ECHO_N "checking for HtmlHelpW... $ECHO_C" >&6; }
+ saved_LIBS="${LIBS}"
+ LIBS="${LIBS} -lhtmlhelp"
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24277,24 +23763,21 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ HTMLHELP_LIBS=-lhtmlhelp
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -24303,16 +23786,15 @@ _ACEOF
+
+
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="${saved_LIBS}"
+@@ -24321,10 +23803,10 @@ fi
+ ##################################################
+
+
+- { $as_echo "$as_me:$LINENO: checking for the tm_gmtoff member of struct tm" >&5
+-$as_echo_n "checking for the tm_gmtoff member of struct tm... " >&6; }
++ { echo "$as_me:$LINENO: checking for the tm_gmtoff member of struct tm" >&5
++echo $ECHO_N "checking for the tm_gmtoff member of struct tm... $ECHO_C" >&6; }
+ if test "${am_cv_struct_tm_gmtoff+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -24352,36 +23834,32 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ am_cv_struct_tm_gmtoff=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ am_cv_struct_tm_gmtoff=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_struct_tm_gmtoff" >&5
+-$as_echo "$am_cv_struct_tm_gmtoff" >&6; }
++{ echo "$as_me:$LINENO: result: $am_cv_struct_tm_gmtoff" >&5
++echo "${ECHO_T}$am_cv_struct_tm_gmtoff" >&6; }
+ if test $am_cv_struct_tm_gmtoff = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -24391,10 +23869,10 @@ _ACEOF
+ fi
+
+
+- { $as_echo "$as_me:$LINENO: checking if scanf supports %lld conversions" >&5
+-$as_echo_n "checking if scanf supports %lld conversions... " >&6; }
++ { echo "$as_me:$LINENO: checking if scanf supports %lld conversions" >&5
++echo $ECHO_N "checking if scanf supports %lld conversions... $ECHO_C" >&6; }
+ if test "${am_cv_scanf_lld+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$cross_compiling" = yes; then
+
+@@ -24405,8 +23883,8 @@ else
+ am_cv_scanf_lld=no
+ ;;
+ *)
+- { { $as_echo "$as_me:$LINENO: error: scanf support unknown." >&5
+-$as_echo "$as_me: error: scanf support unknown." >&2;}
++ { { echo "$as_me:$LINENO: error: scanf support unknown." >&5
++echo "$as_me: error: scanf support unknown." >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+@@ -24443,39 +23921,36 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ am_cv_scanf_lld=yes
+ else
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
+ am_cv_scanf_lld=no
+ fi
+-rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_scanf_lld" >&5
+-$as_echo "$am_cv_scanf_lld" >&6; }
++{ echo "$as_me:$LINENO: result: $am_cv_scanf_lld" >&5
++echo "${ECHO_T}$am_cv_scanf_lld" >&6; }
+ if test $am_cv_scanf_lld = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -24486,10 +23961,10 @@ _ACEOF
+
+ if test x$am_cv_scanf_lld = "xno"; then
+
+- { $as_echo "$as_me:$LINENO: checking if scanf supports %qd conversions" >&5
+-$as_echo_n "checking if scanf supports %qd conversions... " >&6; }
++ { echo "$as_me:$LINENO: checking if scanf supports %qd conversions" >&5
++echo $ECHO_N "checking if scanf supports %qd conversions... $ECHO_C" >&6; }
+ if test "${am_cv_scanf_qd+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$cross_compiling" = yes; then
+
+@@ -24500,8 +23975,8 @@ else
+ am_cv_scanf_qd=no
+ ;;
+ *)
+- { { $as_echo "$as_me:$LINENO: error: scanf support unknown." >&5
+-$as_echo "$as_me: error: scanf support unknown." >&2;}
++ { { echo "$as_me:$LINENO: error: scanf support unknown." >&5
++echo "$as_me: error: scanf support unknown." >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+@@ -24538,39 +24013,36 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ am_cv_scanf_qd=yes
+ else
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
+ am_cv_scanf_qd=no
+ fi
+-rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_scanf_qd" >&5
+-$as_echo "$am_cv_scanf_qd" >&6; }
++{ echo "$as_me:$LINENO: result: $am_cv_scanf_qd" >&5
++echo "${ECHO_T}$am_cv_scanf_qd" >&6; }
+ if test $am_cv_scanf_qd = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -24582,10 +24054,10 @@ _ACEOF
+
+ if test x$am_cv_scanf_qd = "xno"; then
+
+- { $as_echo "$as_me:$LINENO: checking if scanf supports %I64d conversions" >&5
+-$as_echo_n "checking if scanf supports %I64d conversions... " >&6; }
++ { echo "$as_me:$LINENO: checking if scanf supports %I64d conversions" >&5
++echo $ECHO_N "checking if scanf supports %I64d conversions... $ECHO_C" >&6; }
+ if test "${am_cv_scanf_i64d+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$cross_compiling" = yes; then
+
+@@ -24596,8 +24068,8 @@ else
+ am_cv_scanf_i64d=yes
+ ;;
+ *)
+- { { $as_echo "$as_me:$LINENO: error: scanf support unknown." >&5
+-$as_echo "$as_me: error: scanf support unknown." >&2;}
++ { { echo "$as_me:$LINENO: error: scanf support unknown." >&5
++echo "$as_me: error: scanf support unknown." >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+@@ -24634,39 +24106,36 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ am_cv_scanf_i64d=yes
+ else
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
+ am_cv_scanf_i64d=no
+ fi
+-rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_scanf_i64d" >&5
+-$as_echo "$am_cv_scanf_i64d" >&6; }
++{ echo "$as_me:$LINENO: result: $am_cv_scanf_i64d" >&5
++echo "${ECHO_T}$am_cv_scanf_i64d" >&6; }
+ if test $am_cv_scanf_i64d = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -24676,8 +24145,8 @@ _ACEOF
+ fi
+
+ if test x$am_cv_scanf_i64d = "xno"; then
+- { { $as_echo "$as_me:$LINENO: error: Cannot continue, no long long conversion support in scanf." >&5
+-$as_echo "$as_me: error: Cannot continue, no long long conversion support in scanf." >&2;}
++ { { echo "$as_me:$LINENO: error: Cannot continue, no long long conversion support in scanf." >&5
++echo "$as_me: error: Cannot continue, no long long conversion support in scanf." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+@@ -24693,10 +24162,10 @@ if test $? = 0 ; then
+
+ # Extract the first word of "swig", so it can be a program name with args.
+ set dummy swig; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_SWIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $SWIG in
+ [\\/]* | ?:[\\/]*)
+@@ -24711,7 +24180,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -24723,25 +24192,25 @@ esac
+ fi
+ SWIG=$ac_cv_path_SWIG
+ if test -n "$SWIG"; then
+- { $as_echo "$as_me:$LINENO: result: $SWIG" >&5
+-$as_echo "$SWIG" >&6; }
++ { echo "$as_me:$LINENO: result: $SWIG" >&5
++echo "${ECHO_T}$SWIG" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+ if test -z "$SWIG" ; then
+- { { $as_echo "$as_me:$LINENO: error: cannot find 'swig' program. You should look at http://www.swig.org" >&5
+-$as_echo "$as_me: error: cannot find 'swig' program. You should look at http://www.swig.org" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot find 'swig' program. You should look at http://www.swig.org" >&5
++echo "$as_me: error: cannot find 'swig' program. You should look at http://www.swig.org" >&2;}
+ { (exit 1); exit 1; }; }
+ SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false'
+ elif test -n "1.3.28" ; then
+- { $as_echo "$as_me:$LINENO: checking for SWIG version" >&5
+-$as_echo_n "checking for SWIG version... " >&6; }
++ { echo "$as_me:$LINENO: checking for SWIG version" >&5
++echo $ECHO_N "checking for SWIG version... $ECHO_C" >&6; }
+ swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`
+- { $as_echo "$as_me:$LINENO: result: $swig_version" >&5
+-$as_echo "$swig_version" >&6; }
++ { echo "$as_me:$LINENO: result: $swig_version" >&5
++echo "${ECHO_T}$swig_version" >&6; }
+ if test -n "$swig_version" ; then
+ # Calculate the required version number components
+ required=1.3.28
+@@ -24778,17 +24247,17 @@ $as_echo "$swig_version" >&6; }
+ if test $available_major -ne $required_major \
+ -o $available_minor -ne $required_minor \
+ -o $available_patch -lt $required_patch ; then
+- { { $as_echo "$as_me:$LINENO: error: SWIG version >= 1.3.28 is required. You have $swig_version. You should look at http://www.swig.org" >&5
+-$as_echo "$as_me: error: SWIG version >= 1.3.28 is required. You have $swig_version. You should look at http://www.swig.org" >&2;}
++ { { echo "$as_me:$LINENO: error: SWIG version >= 1.3.28 is required. You have $swig_version. You should look at http://www.swig.org" >&5
++echo "$as_me: error: SWIG version >= 1.3.28 is required. You have $swig_version. You should look at http://www.swig.org" >&2;}
+ { (exit 1); exit 1; }; }
+ SWIG='echo "Error: SWIG version >= 1.3.28 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false'
+ else
+- { $as_echo "$as_me:$LINENO: SWIG executable is '$SWIG'" >&5
+-$as_echo "$as_me: SWIG executable is '$SWIG'" >&6;}
++ { echo "$as_me:$LINENO: SWIG executable is '$SWIG'" >&5
++echo "$as_me: SWIG executable is '$SWIG'" >&6;}
+ fi
+ else
+- { { $as_echo "$as_me:$LINENO: error: cannot determine SWIG version" >&5
+-$as_echo "$as_me: error: cannot determine SWIG version" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot determine SWIG version" >&5
++echo "$as_me: error: cannot determine SWIG version" >&2;}
+ { (exit 1); exit 1; }; }
+ SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false'
+ fi
+@@ -24797,15 +24266,15 @@ $as_echo "$as_me: error: cannot determine SWIG version" >&2;}
+ else
+ BUILDING_FROM_SVN=no
+ # Make sure we've got swig-runtime.h and gnc-svninfo.h
+- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/src/swig-runtime.h" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/src/swig-runtime.h" >&5
+-$as_echo_n "checking for ${srcdir}/src/swig-runtime.h... " >&6; }
++ as_ac_File=`echo "ac_cv_file_${srcdir}/src/swig-runtime.h" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for ${srcdir}/src/swig-runtime.h" >&5
++echo $ECHO_N "checking for ${srcdir}/src/swig-runtime.h... $ECHO_C" >&6; }
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ test "$cross_compiling" = yes &&
+- { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
++echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+ if test -r "${srcdir}/src/swig-runtime.h"; then
+ eval "$as_ac_File=yes"
+@@ -24813,16 +24282,13 @@ else
+ eval "$as_ac_File=no"
+ fi
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_File'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_File'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_File'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_File'}'` = yes; then
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error:
++ { { echo "$as_me:$LINENO: error:
+
+ It looks like you are NOT building from Subversion
+ but I cannot find swig-runtime.h. Check your PATH
+@@ -24831,7 +24297,7 @@ Either that or contact gnucash-devel at gnucash.org because
+ the tarball you downloaded is broken.
+
+ " >&5
+-$as_echo "$as_me: error:
++echo "$as_me: error:
+
+ It looks like you are NOT building from Subversion
+ but I cannot find swig-runtime.h. Check your PATH
+@@ -24843,15 +24309,15 @@ the tarball you downloaded is broken.
+ { (exit 1); exit 1; }; }
+ fi
+
+- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/src/gnome-utils/gnc-svninfo.h" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/src/gnome-utils/gnc-svninfo.h" >&5
+-$as_echo_n "checking for ${srcdir}/src/gnome-utils/gnc-svninfo.h... " >&6; }
++ as_ac_File=`echo "ac_cv_file_${srcdir}/src/gnome-utils/gnc-svninfo.h" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for ${srcdir}/src/gnome-utils/gnc-svninfo.h" >&5
++echo $ECHO_N "checking for ${srcdir}/src/gnome-utils/gnc-svninfo.h... $ECHO_C" >&6; }
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ test "$cross_compiling" = yes &&
+- { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
++echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+ if test -r "${srcdir}/src/gnome-utils/gnc-svninfo.h"; then
+ eval "$as_ac_File=yes"
+@@ -24859,16 +24325,13 @@ else
+ eval "$as_ac_File=no"
+ fi
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_File'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_File'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_File'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_File'}'` = yes; then
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error:
++ { { echo "$as_me:$LINENO: error:
+
+ It looks like you are NOT building from Subversion
+ but I cannot find gnc-svninfo.h. Check your PATH
+@@ -24877,7 +24340,7 @@ Either that or contact gnucash-devel at gnucash.org because
+ the tarball you downloaded is broken.
+
+ " >&5
+-$as_echo "$as_me: error:
++echo "$as_me: error:
+
+ It looks like you are NOT building from Subversion
+ but I cannot find gnc-svninfo.h. Check your PATH
+@@ -24914,21 +24377,20 @@ fi
+
+ for ac_header in X11/Xlib.h glob.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -24944,33 +24406,32 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -24984,52 +24445,51 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to gnucash-devel at gnucash.org ##
+@@ -25038,24 +24498,21 @@ _ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -25078,11 +24535,11 @@ fi
+
+ for ac_func in chown gethostname getppid getuid gettimeofday gmtime_r
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -25135,42 +24592,35 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -25180,11 +24630,11 @@ done
+
+ for ac_func in gethostid link
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -25237,42 +24687,35 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -25300,14 +24743,14 @@ fi
+ BINRELOC_CFLAGS=
+ BINRELOC_LIBS=
+ if test "x$enable_binreloc" = "xauto"; then
+- { $as_echo "$as_me:$LINENO: checking for /proc/self/maps" >&5
+-$as_echo_n "checking for /proc/self/maps... " >&6; }
++ { echo "$as_me:$LINENO: checking for /proc/self/maps" >&5
++echo $ECHO_N "checking for /proc/self/maps... $ECHO_C" >&6; }
+ if test "${ac_cv_file__proc_self_maps+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ test "$cross_compiling" = yes &&
+- { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
++echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+ if test -r "/proc/self/maps"; then
+ ac_cv_file__proc_self_maps=yes
+@@ -25315,13 +24758,13 @@ else
+ ac_cv_file__proc_self_maps=no
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__proc_self_maps" >&5
+-$as_echo "$ac_cv_file__proc_self_maps" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_file__proc_self_maps" >&5
++echo "${ECHO_T}$ac_cv_file__proc_self_maps" >&6; }
+
+- { $as_echo "$as_me:$LINENO: checking whether everything is installed to the same prefix" >&5
+-$as_echo_n "checking whether everything is installed to the same prefix... " >&6; }
++ { echo "$as_me:$LINENO: checking whether everything is installed to the same prefix" >&5
++echo $ECHO_N "checking whether everything is installed to the same prefix... $ECHO_C" >&6; }
+ if test "${br_cv_valid_prefixes+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ # datarootdir variables was introduced with autoconf-2.60
+@@ -25336,13 +24779,13 @@ else
+ fi
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $br_cv_valid_prefixes" >&5
+-$as_echo "$br_cv_valid_prefixes" >&6; }
++{ echo "$as_me:$LINENO: result: $br_cv_valid_prefixes" >&5
++echo "${ECHO_T}$br_cv_valid_prefixes" >&6; }
+ fi
+- { $as_echo "$as_me:$LINENO: checking whether binary relocation support should be enabled" >&5
+-$as_echo_n "checking whether binary relocation support should be enabled... " >&6; }
++ { echo "$as_me:$LINENO: checking whether binary relocation support should be enabled" >&5
++echo $ECHO_N "checking whether binary relocation support should be enabled... $ECHO_C" >&6; }
+ if test "${br_cv_binreloc+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "x$enable_binreloc" = "xyes"; then
+ br_cv_binreloc=yes
+@@ -25357,22 +24800,22 @@ else
+ br_cv_binreloc=no
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $br_cv_binreloc" >&5
+-$as_echo "$br_cv_binreloc" >&6; }
++{ echo "$as_me:$LINENO: result: $br_cv_binreloc" >&5
++echo "${ECHO_T}$br_cv_binreloc" >&6; }
+
+ if test "x$br_cv_binreloc" = "xyes"; then
+ BINRELOC_CFLAGS="-DENABLE_BINRELOC"
+
+ cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_BINRELOC /**/
++#define ENABLE_BINRELOC
+ _ACEOF
+
+ if test "x$enable_binreloc_threads" = "xyes"; then
+
+-{ $as_echo "$as_me:$LINENO: checking for pthread_getspecific in -lpthread" >&5
+-$as_echo_n "checking for pthread_getspecific in -lpthread... " >&6; }
++{ echo "$as_me:$LINENO: checking for pthread_getspecific in -lpthread" >&5
++echo $ECHO_N "checking for pthread_getspecific in -lpthread... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_pthread_pthread_getspecific+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthread $LIBS"
+@@ -25404,37 +24847,33 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_pthread_pthread_getspecific=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_pthread_pthread_getspecific=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_getspecific" >&5
+-$as_echo "$ac_cv_lib_pthread_pthread_getspecific" >&6; }
+-if test "x$ac_cv_lib_pthread_pthread_getspecific" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_getspecific" >&5
++echo "${ECHO_T}$ac_cv_lib_pthread_pthread_getspecific" >&6; }
++if test $ac_cv_lib_pthread_pthread_getspecific = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBPTHREAD 1
+ _ACEOF
+@@ -25445,10 +24884,10 @@ fi
+
+ fi
+
+- { $as_echo "$as_me:$LINENO: checking whether binary relocation should use threads" >&5
+-$as_echo_n "checking whether binary relocation should use threads... " >&6; }
++ { echo "$as_me:$LINENO: checking whether binary relocation should use threads" >&5
++echo $ECHO_N "checking whether binary relocation should use threads... $ECHO_C" >&6; }
+ if test "${br_cv_binreloc_threads+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "x$enable_binreloc_threads" = "xyes"; then
+ if test "x$ac_cv_lib_pthread_pthread_getspecific" = "xyes"; then
+@@ -25460,8 +24899,8 @@ else
+ br_cv_binreloc_threads=no
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $br_cv_binreloc_threads" >&5
+-$as_echo "$br_cv_binreloc_threads" >&6; }
++{ echo "$as_me:$LINENO: result: $br_cv_binreloc_threads" >&5
++echo "${ECHO_T}$br_cv_binreloc_threads" >&6; }
+
+ if test "x$br_cv_binreloc_threads" = "xyes"; then
+ BINRELOC_LIBS="-lpthread"
+@@ -25488,10 +24927,10 @@ _ACEOF
+
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+@@ -25506,7 +24945,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -25518,11 +24957,11 @@ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -25530,10 +24969,10 @@ if test "x$PKG_CONFIG" = x; then
+ # @*%&$ Ximian programmers renamed this application
+ # Extract the first word of "pkgconfig", so it can be a program name with args.
+ set dummy pkgconfig; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+@@ -25548,7 +24987,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -25560,17 +24999,17 @@ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+ if test "x$PKG_CONFIG" = x; then
+- { { $as_echo "$as_me:$LINENO: error: Could not find the pkg-config (or pkgconfig) program." >&5
+-$as_echo "$as_me: error: Could not find the pkg-config (or pkgconfig) program." >&2;}
++ { { echo "$as_me:$LINENO: error: Could not find the pkg-config (or pkgconfig) program." >&5
++echo "$as_me: error: Could not find the pkg-config (or pkgconfig) program." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+@@ -25614,10 +25053,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+@@ -25632,7 +25071,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -25644,11 +25083,11 @@ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -25657,10 +25096,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+@@ -25675,7 +25114,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -25687,11 +25126,11 @@ esac
+ fi
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+@@ -25699,8 +25138,12 @@ fi
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+@@ -25712,14 +25155,14 @@ fi
+ fi
+ if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.16
+- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
++ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ PKG_CONFIG=""
+ fi
+
+@@ -25733,8 +25176,8 @@ fi
+ fi
+
+ min_glib_version=2.6.0
+- { $as_echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
+-$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }
++ { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
++echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; }
+
+ if test x$PKG_CONFIG != xno ; then
+ ## don't try to run the test against uninstalled libtool libs
+@@ -25788,8 +25231,9 @@ main ()
+ {
+ int major, minor, micro;
+ char *tmp_version;
++ int ignored;
+
+- system ("touch conf.glibtest");
++ ignored = system ("touch conf.glibtest");
+
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
+ tmp_version = g_strdup("$min_glib_version");
+@@ -25857,32 +25301,29 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
+ no_glib=yes
+ fi
+-rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+
+@@ -25892,12 +25333,12 @@ fi
+ fi
+ fi
+ if test "x$no_glib" = x ; then
+- { $as_echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
+-$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }
++ { echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
++echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }
+ :
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** A new enough version of pkg-config was not found."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig/"
+@@ -25934,21 +25375,18 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+@@ -25959,14 +25397,13 @@ $as_echo "$ac_try_echo") >&5
+ echo "*** If you have an old version installed, it is best to remove it, although"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$ac_save_CFLAGS"
+@@ -25978,11 +25415,11 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ GLIB_GENMARSHAL=""
+ GOBJECT_QUERY=""
+ GLIB_MKENUMS=""
+- { { $as_echo "$as_me:$LINENO: error:
++ { { echo "$as_me:$LINENO: error:
+ *** GLIB >= 2.6 is required to build Gnucash; please make sure you have the
+ *** development headers installed. The latest version of GLIB is
+ *** always available at ftp://ftp.gnome.org/pub/gnome/sources/glib/." >&5
+-$as_echo "$as_me: error:
++echo "$as_me: error:
+ *** GLIB >= 2.6 is required to build Gnucash; please make sure you have the
+ *** development headers installed. The latest version of GLIB is
+ *** always available at ftp://ftp.gnome.org/pub/gnome/sources/glib/." >&2;}
+@@ -25998,17 +25435,17 @@ $as_echo "$as_me: error:
+
+ if test ${no_glib}x = yesx
+ then
+- { { $as_echo "$as_me:$LINENO: error: Cannot find glib. Check config.log" >&5
+-$as_echo "$as_me: error: Cannot find glib. Check config.log" >&2;}
++ { { echo "$as_me:$LINENO: error: Cannot find glib. Check config.log" >&5
++echo "$as_me: error: Cannot find glib. Check config.log" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking for GLIB - version >= 2.8.0" >&5
+-$as_echo_n "checking for GLIB - version >= 2.8.0... " >&6; }
++{ echo "$as_me:$LINENO: checking for GLIB - version >= 2.8.0" >&5
++echo $ECHO_N "checking for GLIB - version >= 2.8.0... $ECHO_C" >&6; }
+ if $PKG_CONFIG 'glib-2.0 >= 2.8.0'
+ then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_GLIB_2_8 1
+@@ -26016,11 +25453,11 @@ _ACEOF
+
+ HAVE_GLIB_2_8=yes
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ if test "x${native_win32}" = "xyes"; then
+- { { $as_echo "$as_me:$LINENO: error: *** GLIB >= 2.8 is required to build Gnucash on Windows." >&5
+-$as_echo "$as_me: error: *** GLIB >= 2.8 is required to build Gnucash on Windows." >&2;}
++ { { echo "$as_me:$LINENO: error: *** GLIB >= 2.8 is required to build Gnucash on Windows." >&5
++echo "$as_me: error: *** GLIB >= 2.8 is required to build Gnucash on Windows." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ GLIB26_LIBS="$GLIB_LIBS"
+@@ -26038,12 +25475,12 @@ else
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: checking for GLIB - version >= 2.9.0" >&5
+-$as_echo_n "checking for GLIB - version >= 2.9.0... " >&6; }
++{ echo "$as_me:$LINENO: checking for GLIB - version >= 2.9.0" >&5
++echo $ECHO_N "checking for GLIB - version >= 2.9.0... $ECHO_C" >&6; }
+ if $PKG_CONFIG 'glib-2.0 >= 2.9.0'
+ then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_GLIB29 1
+@@ -26051,16 +25488,16 @@ _ACEOF
+
+ HAVE_GLIB29=yes
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking for GLIB - version >= 2.12.0" >&5
+-$as_echo_n "checking for GLIB - version >= 2.12.0... " >&6; }
++{ echo "$as_me:$LINENO: checking for GLIB - version >= 2.12.0" >&5
++echo $ECHO_N "checking for GLIB - version >= 2.12.0... $ECHO_C" >&6; }
+ if $PKG_CONFIG 'glib-2.0 >= 2.12.0'
+ then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_GLIB_2_12 1
+@@ -26068,8 +25505,8 @@ _ACEOF
+
+ HAVE_GLIB_2_12=yes
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ if test "x$HAVE_GLIB_2_8" = "xyes"; then
+ HAVE_GLIB_2_8_TRUE=
+@@ -26080,16 +25517,16 @@ else
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: checking for untested GLIB versions (glib >= 2.13.0)" >&5
+-$as_echo_n "checking for untested GLIB versions (glib >= 2.13.0)... " >&6; }
++{ echo "$as_me:$LINENO: checking for untested GLIB versions (glib >= 2.13.0)" >&5
++echo $ECHO_N "checking for untested GLIB versions (glib >= 2.13.0)... $ECHO_C" >&6; }
+ if $PKG_CONFIG 'glib-2.0 >= 2.13.0'
+ then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ HAVE_UNTESTED_GLIB=yes
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -26101,21 +25538,20 @@ fi
+
+ for ac_header in dlfcn.h dl.h utmp.h locale.h mcheck.h unistd.h wctype.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26131,33 +25567,32 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26171,52 +25606,51 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to gnucash-devel at gnucash.org ##
+@@ -26225,24 +25659,21 @@ _ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -26256,11 +25687,11 @@ DL_LIB=
+
+ for ac_func in dlsym
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -26313,50 +25744,43 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ else
+
+- { $as_echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5
+-$as_echo_n "checking for dlsym in -ldl... " >&6; }
++ { echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5
++echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlsym+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
+@@ -26388,44 +25812,40 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dl_dlsym=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dl_dlsym=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
+-$as_echo "$ac_cv_lib_dl_dlsym" >&6; }
+-if test "x$ac_cv_lib_dl_dlsym" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6; }
++if test $ac_cv_lib_dl_dlsym = yes; then
+ DL_LIB="-ldl"
+ else
+
+- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-$as_echo_n "checking for shl_load in -ldld... " >&6; }
++ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldld $LIBS"
+@@ -26457,48 +25877,44 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dld_shl_load=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dld_shl_load=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
++if test $ac_cv_lib_dld_shl_load = yes; then
+ DL_LIB="-ldld"
+ else
+
+
+ for ac_func in dlsym
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -26551,42 +25967,35 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ DL_LIB=""
+ fi
+@@ -26608,11 +26017,11 @@ LIBS="$LIBS $DL_LIB"
+
+ for ac_func in dlerror
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -26665,42 +26074,35 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -26719,21 +26121,21 @@ LIBS="$oLIBS"
+
+
+
+-{ $as_echo "$as_me:$LINENO: checking for darwin" >&5
+-$as_echo_n "checking for darwin... " >&6; }
++{ echo "$as_me:$LINENO: checking for darwin" >&5
++echo $ECHO_N "checking for darwin... $ECHO_C" >&6; }
+ case $host_os in
+ rhapsody* | darwin1*)
+- { $as_echo "$as_me:$LINENO: result: yes, but too old" >&5
+-$as_echo "yes, but too old" >&6; }
+- { { $as_echo "$as_me:$LINENO: error: This platform is not supported, please
++ { echo "$as_me:$LINENO: result: yes, but too old" >&5
++echo "${ECHO_T}yes, but too old" >&6; }
++ { { echo "$as_me:$LINENO: error: This platform is not supported, please
+ update to latest darwin" >&5
+-$as_echo "$as_me: error: This platform is not supported, please
++echo "$as_me: error: This platform is not supported, please
+ update to latest darwin" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ darwin*)
+- { $as_echo "$as_me:$LINENO: result: yes, moving on..." >&5
+-$as_echo "yes, moving on..." >&6; }
++ { echo "$as_me:$LINENO: result: yes, moving on..." >&5
++echo "${ECHO_T}yes, moving on..." >&6; }
+ # AC_CHECK_HEADERS(popt.h)
+ # AC_MSG_RESULT([yes, patching libtool to always build dylibs])
+ # mv libtool libtool.old
+@@ -26744,11 +26146,134 @@ $as_echo "yes, moving on..." >&6; }
+ # rm libtool.old
+ ;;
+ *)
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ ;;
+ esac
+
++### --------------------------------------------------------------------------
++### Check to see if GDK uses the quartz backend and if we can use
++### MacOSX integration
++_gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
++ if test x$_gdk_tgt = xquartz; then
++ GDK_TARGET_QUARTZ_TRUE=
++ GDK_TARGET_QUARTZ_FALSE='#'
++else
++ GDK_TARGET_QUARTZ_TRUE='#'
++ GDK_TARGET_QUARTZ_FALSE=
++fi
++
++if test "x$_gdk_tgt" = xquartz; then
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for IGE_MAC" >&5
++echo $ECHO_N "checking for IGE_MAC... $ECHO_C" >&6; }
++
++if test -n "$IGE_MAC_CFLAGS"; then
++ pkg_cv_IGE_MAC_CFLAGS="$IGE_MAC_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\"") >&5
++ ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_IGE_MAC_CFLAGS=`$PKG_CONFIG --cflags "ige-mac-integration" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$IGE_MAC_LIBS"; then
++ pkg_cv_IGE_MAC_LIBS="$IGE_MAC_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\"") >&5
++ ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_IGE_MAC_LIBS=`$PKG_CONFIG --libs "ige-mac-integration" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ige-mac-integration" 2>&1`
++ else
++ IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ige-mac-integration" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$IGE_MAC_PKG_ERRORS" >&5
++
++ { { echo "$as_me:$LINENO: error: Package requirements (ige-mac-integration) were not met:
++
++$IGE_MAC_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables IGE_MAC_CFLAGS
++and IGE_MAC_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++echo "$as_me: error: Package requirements (ige-mac-integration) were not met:
++
++$IGE_MAC_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables IGE_MAC_CFLAGS
++and IGE_MAC_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
++ { (exit 1); exit 1; }; }
++elif test $pkg_failed = untried; then
++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables IGE_MAC_CFLAGS
++and IGE_MAC_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables IGE_MAC_CFLAGS
++and IGE_MAC_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++else
++ IGE_MAC_CFLAGS=$pkg_cv_IGE_MAC_CFLAGS
++ IGE_MAC_LIBS=$pkg_cv_IGE_MAC_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ :
++fi
++
++
++fi
+
+ ### --------------------------------------------------------------------------
+ ### Guile version checks (should this be something other than the Gnome check?)
+@@ -26767,10 +26292,10 @@ GUILE_LIBS=""
+ saved_cppflags="$CPPFLAGS"
+ LDFLAGS="$LDFLAGS $GNOME_LIBDIR"
+
+- { $as_echo "$as_me:$LINENO: checking for qt_null in -lqthreads" >&5
+-$as_echo_n "checking for qt_null in -lqthreads... " >&6; }
++ { echo "$as_me:$LINENO: checking for qt_null in -lqthreads" >&5
++echo $ECHO_N "checking for qt_null in -lqthreads... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_qthreads_qt_null+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lqthreads $LIBS $LIBS"
+@@ -26802,46 +26327,42 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_qthreads_qt_null=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_qthreads_qt_null=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_qthreads_qt_null" >&5
+-$as_echo "$ac_cv_lib_qthreads_qt_null" >&6; }
+-if test "x$ac_cv_lib_qthreads_qt_null" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_qthreads_qt_null" >&5
++echo "${ECHO_T}$ac_cv_lib_qthreads_qt_null" >&6; }
++if test $ac_cv_lib_qthreads_qt_null = yes; then
+
+ QTTHREADS_LIB="-lqthreads"
+
+ else
+
+- { $as_echo "$as_me:$LINENO: checking for qt_null in -lqt" >&5
+-$as_echo_n "checking for qt_null in -lqt... " >&6; }
++ { echo "$as_me:$LINENO: checking for qt_null in -lqt" >&5
++echo $ECHO_N "checking for qt_null in -lqt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_qt_qt_null+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lqt $LIBS"
+@@ -26873,37 +26394,33 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_qt_qt_null=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_qt_qt_null=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_qt_qt_null" >&5
+-$as_echo "$ac_cv_lib_qt_qt_null" >&6; }
+-if test "x$ac_cv_lib_qt_qt_null" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_qt_qt_null" >&5
++echo "${ECHO_T}$ac_cv_lib_qt_qt_null" >&6; }
++if test $ac_cv_lib_qt_qt_null = yes; then
+ QTTHREADS_LIB="-lqt"
+ fi
+
+@@ -26912,10 +26429,10 @@ fi
+
+
+
+- { $as_echo "$as_me:$LINENO: checking for main in -ltermcap" >&5
+-$as_echo_n "checking for main in -ltermcap... " >&6; }
++ { echo "$as_me:$LINENO: checking for main in -ltermcap" >&5
++echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_termcap_main+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltermcap $LIBS"
+@@ -26941,44 +26458,40 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_termcap_main=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_termcap_main=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5
+-$as_echo "$ac_cv_lib_termcap_main" >&6; }
+-if test "x$ac_cv_lib_termcap_main" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5
++echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6; }
++if test $ac_cv_lib_termcap_main = yes; then
+ TERMCAP_LIB="-ltermcap"
+ fi
+
+- { $as_echo "$as_me:$LINENO: checking for main in -lreadline" >&5
+-$as_echo_n "checking for main in -lreadline... " >&6; }
++ { echo "$as_me:$LINENO: checking for main in -lreadline" >&5
++echo $ECHO_N "checking for main in -lreadline... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_readline_main+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lreadline $TERMCAP_LIB $LIBS"
+@@ -27004,37 +26517,33 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_readline_main=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_readline_main=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_main" >&5
+-$as_echo "$ac_cv_lib_readline_main" >&6; }
+-if test "x$ac_cv_lib_readline_main" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_main" >&5
++echo "${ECHO_T}$ac_cv_lib_readline_main" >&6; }
++if test $ac_cv_lib_readline_main = yes; then
+ READLINE_LIB="-lreadline"
+ fi
+
+@@ -27050,10 +26559,10 @@ fi
+
+ # Extract the first word of "$name_build_guile", so it can be a program name with args.
+ set dummy $name_build_guile; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_BUILD_GUILE+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$BUILD_GUILE"; then
+ ac_cv_prog_BUILD_GUILE="$BUILD_GUILE" # Let the user override the test.
+@@ -27066,7 +26575,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_BUILD_GUILE="yes"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -27078,24 +26587,24 @@ fi
+ fi
+ BUILD_GUILE=$ac_cv_prog_BUILD_GUILE
+ if test -n "$BUILD_GUILE"; then
+- { $as_echo "$as_me:$LINENO: result: $BUILD_GUILE" >&5
+-$as_echo "$BUILD_GUILE" >&6; }
++ { echo "$as_me:$LINENO: result: $BUILD_GUILE" >&5
++echo "${ECHO_T}$BUILD_GUILE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+ if test "x$BUILD_GUILE" = "xyes"; then
+- { $as_echo "$as_me:$LINENO: checking whether $name_build_guile works" >&5
+-$as_echo_n "checking whether $name_build_guile works... " >&6; }
++ { echo "$as_me:$LINENO: checking whether $name_build_guile works" >&5
++echo $ECHO_N "checking whether $name_build_guile works... $ECHO_C" >&6; }
+ if test x`$name_build_guile --version >/dev/null 2>&1 || \
+ echo no` = xno; then
+ BUILD_GUILE=no
+ fi
+- { $as_echo "$as_me:$LINENO: result: $BUILD_GUILE" >&5
+-$as_echo "$BUILD_GUILE" >&6; }
++ { echo "$as_me:$LINENO: result: $BUILD_GUILE" >&5
++echo "${ECHO_T}$BUILD_GUILE" >&6; }
+ else
+
+ if test "x$cross_compiling" = "xyes" ; then
+@@ -27106,10 +26615,10 @@ $as_echo "$BUILD_GUILE" >&6; }
+
+ # Extract the first word of "$name_build_guile", so it can be a program name with args.
+ set dummy $name_build_guile; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_BUILD_GUILE+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$BUILD_GUILE"; then
+ ac_cv_prog_BUILD_GUILE="$BUILD_GUILE" # Let the user override the test.
+@@ -27122,7 +26631,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_BUILD_GUILE="yes"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -27134,32 +26643,32 @@ fi
+ fi
+ BUILD_GUILE=$ac_cv_prog_BUILD_GUILE
+ if test -n "$BUILD_GUILE"; then
+- { $as_echo "$as_me:$LINENO: result: $BUILD_GUILE" >&5
+-$as_echo "$BUILD_GUILE" >&6; }
++ { echo "$as_me:$LINENO: result: $BUILD_GUILE" >&5
++echo "${ECHO_T}$BUILD_GUILE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+ if test "x$BUILD_GUILE" = "xyes"; then
+- { $as_echo "$as_me:$LINENO: checking whether $name_build_guile works" >&5
+-$as_echo_n "checking whether $name_build_guile works... " >&6; }
++ { echo "$as_me:$LINENO: checking whether $name_build_guile works" >&5
++echo $ECHO_N "checking whether $name_build_guile works... $ECHO_C" >&6; }
+ if test x`$name_build_guile --version >/dev/null 2>&1 || \
+ echo no` = xno; then
+ BUILD_GUILE=no
+ fi
+- { $as_echo "$as_me:$LINENO: result: $BUILD_GUILE" >&5
+-$as_echo "$BUILD_GUILE" >&6; }
++ { echo "$as_me:$LINENO: result: $BUILD_GUILE" >&5
++echo "${ECHO_T}$BUILD_GUILE" >&6; }
+ fi
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: checking for sin in -lm" >&5
+-$as_echo_n "checking for sin in -lm... " >&6; }
++{ echo "$as_me:$LINENO: checking for sin in -lm" >&5
++echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_m_sin+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lm $LIBS"
+@@ -27191,37 +26700,33 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_m_sin=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_m_sin=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sin" >&5
+-$as_echo "$ac_cv_lib_m_sin" >&6; }
+-if test "x$ac_cv_lib_m_sin" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_sin" >&5
++echo "${ECHO_T}$ac_cv_lib_m_sin" >&6; }
++if test $ac_cv_lib_m_sin = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBM 1
+ _ACEOF
+@@ -27232,23 +26737,23 @@ fi
+
+
+ if test "x$BUILD_GUILE" = "xyes"; then
+- { $as_echo "$as_me:$LINENO: checking for guile libraries" >&5
+-$as_echo_n "checking for guile libraries... " >&6; }
++ { echo "$as_me:$LINENO: checking for guile libraries" >&5
++echo $ECHO_N "checking for guile libraries... $ECHO_C" >&6; }
+ GUILE_LIBS="`$name_build_guile link`"
+- { $as_echo "$as_me:$LINENO: result: $GUILE_LIBS" >&5
+-$as_echo "$GUILE_LIBS" >&6; }
+- { $as_echo "$as_me:$LINENO: checking for guile headers" >&5
+-$as_echo_n "checking for guile headers... " >&6; }
++ { echo "$as_me:$LINENO: result: $GUILE_LIBS" >&5
++echo "${ECHO_T}$GUILE_LIBS" >&6; }
++ { echo "$as_me:$LINENO: checking for guile headers" >&5
++echo $ECHO_N "checking for guile headers... $ECHO_C" >&6; }
+ GUILE_INCS="`$name_build_guile compile`"
+- { $as_echo "$as_me:$LINENO: result: $GUILE_INCS" >&5
+-$as_echo "$GUILE_INCS" >&6; }
++ { echo "$as_me:$LINENO: result: $GUILE_INCS" >&5
++echo "${ECHO_T}$GUILE_INCS" >&6; }
+ else
+ GUILE_LIBS="$GNOME_LIBDIR"
+ GUILE_INCS="$GNOME_INCLUDEDIR"
+- { $as_echo "$as_me:$LINENO: checking for main in -lrx" >&5
+-$as_echo_n "checking for main in -lrx... " >&6; }
++ { echo "$as_me:$LINENO: checking for main in -lrx" >&5
++echo $ECHO_N "checking for main in -lrx... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_rx_main+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrx $LIBS"
+@@ -27274,44 +26779,40 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_rx_main=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_rx_main=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rx_main" >&5
+-$as_echo "$ac_cv_lib_rx_main" >&6; }
+-if test "x$ac_cv_lib_rx_main" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_rx_main" >&5
++echo "${ECHO_T}$ac_cv_lib_rx_main" >&6; }
++if test $ac_cv_lib_rx_main = yes; then
+ GUILE_LIBS="-lrx $GUILE_LIBS"
+ fi
+
+- { $as_echo "$as_me:$LINENO: checking for qt_null in -lqt" >&5
+-$as_echo_n "checking for qt_null in -lqt... " >&6; }
++ { echo "$as_me:$LINENO: checking for qt_null in -lqt" >&5
++echo $ECHO_N "checking for qt_null in -lqt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_qt_qt_null+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lqt $LIBS"
+@@ -27343,44 +26844,40 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_qt_qt_null=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_qt_qt_null=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_qt_qt_null" >&5
+-$as_echo "$ac_cv_lib_qt_qt_null" >&6; }
+-if test "x$ac_cv_lib_qt_qt_null" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_qt_qt_null" >&5
++echo "${ECHO_T}$ac_cv_lib_qt_qt_null" >&6; }
++if test $ac_cv_lib_qt_qt_null = yes; then
+ GUILE_LIBS="-lqt $GUILE_LIBS"
+ fi
+
+- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-$as_echo_n "checking for dlopen in -ldl... " >&6; }
++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
+@@ -27412,44 +26909,40 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dl_dlopen=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dl_dlopen=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
++if test $ac_cv_lib_dl_dlopen = yes; then
+ GUILE_LIBS="-ldl $GUILE_LIBS"
+ fi
+
+- { $as_echo "$as_me:$LINENO: checking for t_accept in -lnsl" >&5
+-$as_echo_n "checking for t_accept in -lnsl... " >&6; }
++ { echo "$as_me:$LINENO: checking for t_accept in -lnsl" >&5
++echo $ECHO_N "checking for t_accept in -lnsl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_nsl_t_accept+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl $LIBS"
+@@ -27481,44 +26974,40 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_nsl_t_accept=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_nsl_t_accept=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_t_accept" >&5
+-$as_echo "$ac_cv_lib_nsl_t_accept" >&6; }
+-if test "x$ac_cv_lib_nsl_t_accept" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_t_accept" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_t_accept" >&6; }
++if test $ac_cv_lib_nsl_t_accept = yes; then
+ GUILE_LIBS="$GUILE_LIBS -lnsl"
+ fi
+
+- { $as_echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
+-$as_echo_n "checking for socket in -lsocket... " >&6; }
++ { echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
++echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_socket_socket+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $LIBS"
+@@ -27550,37 +27039,33 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_socket_socket=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_socket_socket=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
+-$as_echo "$ac_cv_lib_socket_socket" >&6; }
+-if test "x$ac_cv_lib_socket_socket" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; }
++if test $ac_cv_lib_socket_socket = yes; then
+ GUILE_LIBS="$GUILE_LIBS -lsocket"
+ fi
+
+@@ -27594,8 +27079,8 @@ fi
+ LIBS="$LIBS $GUILE_LIBS"
+ CPPFLAGS="$saved_cppflags $GUILE_INCS"
+
+- { $as_echo "$as_me:$LINENO: checking whether guile works" >&5
+-$as_echo_n "checking whether guile works... " >&6; }
++ { echo "$as_me:$LINENO: checking whether guile works" >&5
++echo $ECHO_N "checking whether guile works... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -27623,21 +27108,18 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+ ac_cv_guile_found=yes
+
+@@ -27647,7 +27129,7 @@ _ACEOF
+
+
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+@@ -27655,20 +27137,19 @@ sed 's/^/| /' conftest.$ac_ext >&5
+
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+- { $as_echo "$as_me:$LINENO: result: $ac_cv_guile_found" >&5
+-$as_echo "$ac_cv_guile_found" >&6; }
++ { echo "$as_me:$LINENO: result: $ac_cv_guile_found" >&5
++echo "${ECHO_T}$ac_cv_guile_found" >&6; }
+
+ if test x$ac_cv_guile_found = xno ; then
+ if test x = xfail ; then
+- { { $as_echo "$as_me:$LINENO: error: Can not find Guile on this system" >&5
+-$as_echo "$as_me: error: Can not find Guile on this system" >&2;}
++ { { echo "$as_me:$LINENO: error: Can not find Guile on this system" >&5
++echo "$as_me: error: Can not find Guile on this system" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+- { $as_echo "$as_me:$LINENO: WARNING: Can not find Guile on this system" >&5
+-$as_echo "$as_me: WARNING: Can not find Guile on this system" >&2;}
++ { echo "$as_me:$LINENO: WARNING: Can not find Guile on this system" >&5
++echo "$as_me: WARNING: Can not find Guile on this system" >&2;}
+ fi
+ ac_cv_guile_found=no
+ GUILE_LIBS= GUILE_INCS=
+@@ -27713,10 +27194,10 @@ fi
+ if test x${GUILE} = x ; then
+ # Extract the first word of "guile", so it can be a program name with args.
+ set dummy guile; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $GUILE in
+ [\\/]* | ?:[\\/]*)
+@@ -27731,7 +27212,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GUILE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -27744,11 +27225,11 @@ esac
+ fi
+ GUILE=$ac_cv_path_GUILE
+ if test -n "$GUILE"; then
+- { $as_echo "$as_me:$LINENO: result: $GUILE" >&5
+-$as_echo "$GUILE" >&6; }
++ { echo "$as_me:$LINENO: result: $GUILE" >&5
++echo "${ECHO_T}$GUILE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -27759,8 +27240,8 @@ version_ok=
+ min_guile_version=1.6.0
+ max_guile_version=99.99.99
+
+-{ $as_echo "$as_me:$LINENO: checking for guile - ${min_guile_version} <= version < ${max_guile_version}" >&5
+-$as_echo_n "checking for guile - ${min_guile_version} <= version < ${max_guile_version}... " >&6; }
++{ echo "$as_me:$LINENO: checking for guile - ${min_guile_version} <= version < ${max_guile_version}" >&5
++echo $ECHO_N "checking for guile - ${min_guile_version} <= version < ${max_guile_version}... $ECHO_C" >&6; }
+
+ if test "x${BUILD_GUILE}" != x -a "x${BUILD_GUILE}" != xno ; then
+ guile_version=`${name_build_guile} --version 2>&1`
+@@ -27806,22 +27287,22 @@ if test "x${BUILD_GUILE}" != x -a "x${BUILD_GUILE}" != xno ; then
+ fi
+
+ if test -n "$version_ok"; then
+- { $as_echo "$as_me:$LINENO: result: yes: $guile_vers_string" >&5
+-$as_echo "yes: $guile_vers_string" >&6; }
++ { echo "$as_me:$LINENO: result: yes: $guile_vers_string" >&5
++echo "${ECHO_T}yes: $guile_vers_string" >&6; }
+ true
+
+ else
+- { $as_echo "$as_me:$LINENO: result: no: $guile_vers_string" >&5
+-$as_echo "no: $guile_vers_string" >&6; }
+- { $as_echo "$as_me:$LINENO: WARNING: guile version check failed" >&5
+-$as_echo "$as_me: WARNING: guile version check failed" >&2;}
+- { { $as_echo "$as_me:$LINENO: error:
++ { echo "$as_me:$LINENO: result: no: $guile_vers_string" >&5
++echo "${ECHO_T}no: $guile_vers_string" >&6; }
++ { echo "$as_me:$LINENO: WARNING: guile version check failed" >&5
++echo "$as_me: WARNING: guile version check failed" >&2;}
++ { { echo "$as_me:$LINENO: error:
+
+ guile does not appear to be installed correctly, or is not in the
+ correct version range. Perhaps you have not installed the guile
+ development packages? Gnucash requires at least version 1.6 to build.
+ " >&5
+-$as_echo "$as_me: error:
++echo "$as_me: error:
+
+ guile does not appear to be installed correctly, or is not in the
+ correct version range. Perhaps you have not installed the guile
+@@ -27852,10 +27333,10 @@ _ACEOF
+ if test x${GUILE} = x ; then
+ # Extract the first word of "guile", so it can be a program name with args.
+ set dummy guile; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $GUILE in
+ [\\/]* | ?:[\\/]*)
+@@ -27870,7 +27351,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GUILE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -27883,11 +27364,11 @@ esac
+ fi
+ GUILE=$ac_cv_path_GUILE
+ if test -n "$GUILE"; then
+- { $as_echo "$as_me:$LINENO: result: $GUILE" >&5
+-$as_echo "$GUILE" >&6; }
++ { echo "$as_me:$LINENO: result: $GUILE" >&5
++echo "${ECHO_T}$GUILE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -27898,8 +27379,8 @@ version_ok=
+ min_guile_version=1.8.0
+ max_guile_version=99.99.99
+
+-{ $as_echo "$as_me:$LINENO: checking for guile - ${min_guile_version} <= version < ${max_guile_version}" >&5
+-$as_echo_n "checking for guile - ${min_guile_version} <= version < ${max_guile_version}... " >&6; }
++{ echo "$as_me:$LINENO: checking for guile - ${min_guile_version} <= version < ${max_guile_version}" >&5
++echo $ECHO_N "checking for guile - ${min_guile_version} <= version < ${max_guile_version}... $ECHO_C" >&6; }
+
+ if test "x${BUILD_GUILE}" != x -a "x${BUILD_GUILE}" != xno ; then
+ guile_version=`${name_build_guile} --version 2>&1`
+@@ -27945,8 +27426,8 @@ if test "x${BUILD_GUILE}" != x -a "x${BUILD_GUILE}" != xno ; then
+ fi
+
+ if test -n "$version_ok"; then
+- { $as_echo "$as_me:$LINENO: result: yes: $guile_vers_string" >&5
+-$as_echo "yes: $guile_vers_string" >&6; }
++ { echo "$as_me:$LINENO: result: yes: $guile_vers_string" >&5
++echo "${ECHO_T}yes: $guile_vers_string" >&6; }
+
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -27956,8 +27437,8 @@ _ACEOF
+
+
+ else
+- { $as_echo "$as_me:$LINENO: result: no: $guile_vers_string" >&5
+-$as_echo "no: $guile_vers_string" >&6; }
++ { echo "$as_me:$LINENO: result: no: $guile_vers_string" >&5
++echo "${ECHO_T}no: $guile_vers_string" >&6; }
+ true
+ fi
+
+@@ -27972,21 +27453,21 @@ fi
+ CFLAGS=$GIVEN_CFLAGS
+
+
+-{ $as_echo "$as_me:$LINENO: checking for SLIB support" >&5
+-$as_echo_n "checking for SLIB support... " >&6; }
++{ echo "$as_me:$LINENO: checking for SLIB support" >&5
++echo $ECHO_N "checking for SLIB support... $ECHO_C" >&6; }
+ if ${GUILE} -c "(use-modules (ice-9 slib)) (require 'printf)" > /dev/null 2>&1
+ then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+- { { $as_echo "$as_me:$LINENO: error:
++ { { echo "$as_me:$LINENO: error:
+
+ Cannot find SLIB. Are you sure you have it installed?
+ See http://bugzilla.gnome.org/show_bug.cgi?id=347922
+ and http://bugzilla.gnome.org/show_bug.cgi?id=483631
+
+ " >&5
+-$as_echo "$as_me: error:
++echo "$as_me: error:
+
+ Cannot find SLIB. Are you sure you have it installed?
+ See http://bugzilla.gnome.org/show_bug.cgi?id=347922
+@@ -27997,20 +27478,20 @@ $as_echo "$as_me: error:
+ fi
+
+ ### Check size of long_long - some guile's are broken.
+-{ $as_echo "$as_me:$LINENO: checking if guile long_long is at least as big as gint64" >&5
+-$as_echo_n "checking if guile long_long is at least as big as gint64... " >&6; }
++{ echo "$as_me:$LINENO: checking if guile long_long is at least as big as gint64" >&5
++echo $ECHO_N "checking if guile long_long is at least as big as gint64... $ECHO_C" >&6; }
+ GNC_OLDCFLAGS="$CFLAGS"
+ GNC_OLDLDFLAGS="$LDFLAGS"
+ CFLAGS="${GNOME_CFLAGS} ${GUILE_INCS} ${CFLAGS} ${GLIB_CFLAGS}"
+ LDFLAGS="${LDFLAGS} ${GLIB_LIBS}"
+ if test "$cross_compiling" = yes; then
+
+- { $as_echo "$as_me:$LINENO: result: assuming yes" >&5
+-$as_echo "assuming yes" >&6; }
+- { $as_echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
+-$as_echo_n "checking for scm_long_long2num in -lguile... " >&6; }
++ { echo "$as_me:$LINENO: result: assuming yes" >&5
++echo "${ECHO_T}assuming yes" >&6; }
++ { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
++echo $ECHO_N "checking for scm_long_long2num in -lguile... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_guile_scm_long_long2num+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lguile $LIBS"
+@@ -28042,37 +27523,33 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_guile_scm_long_long2num=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_guile_scm_long_long2num=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_guile_scm_long_long2num" >&5
+-$as_echo "$ac_cv_lib_guile_scm_long_long2num" >&6; }
+-if test "x$ac_cv_lib_guile_scm_long_long2num" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_guile_scm_long_long2num" >&5
++echo "${ECHO_T}$ac_cv_lib_guile_scm_long_long2num" >&6; }
++if test $ac_cv_lib_guile_scm_long_long2num = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define GUILE_LONG_LONG_OK 1
+@@ -28102,29 +27579,27 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- { $as_echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
+-$as_echo_n "checking for scm_long_long2num in -lguile... " >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
++echo $ECHO_N "checking for scm_long_long2num in -lguile... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_guile_scm_long_long2num+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lguile $LIBS"
+@@ -28156,37 +27631,33 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_guile_scm_long_long2num=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_guile_scm_long_long2num=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_guile_scm_long_long2num" >&5
+-$as_echo "$ac_cv_lib_guile_scm_long_long2num" >&6; }
+-if test "x$ac_cv_lib_guile_scm_long_long2num" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_guile_scm_long_long2num" >&5
++echo "${ECHO_T}$ac_cv_lib_guile_scm_long_long2num" >&6; }
++if test $ac_cv_lib_guile_scm_long_long2num = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define GUILE_LONG_LONG_OK 1
+@@ -28196,17 +27667,16 @@ fi
+
+
+ else
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+-rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+
+@@ -28217,16 +27687,16 @@ LDFLAGS="$GNC_OLDLDFLAGS"
+ # One of the places this is critical is in gnc_scm_to_gint64 and inverse.
+ # However, I'm sure we require this elsewhere, so don't remove this test
+ # unless you've done sufficient code review/testing.
+-{ $as_echo "$as_me:$LINENO: checking if unsigned long is at least as big as guint32" >&5
+-$as_echo_n "checking if unsigned long is at least as big as guint32... " >&6; }
++{ echo "$as_me:$LINENO: checking if unsigned long is at least as big as guint32" >&5
++echo $ECHO_N "checking if unsigned long is at least as big as guint32... $ECHO_C" >&6; }
+ GNC_OLDCFLAGS="$CFLAGS"
+ GNC_OLDLDFLAGS="$LDFLAGS"
+ CFLAGS="${GNOME_CFLAGS} ${GUILE_INCS} ${CFLAGS} ${GLIB_CFLAGS}"
+ LDFLAGS="${LDFLAGS} ${GLIB_LIBS}"
+ if test "$cross_compiling" = yes; then
+
+- { $as_echo "$as_me:$LINENO: result: assuming yes" >&5
+-$as_echo "assuming yes" >&6; }
++ { echo "$as_me:$LINENO: result: assuming yes" >&5
++echo "${ECHO_T}assuming yes" >&6; }
+
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -28248,41 +27718,38 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+ else
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- { { $as_echo "$as_me:$LINENO: error: cannot continue" >&5
+-$as_echo "$as_me: error: cannot continue" >&2;}
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ { { echo "$as_me:$LINENO: error: cannot continue" >&5
++echo "$as_me: error: cannot continue" >&2;}
+ { (exit size of unsigned long too small.); exit size of unsigned long too small.; }; }
+
+ fi
+-rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+
+@@ -28299,16 +27766,16 @@ GNC_ADD_ON_SRFIS=""
+ for f in ${srcdir}/lib/srfi/srfi-*.scm
+ do
+ srfi=`echo $f | sed 's%.*/%%' | sed 's/.scm//'`
+- { $as_echo "$as_me:$LINENO: checking if guile needs our copy of ${srfi}" >&5
+-$as_echo_n "checking if guile needs our copy of ${srfi}... " >&6; }
++ { echo "$as_me:$LINENO: checking if guile needs our copy of ${srfi}" >&5
++echo $ECHO_N "checking if guile needs our copy of ${srfi}... $ECHO_C" >&6; }
+ if ${GUILE} -c "(use-modules (srfi ${srfi}))" > /dev/null 2>&1
+ then
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ else
+ GNC_ADD_ON_SRFIS="${GNC_ADD_ON_SRFIS} ${srfi}.scm"
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ fi
+ done
+
+@@ -28329,14 +27796,14 @@ fi
+
+ gnc_have_guile_www=no
+
+-{ $as_echo "$as_me:$LINENO: checking if guile needs our copy of (guile www)" >&5
+-$as_echo_n "checking if guile needs our copy of (guile www)... " >&6; }
++{ echo "$as_me:$LINENO: checking if guile needs our copy of (guile www)" >&5
++echo $ECHO_N "checking if guile needs our copy of (guile www)... $ECHO_C" >&6; }
+ # Extract the first word of "guile", so it can be a program name with args.
+ set dummy guile; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $GUILE in
+ [\\/]* | ?:[\\/]*)
+@@ -28351,7 +27818,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GUILE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -28363,26 +27830,26 @@ esac
+ fi
+ GUILE=$ac_cv_path_GUILE
+ if test -n "$GUILE"; then
+- { $as_echo "$as_me:$LINENO: result: $GUILE" >&5
+-$as_echo "$GUILE" >&6; }
++ { echo "$as_me:$LINENO: result: $GUILE" >&5
++echo "${ECHO_T}$GUILE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+ if test "$GUILE" = "" ; then
+- { { $as_echo "$as_me:$LINENO: error: guile required but not found" >&5
+-$as_echo "$as_me: error: guile required but not found" >&2;}
++ { { echo "$as_me:$LINENO: error: guile required but not found" >&5
++echo "$as_me: error: guile required but not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ # Extract the first word of "guile-config", so it can be a program name with args.
+ set dummy guile-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $GUILE_CONFIG in
+ [\\/]* | ?:[\\/]*)
+@@ -28397,7 +27864,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GUILE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -28409,26 +27876,26 @@ esac
+ fi
+ GUILE_CONFIG=$ac_cv_path_GUILE_CONFIG
+ if test -n "$GUILE_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $GUILE_CONFIG" >&5
+-$as_echo "$GUILE_CONFIG" >&6; }
++ { echo "$as_me:$LINENO: result: $GUILE_CONFIG" >&5
++echo "${ECHO_T}$GUILE_CONFIG" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+ if test "$GUILE_CONFIG" = "" ; then
+- { { $as_echo "$as_me:$LINENO: error: guile-config required but not found" >&5
+-$as_echo "$as_me: error: guile-config required but not found" >&2;}
++ { { echo "$as_me:$LINENO: error: guile-config required but not found" >&5
++echo "$as_me: error: guile-config required but not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ # Extract the first word of "guile-tools", so it can be a program name with args.
+ set dummy guile-tools; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE_TOOLS+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $GUILE_TOOLS in
+ [\\/]* | ?:[\\/]*)
+@@ -28443,7 +27910,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GUILE_TOOLS="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -28455,25 +27922,25 @@ esac
+ fi
+ GUILE_TOOLS=$ac_cv_path_GUILE_TOOLS
+ if test -n "$GUILE_TOOLS"; then
+- { $as_echo "$as_me:$LINENO: result: $GUILE_TOOLS" >&5
+-$as_echo "$GUILE_TOOLS" >&6; }
++ { echo "$as_me:$LINENO: result: $GUILE_TOOLS" >&5
++echo "${ECHO_T}$GUILE_TOOLS" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+-{ $as_echo "$as_me:$LINENO: checking if (www main) is available" >&5
+-$as_echo_n "checking if (www main) is available... " >&6; }
++{ echo "$as_me:$LINENO: checking if (www main) is available" >&5
++echo $ECHO_N "checking if (www main) is available... $ECHO_C" >&6; }
+
+ $GUILE -c "(use-modules (www main)) (exit ((lambda () 0)))" > /dev/null 2>&1
+ gnc_have_guile_www=$?
+
+ if test "$gnc_have_guile_www" = "0" ; then gnc_have_guile_www=yes ; else gnc_have_guile_www=no ; fi
+- { $as_echo "$as_me:$LINENO: result: $gnc_have_guile_www" >&5
+-$as_echo "$gnc_have_guile_www" >&6; }
++ { echo "$as_me:$LINENO: result: $gnc_have_guile_www" >&5
++echo "${ECHO_T}$gnc_have_guile_www" >&6; }
+
+
+
+@@ -28490,113 +27957,119 @@ fi
+ ### look for gconf
+
+
+- succeeded=no
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GCONF" >&5
++echo $ECHO_N "checking for GCONF... $ECHO_C" >&6; }
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++if test -n "$GCONF_CFLAGS"; then
++ pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \"2.0\"\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= "2.0"") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= "2.0"" 2>/dev/null`
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ pkg_failed=yes
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ else
++ pkg_failed=untried
++fi
++if test -n "$GCONF_LIBS"; then
++ pkg_cv_GCONF_LIBS="$GCONF_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \"2.0\"\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= "2.0"") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= "2.0"" 2>/dev/null`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for gconf-2.0 >= \"2.0\"" >&5
+-$as_echo_n "checking for gconf-2.0 >= \"2.0\"... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "gconf-2.0 >= "2.0"" ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5
+-$as_echo_n "checking GCONF_CFLAGS... " >&6; }
+- GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= "2.0""`
+- { $as_echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5
+-$as_echo "$GCONF_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GCONF_LIBS" >&5
+-$as_echo_n "checking GCONF_LIBS... " >&6; }
+- GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= "2.0""`
+- { $as_echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5
+-$as_echo "$GCONF_LIBS" >&6; }
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0 >= "2.0"" 2>&1`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GCONF_CFLAGS=""
+- GCONF_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0 >= "2.0"" 2>&1`
+- echo $GCONF_PKG_ERRORS
++ GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0 >= "2.0"" 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GCONF_PKG_ERRORS" >&5
+
++ { { echo "$as_me:$LINENO: error: Package requirements (gconf-2.0 >= \"2.0\") were not met:
+
++$GCONF_PKG_ERRORS
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+- if test $succeeded = yes; then
+- :
+- else
+- { { $as_echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 >= \"2.0\") not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+-$as_echo "$as_me: error: Library requirements (gconf-2.0 >= \"2.0\") not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
++Alternatively, you may set the environment variables GCONF_CFLAGS
++and GCONF_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++echo "$as_me: error: Package requirements (gconf-2.0 >= \"2.0\") were not met:
++
++$GCONF_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables GCONF_CFLAGS
++and GCONF_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
+ { (exit 1); exit 1; }; }
+- fi
++elif test $pkg_failed = untried; then
++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables GCONF_CFLAGS
++and GCONF_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
+
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables GCONF_CFLAGS
++and GCONF_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++else
++ GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
++ GCONF_LIBS=$pkg_cv_GCONF_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ :
++fi
+ # Look up gconftool-2
+ # Extract the first word of "gconftool-2", so it can be a program name with args.
+ set dummy gconftool-2; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GCONFTOOL+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $GCONFTOOL in
+ [\\/]* | ?:[\\/]*)
+@@ -28611,7 +28084,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -28623,11 +28096,11 @@ esac
+ fi
+ GCONFTOOL=$ac_cv_path_GCONFTOOL
+ if test -n "$GCONFTOOL"; then
+- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
+-$as_echo "$GCONFTOOL" >&6; }
++ { echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
++echo "${ECHO_T}$GCONFTOOL" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -28640,106 +28113,112 @@ fi
+
+ LIBXML2_REQUIRED=2.5.10
+
+- succeeded=no
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for LIBXML2" >&5
++echo $ECHO_N "checking for LIBXML2... $ECHO_C" >&6; }
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++if test -n "$LIBXML2_CFLAGS"; then
++ pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML2_REQUIRED\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= $LIBXML2_REQUIRED" 2>/dev/null`
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ pkg_failed=yes
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ else
++ pkg_failed=untried
++fi
++if test -n "$LIBXML2_LIBS"; then
++ pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML2_REQUIRED\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= $LIBXML2_REQUIRED" 2>/dev/null`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for libxml-2.0 >= $LIBXML2_REQUIRED" >&5
+-$as_echo_n "checking for libxml-2.0 >= $LIBXML2_REQUIRED... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "libxml-2.0 >= $LIBXML2_REQUIRED" ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking LIBXML2_CFLAGS" >&5
+-$as_echo_n "checking LIBXML2_CFLAGS... " >&6; }
+- LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= $LIBXML2_REQUIRED"`
+- { $as_echo "$as_me:$LINENO: result: $LIBXML2_CFLAGS" >&5
+-$as_echo "$LIBXML2_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking LIBXML2_LIBS" >&5
+-$as_echo_n "checking LIBXML2_LIBS... " >&6; }
+- LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= $LIBXML2_REQUIRED"`
+- { $as_echo "$as_me:$LINENO: result: $LIBXML2_LIBS" >&5
+-$as_echo "$LIBXML2_LIBS" >&6; }
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- LIBXML2_CFLAGS=""
+- LIBXML2_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- LIBXML2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
+- echo $LIBXML2_PKG_ERRORS
++ LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$LIBXML2_PKG_ERRORS" >&5
+
++ { { echo "$as_me:$LINENO: error: Package requirements (libxml-2.0 >= $LIBXML2_REQUIRED) were not met:
+
++$LIBXML2_PKG_ERRORS
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+- if test $succeeded = yes; then
+- :
+- else
+- { { $as_echo "$as_me:$LINENO: error: Library requirements (libxml-2.0 >= $LIBXML2_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+-$as_echo "$as_me: error: Library requirements (libxml-2.0 >= $LIBXML2_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
++Alternatively, you may set the environment variables LIBXML2_CFLAGS
++and LIBXML2_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++echo "$as_me: error: Package requirements (libxml-2.0 >= $LIBXML2_REQUIRED) were not met:
++
++$LIBXML2_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables LIBXML2_CFLAGS
++and LIBXML2_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
+ { (exit 1); exit 1; }; }
+- fi
++elif test $pkg_failed = untried; then
++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
++Alternatively, you may set the environment variables LIBXML2_CFLAGS
++and LIBXML2_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables LIBXML2_CFLAGS
++and LIBXML2_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++else
++ LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
++ LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ :
++fi
+ LIBXML_VERSION=`$PKG_CONFIG --version xml`
+
+ GIVEN_CFLAGS=$LIBXML2_CFLAGS
+@@ -28759,10 +28238,10 @@ oLIBS="$LIBS"
+ LIBS="$LIBS $LIBXML2_LIBS"
+
+ # Compile a test program to verify that the xml2 library works.
+-{ $as_echo "$as_me:$LINENO: checking for xmlElemDump in -lxml2" >&5
+-$as_echo_n "checking for xmlElemDump in -lxml2... " >&6; }
++{ echo "$as_me:$LINENO: checking for xmlElemDump in -lxml2" >&5
++echo $ECHO_N "checking for xmlElemDump in -lxml2... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_xml2_xmlElemDump+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lxml2 $LIBS"
+@@ -28794,42 +28273,38 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_xml2_xmlElemDump=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_xml2_xmlElemDump=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlElemDump" >&5
+-$as_echo "$ac_cv_lib_xml2_xmlElemDump" >&6; }
+-if test "x$ac_cv_lib_xml2_xmlElemDump" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlElemDump" >&5
++echo "${ECHO_T}$ac_cv_lib_xml2_xmlElemDump" >&6; }
++if test $ac_cv_lib_xml2_xmlElemDump = yes; then
+ :
+ else
+
+- { { $as_echo "$as_me:$LINENO: error: libxml2 is required for GnuCash" >&5
+-$as_echo "$as_me: error: libxml2 is required for GnuCash" >&2;}
++ { { echo "$as_me:$LINENO: error: libxml2 is required for GnuCash" >&5
++echo "$as_me: error: libxml2 is required for GnuCash" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+@@ -28844,10 +28319,10 @@ ZLIB_LIBS=-lz
+
+ oLIBS="$LIBS"
+ LIBS="$LIBS $ZLIB_LIBS"
+-{ $as_echo "$as_me:$LINENO: checking for gzopen in -lz" >&5
+-$as_echo_n "checking for gzopen in -lz... " >&6; }
++{ echo "$as_me:$LINENO: checking for gzopen in -lz" >&5
++echo $ECHO_N "checking for gzopen in -lz... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_z_gzopen+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lz $LIBS"
+@@ -28879,42 +28354,38 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_z_gzopen=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_z_gzopen=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzopen" >&5
+-$as_echo "$ac_cv_lib_z_gzopen" >&6; }
+-if test "x$ac_cv_lib_z_gzopen" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzopen" >&5
++echo "${ECHO_T}$ac_cv_lib_z_gzopen" >&6; }
++if test $ac_cv_lib_z_gzopen = yes; then
+ :
+ else
+
+- { { $as_echo "$as_me:$LINENO: error: zlib is required for GnuCash" >&5
+-$as_echo "$as_me: error: zlib is required for GnuCash" >&2;}
++ { { echo "$as_me:$LINENO: error: zlib is required for GnuCash" >&5
++echo "$as_me: error: zlib is required for GnuCash" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+@@ -28927,14 +28398,14 @@ LIBS="$oLIBS"
+
+ # Check whether --enable-qof was given.
+ if test "${enable_qof+set}" = set; then
+- enableval=$enable_qof; { { $as_echo "$as_me:$LINENO: error: GnuCash has disabled use of external QOF." >&5
+-$as_echo "$as_me: error: GnuCash has disabled use of external QOF." >&2;}
++ enableval=$enable_qof; { { echo "$as_me:$LINENO: error: GnuCash has disabled use of external QOF." >&5
++echo "$as_me: error: GnuCash has disabled use of external QOF." >&2;}
+ { (exit 1); exit 1; }; }
+ case "${enableval}" in
+ yes) gnc_enable_qof=true ;;
+ no) gnc_enable_qof=false ;;
+- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-qof" >&5
+-$as_echo "$as_me: error: bad value ${enableval} for --enable-qof" >&2;}
++ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-qof" >&5
++echo "$as_me: error: bad value ${enableval} for --enable-qof" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+ else
+@@ -28969,8 +28440,8 @@ QOF_REQUIRED=0.6.4
+ # Can't use external qof until it supports "alternate dirty mode"
+ QOF_REQUIRED=99.99.99
+ if test "$gnc_enable_qof" = true ; then
+- { $as_echo "$as_me:$LINENO: checking for QOF, version >= $QOF_REQUIRED" >&5
+-$as_echo_n "checking for QOF, version >= $QOF_REQUIRED... " >&6; }
++ { echo "$as_me:$LINENO: checking for QOF, version >= $QOF_REQUIRED" >&5
++echo $ECHO_N "checking for QOF, version >= $QOF_REQUIRED... $ECHO_C" >&6; }
+ 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`
+@@ -28989,15 +28460,15 @@ $as_echo_n "checking for QOF, version >= $QOF_REQUIRED... " >&6; }
+ QOF_XML_DIR=`$PKG_CONFIG --silence-errors --variable=xmldir qof-1`
+ fi
+ if test x$QOF_XML_DIR = x; then
+- { $as_echo "$as_me:$LINENO: result: no, will use internal QOF code" >&5
+-$as_echo "no, will use internal QOF code" >&6; }
++ { echo "$as_me:$LINENO: result: no, will use internal QOF code" >&5
++echo "${ECHO_T}no, will use internal QOF code" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ fi
+ else
+- { $as_echo "$as_me:$LINENO: External QOF Disabled. Using Internal QOF Code." >&5
+-$as_echo "$as_me: External QOF Disabled. Using Internal QOF Code." >&6;}
++ { echo "$as_me:$LINENO: External QOF Disabled. Using Internal QOF Code." >&5
++echo "$as_me: External QOF Disabled. Using Internal QOF Code." >&6;}
+ fi
+ if test x$QOF_XML_DIR = x; then
+ QOF_LIB_DIR='${pkglibdir}'
+@@ -29012,7 +28483,7 @@ if test x$QOF_XML_DIR = x; then
+
+
+ cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBQOF /**/
++#define HAVE_LIBQOF
+ _ACEOF
+
+ HAVE_LIBQOF="use_internal"
+@@ -29171,21 +28642,20 @@ if test "${enable_sql+set}" = set; then
+
+ for ac_header in pgsql/libpq-fe.h postgresql/libpq-fe.h libpq-fe.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -29201,33 +28671,32 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -29241,52 +28710,51 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to gnucash-devel at gnucash.org ##
+@@ -29295,24 +28763,21 @@ _ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -29320,8 +28785,8 @@ fi
+ done
+
+ if test "x$ac_cv_header_pgsql_libpq_fe_h$ac_cv_header_postgresql_libpq_fe_h$ac_cv_header_libpq_fe_h" = xnonono; then
+- { { $as_echo "$as_me:$LINENO: error: Cannot find PostgreSQL headers; won't build sql backend" >&5
+-$as_echo "$as_me: error: Cannot find PostgreSQL headers; won't build sql backend" >&2;}
++ { { echo "$as_me:$LINENO: error: Cannot find PostgreSQL headers; won't build sql backend" >&5
++echo "$as_me: error: Cannot find PostgreSQL headers; won't build sql backend" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ master_dirs="/usr/include /usr/local/include"
+@@ -29359,8 +28824,8 @@ $as_echo "$as_me: error: Cannot find PostgreSQL headers; won't build sql backend
+
+ saved_LIBS="$LIBS"
+ LIBS="${PGSQL_LIBS} -lpq $LIBS"
+- { $as_echo "$as_me:$LINENO: checking for libpq" >&5
+-$as_echo_n "checking for libpq... " >&6; }
++ { echo "$as_me:$LINENO: checking for libpq" >&5
++echo $ECHO_N "checking for libpq... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -29386,39 +28851,35 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ SQL_DIR=postgres
+
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+- { { $as_echo "$as_me:$LINENO: error: Cannot find PostgreSQL libraries; will not build sql backend" >&5
+-$as_echo "$as_me: error: Cannot find PostgreSQL libraries; will not build sql backend" >&2;}
++ { { echo "$as_me:$LINENO: error: Cannot find PostgreSQL libraries; will not build sql backend" >&5
++echo "$as_me: error: Cannot find PostgreSQL libraries; will not build sql backend" >&2;}
+ { (exit 1); exit 1; }; }
+
+
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$saved_LIBS"
+@@ -29450,15 +28911,15 @@ if test "${enable_ofx+set}" = set; then
+ esac
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking whether to use OFX" >&5
+-$as_echo_n "checking whether to use OFX... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use OFX" >&5
++echo $ECHO_N "checking whether to use OFX... $ECHO_C" >&6; }
+ case "${want_ofx}" in
+- yes) { $as_echo "$as_me:$LINENO: result: yes -- failure is fatal" >&5
+-$as_echo "yes -- failure is fatal" >&6; } ;;
+- no) { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; } ;;
+- auto) { $as_echo "$as_me:$LINENO: result: yes -- automatic test" >&5
+-$as_echo "yes -- automatic test" >&6; } ;;
++ yes) { echo "$as_me:$LINENO: result: yes -- failure is fatal" >&5
++echo "${ECHO_T}yes -- failure is fatal" >&6; } ;;
++ no) { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; } ;;
++ auto) { echo "$as_me:$LINENO: result: yes -- automatic test" >&5
++echo "${ECHO_T}yes -- automatic test" >&6; } ;;
+ esac
+ if test x${want_ofx} != xno ;
+ then
+@@ -29476,8 +28937,8 @@ fi
+
+ if test "x${want_ofx}" != xno ; then
+ # Version number verified. Now check header files.
+- { $as_echo "$as_me:$LINENO: checking for libofx/libofx.h" >&5
+-$as_echo_n "checking for libofx/libofx.h... " >&6; }
++ { echo "$as_me:$LINENO: checking for libofx/libofx.h" >&5
++echo $ECHO_N "checking for libofx/libofx.h... $ECHO_C" >&6; }
+
+ GIVEN_CFLAGS=$LIBOFX_CFLAGS
+ INCLUDE_DIRS=`echo | cpp -v 2>&1`
+@@ -29503,22 +28964,21 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ OFXfound=no
+@@ -29554,31 +29014,30 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+- { $as_echo "$as_me:$LINENO: result: yes (in /usr/local)" >&5
+-$as_echo "yes (in /usr/local)" >&6; }
++ { echo "$as_me:$LINENO: result: yes (in /usr/local)" >&5
++echo "${ECHO_T}yes (in /usr/local)" >&6; }
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ if test "x${want_ofx}" = xyes ; then
+- { { $as_echo "$as_me:$LINENO: error: cannot find libofx header, needed for OFX support." >&5
+-$as_echo "$as_me: error: cannot find libofx header, needed for OFX support." >&2;}
++ { { echo "$as_me:$LINENO: error: cannot find libofx header, needed for OFX support." >&5
++echo "$as_me: error: cannot find libofx header, needed for OFX support." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+- { $as_echo "$as_me:$LINENO: result: cannot find libofx header, needed for OFX support." >&5
+-$as_echo "cannot find libofx header, needed for OFX support." >&6; }
++ { echo "$as_me:$LINENO: result: cannot find libofx header, needed for OFX support." >&5
++echo "${ECHO_T}cannot find libofx header, needed for OFX support." >&6; }
+ want_ofx=no
+ fi
+
+@@ -29589,8 +29048,8 @@ rm -f conftest.err conftest.$ac_ext
+
+ if test "x${want_ofx}" != xno ; then
+ LIBOFX_LIBS="${LIBOFX_LIBS} -lofx"
+- { $as_echo "$as_me:$LINENO: checking for libofx" >&5
+-$as_echo_n "checking for libofx... " >&6; }
++ { echo "$as_me:$LINENO: checking for libofx" >&5
++echo $ECHO_N "checking for libofx... $ECHO_C" >&6; }
+ save_LIBS="${LIBS}"
+ LIBS="${LIBS} ${LIBOFX_LIBS}"
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -29619,40 +29078,36 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ if test "x${want_ofx}" = xyes ; then
+- { { $as_echo "$as_me:$LINENO: error: *** Cannot compile test program for libofx library. Please check config.log for the exact error." >&5
+-$as_echo "$as_me: error: *** Cannot compile test program for libofx library. Please check config.log for the exact error." >&2;}
++ { { echo "$as_me:$LINENO: error: *** Cannot compile test program for libofx library. Please check config.log for the exact error." >&5
++echo "$as_me: error: *** Cannot compile test program for libofx library. Please check config.log for the exact error." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+- { $as_echo "$as_me:$LINENO: result: *** Cannot compile test program for libofx library. Please check config.log for the exact error." >&5
+-$as_echo "*** Cannot compile test program for libofx library. Please check config.log for the exact error." >&6; }
++ { echo "$as_me:$LINENO: result: *** Cannot compile test program for libofx library. Please check config.log for the exact error." >&5
++echo "${ECHO_T}*** Cannot compile test program for libofx library. Please check config.log for the exact error." >&6; }
+ want_ofx=no
+ fi
+
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+@@ -29673,8 +29128,8 @@ fi
+ # Check whether --enable-mt940 was given.
+ if test "${enable_mt940+set}" = set; then
+ enableval=$enable_mt940; if test "x$enableval" != "xno" ; then
+- { { $as_echo "$as_me:$LINENO: error: --enable-mt940 is obsolete -- all functionality is already included in --enable-aqbanking" >&5
+-$as_echo "$as_me: error: --enable-mt940 is obsolete -- all functionality is already included in --enable-aqbanking" >&2;}
++ { { echo "$as_me:$LINENO: error: --enable-mt940 is obsolete -- all functionality is already included in --enable-aqbanking" >&5
++echo "$as_me: error: --enable-mt940 is obsolete -- all functionality is already included in --enable-aqbanking" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+@@ -29703,228 +29158,243 @@ then
+ # aqbanking-1.6.1 was released on 2005-11-04; aqbanking ships with
+ # a pkg-config file since 1.6.1.
+
+- succeeded=no
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for AQBANKING" >&5
++echo $ECHO_N "checking for AQBANKING... $ECHO_C" >&6; }
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++if test -n "$AQBANKING_CFLAGS"; then
++ pkg_cv_AQBANKING_CFLAGS="$AQBANKING_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"aqbanking >= 3.0.0 gwenhywfar\"") >&5
++ ($PKG_CONFIG --exists --print-errors "aqbanking >= 3.0.0 gwenhywfar") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_AQBANKING_CFLAGS=`$PKG_CONFIG --cflags "aqbanking >= 3.0.0 gwenhywfar" 2>/dev/null`
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ pkg_failed=yes
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ else
++ pkg_failed=untried
++fi
++if test -n "$AQBANKING_LIBS"; then
++ pkg_cv_AQBANKING_LIBS="$AQBANKING_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"aqbanking >= 3.0.0 gwenhywfar\"") >&5
++ ($PKG_CONFIG --exists --print-errors "aqbanking >= 3.0.0 gwenhywfar") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_AQBANKING_LIBS=`$PKG_CONFIG --libs "aqbanking >= 3.0.0 gwenhywfar" 2>/dev/null`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for aqbanking >= 3.0.0 gwenhywfar" >&5
+-$as_echo_n "checking for aqbanking >= 3.0.0 gwenhywfar... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "aqbanking >= 3.0.0 gwenhywfar" ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking AQBANKING_CFLAGS" >&5
+-$as_echo_n "checking AQBANKING_CFLAGS... " >&6; }
+- AQBANKING_CFLAGS=`$PKG_CONFIG --cflags "aqbanking >= 3.0.0 gwenhywfar"`
+- { $as_echo "$as_me:$LINENO: result: $AQBANKING_CFLAGS" >&5
+-$as_echo "$AQBANKING_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking AQBANKING_LIBS" >&5
+-$as_echo_n "checking AQBANKING_LIBS... " >&6; }
+- AQBANKING_LIBS=`$PKG_CONFIG --libs "aqbanking >= 3.0.0 gwenhywfar"`
+- { $as_echo "$as_me:$LINENO: result: $AQBANKING_LIBS" >&5
+-$as_echo "$AQBANKING_LIBS" >&6; }
+- else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- AQBANKING_CFLAGS=""
+- AQBANKING_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- AQBANKING_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "aqbanking >= 3.0.0 gwenhywfar" 2>&1`
++if test $pkg_failed = yes; then
+
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ AQBANKING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "aqbanking >= 3.0.0 gwenhywfar" 2>&1`
++ else
++ AQBANKING_PKG_ERRORS=`$PKG_CONFIG --print-errors "aqbanking >= 3.0.0 gwenhywfar" 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$AQBANKING_PKG_ERRORS" >&5
+
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for AQBANKING" >&5
++echo $ECHO_N "checking for AQBANKING... $ECHO_C" >&6; }
+
+- if test $succeeded = yes; then
+- AQBANKING_DIR=aqbanking
+- else
++if test -n "$AQBANKING_CFLAGS"; then
++ pkg_cv_AQBANKING_CFLAGS="$AQBANKING_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar\"") >&5
++ ($PKG_CONFIG --exists --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_AQBANKING_CFLAGS=`$PKG_CONFIG --cflags "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$AQBANKING_LIBS"; then
++ pkg_cv_AQBANKING_LIBS="$AQBANKING_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar\"") >&5
++ ($PKG_CONFIG --exists --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_AQBANKING_LIBS=`$PKG_CONFIG --libs "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
+
+
+- succeeded=no
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
++if test $pkg_failed = yes; then
+
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ if test $_pkg_short_errors_supported = yes; then
++ AQBANKING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>&1`
++ else
++ AQBANKING_PKG_ERRORS=`$PKG_CONFIG --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$AQBANKING_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++ { { echo "$as_me:$LINENO: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&5
++echo "$as_me: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&2;}
++ { (exit 1); exit 1; }; }
++
++elif test $pkg_failed = untried; then
++
++ { { echo "$as_me:$LINENO: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&5
++echo "$as_me: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&2;}
++ { (exit 1); exit 1; }; }
++
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ AQBANKING_CFLAGS=$pkg_cv_AQBANKING_CFLAGS
++ AQBANKING_LIBS=$pkg_cv_AQBANKING_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ AQBANKING_DIR=hbci
+ fi
+
++elif test $pkg_failed = untried; then
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" >&5
+-$as_echo_n "checking for aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking AQBANKING_CFLAGS" >&5
+-$as_echo_n "checking AQBANKING_CFLAGS... " >&6; }
+- AQBANKING_CFLAGS=`$PKG_CONFIG --cflags "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar"`
+- { $as_echo "$as_me:$LINENO: result: $AQBANKING_CFLAGS" >&5
+-$as_echo "$AQBANKING_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking AQBANKING_LIBS" >&5
+-$as_echo_n "checking AQBANKING_LIBS... " >&6; }
+- AQBANKING_LIBS=`$PKG_CONFIG --libs "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar"`
+- { $as_echo "$as_me:$LINENO: result: $AQBANKING_LIBS" >&5
+-$as_echo "$AQBANKING_LIBS" >&6; }
+- else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- AQBANKING_CFLAGS=""
+- AQBANKING_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- AQBANKING_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>&1`
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for AQBANKING" >&5
++echo $ECHO_N "checking for AQBANKING... $ECHO_C" >&6; }
+
+- fi
++if test -n "$AQBANKING_CFLAGS"; then
++ pkg_cv_AQBANKING_CFLAGS="$AQBANKING_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar\"") >&5
++ ($PKG_CONFIG --exists --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_AQBANKING_CFLAGS=`$PKG_CONFIG --cflags "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$AQBANKING_LIBS"; then
++ pkg_cv_AQBANKING_LIBS="$AQBANKING_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar\"") >&5
++ ($PKG_CONFIG --exists --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_AQBANKING_LIBS=`$PKG_CONFIG --libs "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
+
+
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++if test $pkg_failed = yes; then
+
+- if test $succeeded = yes; then
+- AQBANKING_DIR=hbci
+- else
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ AQBANKING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>&1`
++ else
++ AQBANKING_PKG_ERRORS=`$PKG_CONFIG --print-errors "aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$AQBANKING_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+- { { $as_echo "$as_me:$LINENO: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&5
+-$as_echo "$as_me: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&2;}
++ { { echo "$as_me:$LINENO: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&5
++echo "$as_me: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&2;}
+ { (exit 1); exit 1; }; }
+
+- fi
++elif test $pkg_failed = untried; then
+
++ { { echo "$as_me:$LINENO: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&5
++echo "$as_me: error: Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!" >&2;}
++ { (exit 1); exit 1; }; }
+
+- fi
++else
++ AQBANKING_CFLAGS=$pkg_cv_AQBANKING_CFLAGS
++ AQBANKING_LIBS=$pkg_cv_AQBANKING_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ AQBANKING_DIR=hbci
++fi
+
++else
++ AQBANKING_CFLAGS=$pkg_cv_AQBANKING_CFLAGS
++ AQBANKING_LIBS=$pkg_cv_AQBANKING_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ AQBANKING_DIR=aqbanking
++fi
+
+ # also check for ktoblzcheck
+
+ for ac_header in ktoblzcheck.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -29940,33 +29410,32 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -29980,52 +29449,51 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to gnucash-devel at gnucash.org ##
+@@ -30034,24 +29502,21 @@ _ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -30089,10 +29554,10 @@ if test "x$DATADIRNAME" = "x"; then
+ fi
+
+
+- { $as_echo "$as_me:$LINENO: checking for nl_langinfo and D_FMT" >&5
+-$as_echo_n "checking for nl_langinfo and D_FMT... " >&6; }
++ { echo "$as_me:$LINENO: checking for nl_langinfo and D_FMT" >&5
++echo $ECHO_N "checking for nl_langinfo and D_FMT... $ECHO_C" >&6; }
+ if test "${am_cv_langinfo_dfmt+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -30115,36 +29580,32 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ am_cv_langinfo_dfmt=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ am_cv_langinfo_dfmt=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_langinfo_dfmt" >&5
+-$as_echo "$am_cv_langinfo_dfmt" >&6; }
++{ echo "$as_me:$LINENO: result: $am_cv_langinfo_dfmt" >&5
++echo "${ECHO_T}$am_cv_langinfo_dfmt" >&6; }
+ if test $am_cv_langinfo_dfmt = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -30164,17 +29625,17 @@ _ACEOF
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: checking for a valid gettext/gmsgfmt installation" >&5
+-$as_echo_n "checking for a valid gettext/gmsgfmt installation... " >&6; }
++{ echo "$as_me:$LINENO: checking for a valid gettext/gmsgfmt installation" >&5
++echo $ECHO_N "checking for a valid gettext/gmsgfmt installation... $ECHO_C" >&6; }
+ if test "$gt_cv_have_gettext" != "yes" || test "x$GMSGFMT" = "x"; then
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- { { $as_echo "$as_me:$LINENO: error: Cannot find Glib Gettext. Maybe you need to install the gettext package?" >&5
+-$as_echo "$as_me: error: Cannot find Glib Gettext. Maybe you need to install the gettext package?" >&2;}
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ { { echo "$as_me:$LINENO: error: Cannot find Glib Gettext. Maybe you need to install the gettext package?" >&5
++echo "$as_me: error: Cannot find Glib Gettext. Maybe you need to install the gettext package?" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+- { $as_echo "$as_me:$LINENO: result: yes - $GMSGFMT" >&5
+-$as_echo "yes - $GMSGFMT" >&6; }
++ { echo "$as_me:$LINENO: result: yes - $GMSGFMT" >&5
++echo "${ECHO_T}yes - $GMSGFMT" >&6; }
+ fi
+
+ ### --------------------------------------------------------------------------
+@@ -30209,10 +29670,10 @@ fi
+ if test x${USE_ETAGS} = x1; then
+ # Extract the first word of "etags", so it can be a program name with args.
+ set dummy etags; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_GNC_ETAGS_FILE+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$GNC_ETAGS_FILE"; then
+ ac_cv_prog_GNC_ETAGS_FILE="$GNC_ETAGS_FILE" # Let the user override the test.
+@@ -30225,7 +29686,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_GNC_ETAGS_FILE="TAGS"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -30236,11 +29697,11 @@ fi
+ fi
+ GNC_ETAGS_FILE=$ac_cv_prog_GNC_ETAGS_FILE
+ if test -n "$GNC_ETAGS_FILE"; then
+- { $as_echo "$as_me:$LINENO: result: $GNC_ETAGS_FILE" >&5
+-$as_echo "$GNC_ETAGS_FILE" >&6; }
++ { echo "$as_me:$LINENO: result: $GNC_ETAGS_FILE" >&5
++echo "${ECHO_T}$GNC_ETAGS_FILE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -30271,10 +29732,10 @@ fi
+ if test x${USE_CTAGS} = x1; then
+ # Extract the first word of "ctags", so it can be a program name with args.
+ set dummy ctags; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_GNC_CTAGS_FILE+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$GNC_CTAGS_FILE"; then
+ ac_cv_prog_GNC_CTAGS_FILE="$GNC_CTAGS_FILE" # Let the user override the test.
+@@ -30287,7 +29748,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_GNC_CTAGS_FILE="tags"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -30298,11 +29759,11 @@ fi
+ fi
+ GNC_CTAGS_FILE=$ac_cv_prog_GNC_CTAGS_FILE
+ if test -n "$GNC_CTAGS_FILE"; then
+- { $as_echo "$as_me:$LINENO: result: $GNC_CTAGS_FILE" >&5
+-$as_echo "$GNC_CTAGS_FILE" >&6; }
++ { echo "$as_me:$LINENO: result: $GNC_CTAGS_FILE" >&5
++echo "${ECHO_T}$GNC_CTAGS_FILE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -30333,10 +29794,10 @@ if test x"$PERL" = x;
+ then
+ # Extract the first word of "perl", so it can be a program name with args.
+ set dummy perl; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PERL+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $PERL in
+ [\\/]* | ?:[\\/]*)
+@@ -30351,7 +29812,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -30363,11 +29824,11 @@ esac
+ fi
+ PERL=$ac_cv_path_PERL
+ if test -n "$PERL"; then
+- { $as_echo "$as_me:$LINENO: result: $PERL" >&5
+-$as_echo "$PERL" >&6; }
++ { echo "$as_me:$LINENO: result: $PERL" >&5
++echo "${ECHO_T}$PERL" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -30375,8 +29836,8 @@ fi
+
+ # Make sure Perl was found
+ if test x"$PERL" = x; then
+- { { $as_echo "$as_me:$LINENO: error: Cannot find Perl. Try using the --with-perl flag." >&5
+-$as_echo "$as_me: error: Cannot find Perl. Try using the --with-perl flag." >&2;}
++ { { echo "$as_me:$LINENO: error: Cannot find Perl. Try using the --with-perl flag." >&5
++echo "$as_me: error: Cannot find Perl. Try using the --with-perl flag." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+@@ -30384,9 +29845,9 @@ fi
+ if "$PERL" -e 'exit 1 if $] < 5.0'; then
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: Found ${PERL} reports version
++ { { echo "$as_me:$LINENO: error: Found ${PERL} reports version
+ \`${PERL} -e 'print $'\`" >&5
+-$as_echo "$as_me: error: Found ${PERL} reports version
++echo "$as_me: error: Found ${PERL} reports version
+ \`${PERL} -e 'print $'\`" >&2;}
+ { (exit need version 5.*]); exit need version 5.*]; }; }
+ fi
+@@ -30442,10 +29903,10 @@ if test "x$enable_doxygen" = xno; then
+ else
+ # Extract the first word of "doxygen", so it can be a program name with args.
+ set dummy doxygen; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_DOXYGEN+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $DOXYGEN in
+ [\\/]* | ?:[\\/]*)
+@@ -30460,7 +29921,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -30472,18 +29933,18 @@ esac
+ fi
+ DOXYGEN=$ac_cv_path_DOXYGEN
+ if test -n "$DOXYGEN"; then
+- { $as_echo "$as_me:$LINENO: result: $DOXYGEN" >&5
+-$as_echo "$DOXYGEN" >&6; }
++ { echo "$as_me:$LINENO: result: $DOXYGEN" >&5
++echo "${ECHO_T}$DOXYGEN" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+ if test x$DOXYGEN = x; then
+ if test "x$enable_doxygen" = xyes; then
+- { { $as_echo "$as_me:$LINENO: error: could not find doxygen" >&5
+-$as_echo "$as_me: error: could not find doxygen" >&2;}
++ { { echo "$as_me:$LINENO: error: could not find doxygen" >&5
++echo "$as_me: error: could not find doxygen" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ enable_doc=no
+@@ -30491,10 +29952,10 @@ $as_echo "$as_me: error: could not find doxygen" >&2;}
+ enable_doc=yes
+ # Extract the first word of "dot", so it can be a program name with args.
+ set dummy dot; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_DOT+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $DOT in
+ [\\/]* | ?:[\\/]*)
+@@ -30509,7 +29970,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -30521,11 +29982,11 @@ esac
+ fi
+ DOT=$ac_cv_path_DOT
+ if test -n "$DOT"; then
+- { $as_echo "$as_me:$LINENO: result: $DOT" >&5
+-$as_echo "$DOT" >&6; }
++ { echo "$as_me:$LINENO: result: $DOT" >&5
++echo "${ECHO_T}$DOT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -30542,8 +30003,8 @@ fi
+
+ if test x$DOT = x; then
+ if test "x$enable_dot" = xyes; then
+- { { $as_echo "$as_me:$LINENO: error: could not find dot" >&5
+-$as_echo "$as_me: error: could not find dot" >&2;}
++ { { echo "$as_me:$LINENO: error: could not find dot" >&5
++echo "$as_me: error: could not find dot" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ enable_dot=no
+@@ -30574,21 +30035,20 @@ LIBS="$LIBS -lm"
+
+ for ac_header in popt.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -30604,33 +30064,32 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -30644,52 +30103,51 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to gnucash-devel at gnucash.org ##
+@@ -30698,24 +30156,21 @@ _ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -30723,10 +30178,10 @@ fi
+ done
+
+
+-{ $as_echo "$as_me:$LINENO: checking for poptStrippedArgv in -lpopt" >&5
+-$as_echo_n "checking for poptStrippedArgv in -lpopt... " >&6; }
++{ echo "$as_me:$LINENO: checking for poptStrippedArgv in -lpopt" >&5
++echo $ECHO_N "checking for poptStrippedArgv in -lpopt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_popt_poptStrippedArgv+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpopt $LIBS"
+@@ -30758,37 +30213,33 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_popt_poptStrippedArgv=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_popt_poptStrippedArgv=no
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_popt_poptStrippedArgv" >&5
+-$as_echo "$ac_cv_lib_popt_poptStrippedArgv" >&6; }
+-if test "x$ac_cv_lib_popt_poptStrippedArgv" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_popt_poptStrippedArgv" >&5
++echo "${ECHO_T}$ac_cv_lib_popt_poptStrippedArgv" >&6; }
++if test $ac_cv_lib_popt_poptStrippedArgv = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBPOPT 1
+ _ACEOF
+@@ -30796,13 +30247,13 @@ _ACEOF
+ LIBS="-lpopt $LIBS"
+
+ else
+- { { $as_echo "$as_me:$LINENO: error:
++ { { echo "$as_me:$LINENO: error:
+
+ popt 1.5 or newer is required to build gnucash. You can download
+ the latest version from ftp://people.redhat.com/sopwith/popt/, or if
+ you're running Debian, install the libpopt-dev package.
+ " >&5
+-$as_echo "$as_me: error:
++echo "$as_me: error:
+
+ popt 1.5 or newer is required to build gnucash. You can download
+ the latest version from ftp://people.redhat.com/sopwith/popt/, or if
+@@ -30851,39 +30302,109 @@ then
+ enable_compile_warnings="yes"
+ fi
+
+- # Check whether --enable-compile-warnings was given.
++
++ # Check whether --enable-compile-warnings was given.
+ if test "${enable_compile_warnings+set}" = set; then
+ enableval=$enable_compile_warnings;
+ else
+- enable_compile_warnings=minimum
++ enable_compile_warnings="yes"
+ fi
+
+
+- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
+-$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
+- warnCFLAGS=
+- if test "x$GCC" != xyes; then
+- enable_compile_warnings=no
+- fi
++ warnCFLAGS=
++ if test "x$GCC" != xyes; then
++ enable_compile_warnings=no
++ fi
+
+- if test "x$enable_compile_warnings" != "xno"; then
+- if test "x$GCC" = "xyes"; then
+- case " $CFLAGS " in
+- *\ \ -Wall\ \ *) ;;
+- *) warnCFLAGS="-Wall -Wunused" ;;
+- esac
++ warning_flags=
++ realsave_CFLAGS="$CFLAGS"
+
+- ## -W is not all that useful. And it cannot be controlled
+- ## with individual -Wno-xxx flags, unlike -Wall
+- if test "x$enable_compile_warnings" = "xyes"; then
+- warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations"
+- fi
+- fi
+- fi
+- { $as_echo "$as_me:$LINENO: result: $warnCFLAGS" >&5
+-$as_echo "$warnCFLAGS" >&6; }
++ case "$enable_compile_warnings" in
++ no)
++ warning_flags=
++ ;;
++ minimum)
++ warning_flags="-Wall"
++ ;;
++ yes)
++ warning_flags="-Wall -Wmissing-prototypes"
++ ;;
++ maximum|error)
++ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
++ CFLAGS="$warning_flags $CFLAGS"
++ for option in -Wno-sign-compare; do
++ SAVE_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS $option"
++ { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
++echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
+
+- # Check whether --enable-iso-c was given.
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ has_option=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ has_option=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ CFLAGS="$SAVE_CFLAGS"
++ { echo "$as_me:$LINENO: result: $has_option" >&5
++echo "${ECHO_T}$has_option" >&6; }
++ if test $has_option = yes; then
++ warning_flags="$warning_flags $option"
++ fi
++ unset has_option
++ unset SAVE_CFLAGS
++ done
++ unset option
++ if test "$enable_compile_warnings" = "error" ; then
++ warning_flags="$warning_flags -Werror"
++ fi
++ ;;
++ *)
++ { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
++echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
++ { (exit 1); exit 1; }; }
++ ;;
++ esac
++ CFLAGS="$realsave_CFLAGS"
++ { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
++echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: result: $warning_flags" >&5
++echo "${ECHO_T}$warning_flags" >&6; }
++
++ # Check whether --enable-iso-c was given.
+ if test "${enable_iso_c+set}" = set; then
+ enableval=$enable_iso_c;
+ else
+@@ -30891,132 +30412,135 @@ else
+ fi
+
+
+- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
+-$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
+- complCFLAGS=
+- if test "x$enable_iso_c" != "xno"; then
+- if test "x$GCC" = "xyes"; then
+- case " $CFLAGS " in
+- *\ \ -ansi\ \ *) ;;
+- *) complCFLAGS="$complCFLAGS -ansi" ;;
+- esac
+-
+- case " $CFLAGS " in
+- *\ \ -pedantic\ \ *) ;;
+- *) complCFLAGS="$complCFLAGS -pedantic" ;;
+- esac
++ { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
++echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }
++ complCFLAGS=
++ if test "x$enable_iso_c" != "xno"; then
++ if test "x$GCC" = "xyes"; then
++ case " $CFLAGS " in
++ *\ \ -ansi\ \ *) ;;
++ *) complCFLAGS="$complCFLAGS -ansi" ;;
++ esac
++ case " $CFLAGS " in
++ *\ \ -pedantic\ \ *) ;;
++ *) complCFLAGS="$complCFLAGS -pedantic" ;;
++ esac
++ fi
+ fi
+- fi
+- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
+-$as_echo "$complCFLAGS" >&6; }
+- if test "x$cflags_set" != "xyes"; then
+- CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS"
+- cflags_set=yes
++ { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
++echo "${ECHO_T}$complCFLAGS" >&6; }
+
+- fi
++ WARN_CFLAGS="$warning_flags $complCFLAGS"
+
+
+
+- succeeded=no
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTK" >&5
++echo $ECHO_N "checking for GTK... $ECHO_C" >&6; }
+
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++if test -n "$GTK_CFLAGS"; then
++ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.6" 2>/dev/null`
++else
++ pkg_failed=yes
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTK_LIBS"; then
++ pkg_cv_GTK_LIBS="$GTK_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.6" 2>/dev/null`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.6" >&5
+-$as_echo_n "checking for gtk+-2.0 >= 2.6... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "gtk+-2.0 >= 2.6" ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
+-$as_echo_n "checking GTK_CFLAGS... " >&6; }
+- GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.6"`
+- { $as_echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
+-$as_echo "$GTK_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GTK_LIBS" >&5
+-$as_echo_n "checking GTK_LIBS... " >&6; }
+- GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.6"`
+- { $as_echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
+-$as_echo "$GTK_LIBS" >&6; }
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.6" 2>&1`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GTK_CFLAGS=""
+- GTK_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.6" 2>&1`
+- echo $GTK_PKG_ERRORS
++ GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.6" 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTK_PKG_ERRORS" >&5
+
++ { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= 2.6) were not met:
+
++$GTK_PKG_ERRORS
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+- if test $succeeded = yes; then
+- :
+- else
+- { { $as_echo "$as_me:$LINENO: error: Library requirements (gtk+-2.0 >= 2.6) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+-$as_echo "$as_me: error: Library requirements (gtk+-2.0 >= 2.6) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
++Alternatively, you may set the environment variables GTK_CFLAGS
++and GTK_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++echo "$as_me: error: Package requirements (gtk+-2.0 >= 2.6) were not met:
++
++$GTK_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables GTK_CFLAGS
++and GTK_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
+ { (exit 1); exit 1; }; }
+- fi
++elif test $pkg_failed = untried; then
++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables GTK_CFLAGS
++and GTK_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
++Alternatively, you may set the environment variables GTK_CFLAGS
++and GTK_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++else
++ GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
++ GTK_LIBS=$pkg_cv_GTK_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ :
++fi
+
+ GIVEN_CFLAGS=$GTK_CFLAGS
+ INCLUDE_DIRS=`echo | cpp -v 2>&1`
+@@ -31031,12 +30555,12 @@ $as_echo "$as_me: error: Library requirements (gtk+-2.0 >= 2.6) not met; conside
+
+ HAVE_UNTESTED_GTK=yes
+
+- { $as_echo "$as_me:$LINENO: checking for GTK - version >= 2.10.0" >&5
+-$as_echo_n "checking for GTK - version >= 2.10.0... " >&6; }
++ { echo "$as_me:$LINENO: checking for GTK - version >= 2.10.0" >&5
++echo $ECHO_N "checking for GTK - version >= 2.10.0... $ECHO_C" >&6; }
+ if $PKG_CONFIG 'gtk+-2.0 >= 2.10.0'
+ then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_GTK_2_10 1
+@@ -31044,8 +30568,8 @@ _ACEOF
+
+ HAVE_GTK_2_10=yes
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ if test "x$HAVE_GTK_2_10" = "xyes" ; then
+ HAVE_GTK_2_10_TRUE=
+@@ -31056,116 +30580,122 @@ else
+ fi
+
+
+- { $as_echo "$as_me:$LINENO: checking for untested GDK versions (gdk > 2.11.0)" >&5
+-$as_echo_n "checking for untested GDK versions (gdk > 2.11.0)... " >&6; }
++ { echo "$as_me:$LINENO: checking for untested GDK versions (gdk > 2.11.0)" >&5
++echo $ECHO_N "checking for untested GDK versions (gdk > 2.11.0)... $ECHO_C" >&6; }
+ if $PKG_CONFIG 'gtk+-2.0 > 2.11.0'
+ then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ HAVE_UNTESTED_GDK=yes
+ fi
+
+
+- succeeded=no
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GNOME" >&5
++echo $ECHO_N "checking for GNOME... $ECHO_C" >&6; }
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++if test -n "$GNOME_CFLAGS"; then
++ pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 >= 2.4\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 >= 2.4") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= 2.4" 2>/dev/null`
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ pkg_failed=yes
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ else
++ pkg_failed=untried
++fi
++if test -n "$GNOME_LIBS"; then
++ pkg_cv_GNOME_LIBS="$GNOME_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 >= 2.4\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 >= 2.4") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 >= 2.4" 2>/dev/null`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for libgnomeui-2.0 >= 2.4" >&5
+-$as_echo_n "checking for libgnomeui-2.0 >= 2.4... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "libgnomeui-2.0 >= 2.4" ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GNOME_CFLAGS" >&5
+-$as_echo_n "checking GNOME_CFLAGS... " >&6; }
+- GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= 2.4"`
+- { $as_echo "$as_me:$LINENO: result: $GNOME_CFLAGS" >&5
+-$as_echo "$GNOME_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GNOME_LIBS" >&5
+-$as_echo_n "checking GNOME_LIBS... " >&6; }
+- GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 >= 2.4"`
+- { $as_echo "$as_me:$LINENO: result: $GNOME_LIBS" >&5
+-$as_echo "$GNOME_LIBS" >&6; }
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgnomeui-2.0 >= 2.4" 2>&1`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GNOME_CFLAGS=""
+- GNOME_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeui-2.0 >= 2.4" 2>&1`
+- echo $GNOME_PKG_ERRORS
++ GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgnomeui-2.0 >= 2.4" 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GNOME_PKG_ERRORS" >&5
+
++ { { echo "$as_me:$LINENO: error: Package requirements (libgnomeui-2.0 >= 2.4) were not met:
+
++$GNOME_PKG_ERRORS
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+- if test $succeeded = yes; then
+- :
+- else
+- { { $as_echo "$as_me:$LINENO: error: Library requirements (libgnomeui-2.0 >= 2.4) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+-$as_echo "$as_me: error: Library requirements (libgnomeui-2.0 >= 2.4) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
++Alternatively, you may set the environment variables GNOME_CFLAGS
++and GNOME_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++echo "$as_me: error: Package requirements (libgnomeui-2.0 >= 2.4) were not met:
++
++$GNOME_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables GNOME_CFLAGS
++and GNOME_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
+ { (exit 1); exit 1; }; }
+- fi
++elif test $pkg_failed = untried; then
++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
++Alternatively, you may set the environment variables GNOME_CFLAGS
++and GNOME_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables GNOME_CFLAGS
++and GNOME_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++else
++ GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS
++ GNOME_LIBS=$pkg_cv_GNOME_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ :
++fi
+
+ GIVEN_CFLAGS=$GNOME_CFLAGS
+ INCLUDE_DIRS=`echo | cpp -v 2>&1`
+@@ -31179,119 +30709,125 @@ $as_echo "$as_me: error: Library requirements (libgnomeui-2.0 >= 2.4) not met; c
+
+
+
+- { $as_echo "$as_me:$LINENO: checking for untested GNOME versions (libgnome >= 2.19.0)" >&5
+-$as_echo_n "checking for untested GNOME versions (libgnome >= 2.19.0)... " >&6; }
++ { echo "$as_me:$LINENO: checking for untested GNOME versions (libgnome >= 2.19.0)" >&5
++echo $ECHO_N "checking for untested GNOME versions (libgnome >= 2.19.0)... $ECHO_C" >&6; }
+ if $PKG_CONFIG 'libgnome-2.0 >= 2.19.0'
+ then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ HAVE_UNTESTED_GNOME=yes
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+- succeeded=no
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GDK_PIXBUF" >&5
++echo $ECHO_N "checking for GDK_PIXBUF... $ECHO_C" >&6; }
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++if test -n "$GDK_PIXBUF_CFLAGS"; then
++ pkg_cv_GDK_PIXBUF_CFLAGS="$GDK_PIXBUF_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GDK_PIXBUF_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0" 2>/dev/null`
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ pkg_failed=yes
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ else
++ pkg_failed=untried
++fi
++if test -n "$GDK_PIXBUF_LIBS"; then
++ pkg_cv_GDK_PIXBUF_LIBS="$GDK_PIXBUF_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GDK_PIXBUF_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0" 2>/dev/null`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for gdk-pixbuf-2.0" >&5
+-$as_echo_n "checking for gdk-pixbuf-2.0... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "gdk-pixbuf-2.0" ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GDK_PIXBUF_CFLAGS" >&5
+-$as_echo_n "checking GDK_PIXBUF_CFLAGS... " >&6; }
+- GDK_PIXBUF_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0"`
+- { $as_echo "$as_me:$LINENO: result: $GDK_PIXBUF_CFLAGS" >&5
+-$as_echo "$GDK_PIXBUF_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GDK_PIXBUF_LIBS" >&5
+-$as_echo_n "checking GDK_PIXBUF_LIBS... " >&6; }
+- GDK_PIXBUF_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0"`
+- { $as_echo "$as_me:$LINENO: result: $GDK_PIXBUF_LIBS" >&5
+-$as_echo "$GDK_PIXBUF_LIBS" >&6; }
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GDK_PIXBUF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdk-pixbuf-2.0" 2>&1`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GDK_PIXBUF_CFLAGS=""
+- GDK_PIXBUF_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GDK_PIXBUF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-pixbuf-2.0" 2>&1`
+- echo $GDK_PIXBUF_PKG_ERRORS
++ GDK_PIXBUF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdk-pixbuf-2.0" 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GDK_PIXBUF_PKG_ERRORS" >&5
+
++ { { echo "$as_me:$LINENO: error: Package requirements (gdk-pixbuf-2.0) were not met:
+
++$GDK_PIXBUF_PKG_ERRORS
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+- if test $succeeded = yes; then
+- :
+- else
+- { { $as_echo "$as_me:$LINENO: error: Library requirements (gdk-pixbuf-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+-$as_echo "$as_me: error: Library requirements (gdk-pixbuf-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
++Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS
++and GDK_PIXBUF_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++echo "$as_me: error: Package requirements (gdk-pixbuf-2.0) were not met:
++
++$GDK_PIXBUF_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS
++and GDK_PIXBUF_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
+ { (exit 1); exit 1; }; }
+- fi
++elif test $pkg_failed = untried; then
++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
++Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS
++and GDK_PIXBUF_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS
++and GDK_PIXBUF_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++else
++ GDK_PIXBUF_CFLAGS=$pkg_cv_GDK_PIXBUF_CFLAGS
++ GDK_PIXBUF_LIBS=$pkg_cv_GDK_PIXBUF_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ :
++fi
+
+ GIVEN_CFLAGS=$GDK_PIXBUF_CFLAGS
+ INCLUDE_DIRS=`echo | cpp -v 2>&1`
+@@ -31306,106 +30842,112 @@ $as_echo "$as_me: error: Library requirements (gdk-pixbuf-2.0) not met; consider
+
+
+
+- succeeded=no
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GLADE" >&5
++echo $ECHO_N "checking for GLADE... $ECHO_C" >&6; }
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++if test -n "$GLADE_CFLAGS"; then
++ pkg_cv_GLADE_CFLAGS="$GLADE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= 2.4\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libglade-2.0 >= 2.4") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GLADE_CFLAGS=`$PKG_CONFIG --cflags "libglade-2.0 >= 2.4" 2>/dev/null`
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ pkg_failed=yes
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ else
++ pkg_failed=untried
++fi
++if test -n "$GLADE_LIBS"; then
++ pkg_cv_GLADE_LIBS="$GLADE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= 2.4\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libglade-2.0 >= 2.4") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GLADE_LIBS=`$PKG_CONFIG --libs "libglade-2.0 >= 2.4" 2>/dev/null`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for libglade-2.0 >= 2.4" >&5
+-$as_echo_n "checking for libglade-2.0 >= 2.4... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "libglade-2.0 >= 2.4" ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GLADE_CFLAGS" >&5
+-$as_echo_n "checking GLADE_CFLAGS... " >&6; }
+- GLADE_CFLAGS=`$PKG_CONFIG --cflags "libglade-2.0 >= 2.4"`
+- { $as_echo "$as_me:$LINENO: result: $GLADE_CFLAGS" >&5
+-$as_echo "$GLADE_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GLADE_LIBS" >&5
+-$as_echo_n "checking GLADE_LIBS... " >&6; }
+- GLADE_LIBS=`$PKG_CONFIG --libs "libglade-2.0 >= 2.4"`
+- { $as_echo "$as_me:$LINENO: result: $GLADE_LIBS" >&5
+-$as_echo "$GLADE_LIBS" >&6; }
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GLADE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libglade-2.0 >= 2.4" 2>&1`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GLADE_CFLAGS=""
+- GLADE_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GLADE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libglade-2.0 >= 2.4" 2>&1`
+- echo $GLADE_PKG_ERRORS
++ GLADE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libglade-2.0 >= 2.4" 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GLADE_PKG_ERRORS" >&5
+
++ { { echo "$as_me:$LINENO: error: Package requirements (libglade-2.0 >= 2.4) were not met:
+
++$GLADE_PKG_ERRORS
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+- if test $succeeded = yes; then
+- :
+- else
+- { { $as_echo "$as_me:$LINENO: error: Library requirements (libglade-2.0 >= 2.4) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+-$as_echo "$as_me: error: Library requirements (libglade-2.0 >= 2.4) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
++Alternatively, you may set the environment variables GLADE_CFLAGS
++and GLADE_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++echo "$as_me: error: Package requirements (libglade-2.0 >= 2.4) were not met:
++
++$GLADE_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables GLADE_CFLAGS
++and GLADE_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
+ { (exit 1); exit 1; }; }
+- fi
++elif test $pkg_failed = untried; then
++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
++Alternatively, you may set the environment variables GLADE_CFLAGS
++and GLADE_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables GLADE_CFLAGS
++and GLADE_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++else
++ GLADE_CFLAGS=$pkg_cv_GLADE_CFLAGS
++ GLADE_LIBS=$pkg_cv_GLADE_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ :
++fi
+
+ GIVEN_CFLAGS=$GLADE_CFLAGS
+ INCLUDE_DIRS=`echo | cpp -v 2>&1`
+@@ -31424,304 +30966,480 @@ $as_echo "$as_me: error: Library requirements (libglade-2.0 >= 2.4) not met; con
+ goffice_with_cairo=0
+ have_goffice_0_5=0
+
+- succeeded=no
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
++echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++if test -n "$GOFFICE_CFLAGS"; then
++ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.8 >= 0.7.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.8 >= 0.7.0") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.8 >= 0.7.0" 2>/dev/null`
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ pkg_failed=yes
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ else
++ pkg_failed=untried
++fi
++if test -n "$GOFFICE_LIBS"; then
++ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.8 >= 0.7.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.8 >= 0.7.0") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.8 >= 0.7.0" 2>/dev/null`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for libgoffice-0.8 >= 0.7.0" >&5
+-$as_echo_n "checking for libgoffice-0.8 >= 0.7.0... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "libgoffice-0.8 >= 0.7.0" ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GOFFICE_CFLAGS" >&5
+-$as_echo_n "checking GOFFICE_CFLAGS... " >&6; }
+- GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.8 >= 0.7.0"`
+- { $as_echo "$as_me:$LINENO: result: $GOFFICE_CFLAGS" >&5
+-$as_echo "$GOFFICE_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GOFFICE_LIBS" >&5
+-$as_echo_n "checking GOFFICE_LIBS... " >&6; }
+- GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.8 >= 0.7.0"`
+- { $as_echo "$as_me:$LINENO: result: $GOFFICE_LIBS" >&5
+-$as_echo "$GOFFICE_LIBS" >&6; }
+- else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GOFFICE_CFLAGS=""
+- GOFFICE_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.8 >= 0.7.0" 2>&1`
++if test $pkg_failed = yes; then
+
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.8 >= 0.7.0" 2>&1`
++ else
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.8 >= 0.7.0" 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GOFFICE_PKG_ERRORS" >&5
+
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
++echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
+
+- if test $succeeded = yes; then
+- goffice=1
+- else
++if test -n "$GOFFICE_CFLAGS"; then
++ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.6 >= 0.6.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.6 >= 0.6.0") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.6 >= 0.6.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GOFFICE_LIBS"; then
++ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.6 >= 0.6.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.6 >= 0.6.0") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.6 >= 0.6.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
+
+
+- succeeded=no
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.6 >= 0.6.0" 2>&1`
++ else
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.6 >= 0.6.0" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GOFFICE_PKG_ERRORS" >&5
+
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
++echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
++
++if test -n "$GOFFICE_CFLAGS"; then
++ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.5 >= 0.5.1\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.5 >= 0.5.1") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.5 >= 0.5.1" 2>/dev/null`
++else
++ pkg_failed=yes
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ else
++ pkg_failed=untried
++fi
++if test -n "$GOFFICE_LIBS"; then
++ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.5 >= 0.5.1\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.5 >= 0.5.1") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.5 >= 0.5.1" 2>/dev/null`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for libgoffice-0.6 >= 0.6.0" >&5
+-$as_echo_n "checking for libgoffice-0.6 >= 0.6.0... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "libgoffice-0.6 >= 0.6.0" ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GOFFICE_CFLAGS" >&5
+-$as_echo_n "checking GOFFICE_CFLAGS... " >&6; }
+- GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.6 >= 0.6.0"`
+- { $as_echo "$as_me:$LINENO: result: $GOFFICE_CFLAGS" >&5
+-$as_echo "$GOFFICE_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GOFFICE_LIBS" >&5
+-$as_echo_n "checking GOFFICE_LIBS... " >&6; }
+- GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.6 >= 0.6.0"`
+- { $as_echo "$as_me:$LINENO: result: $GOFFICE_LIBS" >&5
+-$as_echo "$GOFFICE_LIBS" >&6; }
+- else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GOFFICE_CFLAGS=""
+- GOFFICE_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.6 >= 0.6.0" 2>&1`
++if test $pkg_failed = yes; then
+
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
++ else
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GOFFICE_PKG_ERRORS" >&5
+
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ goffice=0
++elif test $pkg_failed = untried; then
++ goffice=0
++else
++ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
++ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ goffice=1
++fi
+
++elif test $pkg_failed = untried; then
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
+
+- if test $succeeded = yes; then
+- goffice=1
+- else
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
++echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
+
++if test -n "$GOFFICE_CFLAGS"; then
++ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.5 >= 0.5.1\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.5 >= 0.5.1") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.5 >= 0.5.1" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GOFFICE_LIBS"; then
++ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.5 >= 0.5.1\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.5 >= 0.5.1") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.5 >= 0.5.1" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
+
+- succeeded=no
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
++ else
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GOFFICE_PKG_ERRORS" >&5
+
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ goffice=0
++elif test $pkg_failed = untried; then
++ goffice=0
++else
++ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
++ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ goffice=1
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
++ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ goffice=1
+ fi
+
++elif test $pkg_failed = untried; then
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for libgoffice-0.5 >= 0.5.1" >&5
+-$as_echo_n "checking for libgoffice-0.5 >= 0.5.1... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "libgoffice-0.5 >= 0.5.1" ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GOFFICE_CFLAGS" >&5
+-$as_echo_n "checking GOFFICE_CFLAGS... " >&6; }
+- GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.5 >= 0.5.1"`
+- { $as_echo "$as_me:$LINENO: result: $GOFFICE_CFLAGS" >&5
+-$as_echo "$GOFFICE_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GOFFICE_LIBS" >&5
+-$as_echo_n "checking GOFFICE_LIBS... " >&6; }
+- GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.5 >= 0.5.1"`
+- { $as_echo "$as_me:$LINENO: result: $GOFFICE_LIBS" >&5
+-$as_echo "$GOFFICE_LIBS" >&6; }
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
++echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
++
++if test -n "$GOFFICE_CFLAGS"; then
++ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.6 >= 0.6.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.6 >= 0.6.0") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.6 >= 0.6.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GOFFICE_LIBS"; then
++ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.6 >= 0.6.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.6 >= 0.6.0") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.6 >= 0.6.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.6 >= 0.6.0" 2>&1`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GOFFICE_CFLAGS=""
+- GOFFICE_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.6 >= 0.6.0" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GOFFICE_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
++echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
++
++if test -n "$GOFFICE_CFLAGS"; then
++ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.5 >= 0.5.1\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.5 >= 0.5.1") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.5 >= 0.5.1" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GOFFICE_LIBS"; then
++ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.5 >= 0.5.1\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.5 >= 0.5.1") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.5 >= 0.5.1" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
+
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
++ else
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GOFFICE_PKG_ERRORS" >&5
+
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ goffice=0
++elif test $pkg_failed = untried; then
++ goffice=0
++else
++ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
++ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ goffice=1
++fi
+
++elif test $pkg_failed = untried; then
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
+
+- if test $succeeded = yes; then
+- goffice=1
+- else
+- goffice=0
+- fi
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
++echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
++
++if test -n "$GOFFICE_CFLAGS"; then
++ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.5 >= 0.5.1\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.5 >= 0.5.1") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.5 >= 0.5.1" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GOFFICE_LIBS"; then
++ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.5 >= 0.5.1\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.5 >= 0.5.1") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.5 >= 0.5.1" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
+
+
+- fi
+
++if test $pkg_failed = yes; then
+
+- fi
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
++ else
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.5 >= 0.5.1" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GOFFICE_PKG_ERRORS" >&5
+
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ goffice=0
++elif test $pkg_failed = untried; then
++ goffice=0
++else
++ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
++ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ goffice=1
++fi
++
++else
++ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
++ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ goffice=1
++fi
++
++else
++ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
++ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ goffice=1
++fi
+ if test x$goffice = x1
+ then
+
+@@ -31738,308 +31456,512 @@ _ACEOF
+ goffice_with_cairo=1
+ else
+
+- succeeded=no
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
++echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++if test -n "$GOFFICE_CFLAGS"; then
++ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.4 >= 0.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.4 >= 0.4.0") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.4 >= 0.4.0" 2>/dev/null`
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ pkg_failed=yes
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ else
++ pkg_failed=untried
++fi
++if test -n "$GOFFICE_LIBS"; then
++ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.4 >= 0.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.4 >= 0.4.0") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.4 >= 0.4.0" 2>/dev/null`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for libgoffice-0.4 >= 0.4.0" >&5
+-$as_echo_n "checking for libgoffice-0.4 >= 0.4.0... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "libgoffice-0.4 >= 0.4.0" ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GOFFICE_CFLAGS" >&5
+-$as_echo_n "checking GOFFICE_CFLAGS... " >&6; }
+- GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.4 >= 0.4.0"`
+- { $as_echo "$as_me:$LINENO: result: $GOFFICE_CFLAGS" >&5
+-$as_echo "$GOFFICE_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GOFFICE_LIBS" >&5
+-$as_echo_n "checking GOFFICE_LIBS... " >&6; }
+- GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.4 >= 0.4.0"`
+- { $as_echo "$as_me:$LINENO: result: $GOFFICE_LIBS" >&5
+-$as_echo "$GOFFICE_LIBS" >&6; }
+- else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GOFFICE_CFLAGS=""
+- GOFFICE_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.4 >= 0.4.0" 2>&1`
++if test $pkg_failed = yes; then
+
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.4 >= 0.4.0" 2>&1`
++ else
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.4 >= 0.4.0" 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GOFFICE_PKG_ERRORS" >&5
+
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
++echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
+
+- if test $succeeded = yes; then
+- goffice=1
+- else
++if test -n "$GOFFICE_CFLAGS"; then
++ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.3 >= 0.3.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.3 >= 0.3.0") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.3 >= 0.3.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GOFFICE_LIBS"; then
++ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.3 >= 0.3.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.3 >= 0.3.0") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.3 >= 0.3.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
+
+
+- succeeded=no
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.3 >= 0.3.0" 2>&1`
++ else
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.3 >= 0.3.0" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GOFFICE_PKG_ERRORS" >&5
+
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
++echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
++
++if test -n "$GOFFICE_CFLAGS"; then
++ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= 0.0.4\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= 0.0.4") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-1 >= 0.0.4" 2>/dev/null`
++else
++ pkg_failed=yes
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ else
++ pkg_failed=untried
++fi
++if test -n "$GOFFICE_LIBS"; then
++ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= 0.0.4\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= 0.0.4") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-1 >= 0.0.4" 2>/dev/null`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for libgoffice-0.3 >= 0.3.0" >&5
+-$as_echo_n "checking for libgoffice-0.3 >= 0.3.0... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "libgoffice-0.3 >= 0.3.0" ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GOFFICE_CFLAGS" >&5
+-$as_echo_n "checking GOFFICE_CFLAGS... " >&6; }
+- GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.3 >= 0.3.0"`
+- { $as_echo "$as_me:$LINENO: result: $GOFFICE_CFLAGS" >&5
+-$as_echo "$GOFFICE_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GOFFICE_LIBS" >&5
+-$as_echo_n "checking GOFFICE_LIBS... " >&6; }
+- GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.3 >= 0.3.0"`
+- { $as_echo "$as_me:$LINENO: result: $GOFFICE_LIBS" >&5
+-$as_echo "$GOFFICE_LIBS" >&6; }
+- else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GOFFICE_CFLAGS=""
+- GOFFICE_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.3 >= 0.3.0" 2>&1`
++if test $pkg_failed = yes; then
+
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
++ else
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GOFFICE_PKG_ERRORS" >&5
+
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
++ { { echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
++echo "$as_me: error: Cannot find libgoffice." >&2;}
++ { (exit 1); exit 1; }; }
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++elif test $pkg_failed = untried; then
+
+- if test $succeeded = yes; then
+- goffice=1
+- else
++ { { echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
++echo "$as_me: error: Cannot find libgoffice." >&2;}
++ { (exit 1); exit 1; }; }
+
++else
++ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
++ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ goffice=1
++fi
+
+- succeeded=no
++elif test $pkg_failed = untried; then
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
++echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
++
++if test -n "$GOFFICE_CFLAGS"; then
++ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= 0.0.4\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= 0.0.4") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-1 >= 0.0.4" 2>/dev/null`
++else
++ pkg_failed=yes
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ else
++ pkg_failed=untried
++fi
++if test -n "$GOFFICE_LIBS"; then
++ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= 0.0.4\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= 0.0.4") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-1 >= 0.0.4" 2>/dev/null`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for libgoffice-1 >= 0.0.4" >&5
+-$as_echo_n "checking for libgoffice-1 >= 0.0.4... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "libgoffice-1 >= 0.0.4" ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GOFFICE_CFLAGS" >&5
+-$as_echo_n "checking GOFFICE_CFLAGS... " >&6; }
+- GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-1 >= 0.0.4"`
+- { $as_echo "$as_me:$LINENO: result: $GOFFICE_CFLAGS" >&5
+-$as_echo "$GOFFICE_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GOFFICE_LIBS" >&5
+-$as_echo_n "checking GOFFICE_LIBS... " >&6; }
+- GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-1 >= 0.0.4"`
+- { $as_echo "$as_me:$LINENO: result: $GOFFICE_LIBS" >&5
+-$as_echo "$GOFFICE_LIBS" >&6; }
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GOFFICE_CFLAGS=""
+- GOFFICE_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GOFFICE_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++ { { echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
++echo "$as_me: error: Cannot find libgoffice." >&2;}
++ { (exit 1); exit 1; }; }
++
++elif test $pkg_failed = untried; then
++
++ { { echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
++echo "$as_me: error: Cannot find libgoffice." >&2;}
++ { (exit 1); exit 1; }; }
+
++else
++ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
++ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ goffice=1
++fi
++
++else
++ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
++ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ goffice=1
++fi
++
++elif test $pkg_failed = untried; then
++
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
++echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
++
++if test -n "$GOFFICE_CFLAGS"; then
++ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.3 >= 0.3.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.3 >= 0.3.0") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.3 >= 0.3.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GOFFICE_LIBS"; then
++ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.3 >= 0.3.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-0.3 >= 0.3.0") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.3 >= 0.3.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-0.3 >= 0.3.0" 2>&1`
++ else
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-0.3 >= 0.3.0" 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GOFFICE_PKG_ERRORS" >&5
+
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
++echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
++
++if test -n "$GOFFICE_CFLAGS"; then
++ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= 0.0.4\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= 0.0.4") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-1 >= 0.0.4" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GOFFICE_LIBS"; then
++ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= 0.0.4\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= 0.0.4") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-1 >= 0.0.4" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
+
+- if test $succeeded = yes; then
+- goffice=1
+- else
+
+- { { $as_echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
+-$as_echo "$as_me: error: Cannot find libgoffice." >&2;}
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
++ else
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GOFFICE_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++ { { echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
++echo "$as_me: error: Cannot find libgoffice." >&2;}
+ { (exit 1); exit 1; }; }
+
+- fi
++elif test $pkg_failed = untried; then
+
++ { { echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
++echo "$as_me: error: Cannot find libgoffice." >&2;}
++ { (exit 1); exit 1; }; }
+
+- fi
++else
++ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
++ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ goffice=1
++fi
+
++elif test $pkg_failed = untried; then
+
+- fi
+
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GOFFICE" >&5
++echo $ECHO_N "checking for GOFFICE... $ECHO_C" >&6; }
++
++if test -n "$GOFFICE_CFLAGS"; then
++ pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= 0.0.4\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= 0.0.4") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-1 >= 0.0.4" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GOFFICE_LIBS"; then
++ pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= 0.0.4\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= 0.0.4") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-1 >= 0.0.4" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
++ else
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgoffice-1 >= 0.0.4" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GOFFICE_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++ { { echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
++echo "$as_me: error: Cannot find libgoffice." >&2;}
++ { (exit 1); exit 1; }; }
++
++elif test $pkg_failed = untried; then
++
++ { { echo "$as_me:$LINENO: error: Cannot find libgoffice." >&5
++echo "$as_me: error: Cannot find libgoffice." >&2;}
++ { (exit 1); exit 1; }; }
++
++else
++ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
++ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ goffice=1
++fi
++
++else
++ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
++ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ goffice=1
++fi
++
++else
++ GOFFICE_CFLAGS=$pkg_cv_GOFFICE_CFLAGS
++ GOFFICE_LIBS=$pkg_cv_GOFFICE_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ goffice=1
++fi
+ fi
+
+ GIVEN_CFLAGS=$GOFFICE_CFLAGS
+@@ -32059,17 +31981,17 @@ $as_echo "$as_me: error: Cannot find libgoffice." >&2;}
+ saved_CPPFLAGS="${CPPFLAGS}"
+ CPPFLAGS="${GOFFICE_CFLAGS} ${CPPFLAGS}"
+ if test "${ac_cv_header_goffice_graph_gog_renderer_cairo_h+set}" = set; then
+- { $as_echo "$as_me:$LINENO: checking for goffice/graph/gog-renderer-cairo.h" >&5
+-$as_echo_n "checking for goffice/graph/gog-renderer-cairo.h... " >&6; }
++ { echo "$as_me:$LINENO: checking for goffice/graph/gog-renderer-cairo.h" >&5
++echo $ECHO_N "checking for goffice/graph/gog-renderer-cairo.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_goffice_graph_gog_renderer_cairo_h+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_goffice_graph_gog_renderer_cairo_h" >&5
+-$as_echo "$ac_cv_header_goffice_graph_gog_renderer_cairo_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_goffice_graph_gog_renderer_cairo_h" >&5
++echo "${ECHO_T}$ac_cv_header_goffice_graph_gog_renderer_cairo_h" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking goffice/graph/gog-renderer-cairo.h usability" >&5
+-$as_echo_n "checking goffice/graph/gog-renderer-cairo.h usability... " >&6; }
++{ echo "$as_me:$LINENO: checking goffice/graph/gog-renderer-cairo.h usability" >&5
++echo $ECHO_N "checking goffice/graph/gog-renderer-cairo.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -32085,33 +32007,32 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking goffice/graph/gog-renderer-cairo.h presence" >&5
+-$as_echo_n "checking goffice/graph/gog-renderer-cairo.h presence... " >&6; }
++{ echo "$as_me:$LINENO: checking goffice/graph/gog-renderer-cairo.h presence" >&5
++echo $ECHO_N "checking goffice/graph/gog-renderer-cairo.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -32125,52 +32046,51 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: goffice/graph/gog-renderer-cairo.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: goffice/graph/gog-renderer-cairo.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to gnucash-devel at gnucash.org ##
+@@ -32179,18 +32099,18 @@ _ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for goffice/graph/gog-renderer-cairo.h" >&5
+-$as_echo_n "checking for goffice/graph/gog-renderer-cairo.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for goffice/graph/gog-renderer-cairo.h" >&5
++echo $ECHO_N "checking for goffice/graph/gog-renderer-cairo.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_goffice_graph_gog_renderer_cairo_h+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_goffice_graph_gog_renderer_cairo_h=$ac_header_preproc
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_goffice_graph_gog_renderer_cairo_h" >&5
+-$as_echo "$ac_cv_header_goffice_graph_gog_renderer_cairo_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_goffice_graph_gog_renderer_cairo_h" >&5
++echo "${ECHO_T}$ac_cv_header_goffice_graph_gog_renderer_cairo_h" >&6; }
+
+ fi
+-if test "x$ac_cv_header_goffice_graph_gog_renderer_cairo_h" = x""yes; then
++if test $ac_cv_header_goffice_graph_gog_renderer_cairo_h = yes; then
+
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -32212,106 +32132,77 @@ fi
+ # check for gtkhtml >= 3.14 with gtkprint support
+ gtkhtml=0
+
+- succeeded=no
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
++echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++if test -n "$GTKHTML_CFLAGS"; then
++ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14" 2>/dev/null`
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ pkg_failed=yes
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKHTML_LIBS"; then
++ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14" 2>/dev/null`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for libgtkhtml-3.14" >&5
+-$as_echo_n "checking for libgtkhtml-3.14... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "libgtkhtml-3.14" ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GTKHTML_CFLAGS" >&5
+-$as_echo_n "checking GTKHTML_CFLAGS... " >&6; }
+- GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14"`
+- { $as_echo "$as_me:$LINENO: result: $GTKHTML_CFLAGS" >&5
+-$as_echo "$GTKHTML_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GTKHTML_LIBS" >&5
+-$as_echo_n "checking GTKHTML_LIBS... " >&6; }
+- GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14"`
+- { $as_echo "$as_me:$LINENO: result: $GTKHTML_LIBS" >&5
+-$as_echo "$GTKHTML_LIBS" >&6; }
+- else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GTKHTML_CFLAGS=""
+- GTKHTML_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.14" 2>&1`
++if test $pkg_failed = yes; then
+
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.14" 2>&1`
++ else
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.14" 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_PKG_ERRORS" >&5
+
+-
+-
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
+-
+- if test $succeeded = yes; then
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ gtkhtml=0
++elif test $pkg_failed = untried; then
++ gtkhtml=0
++else
++ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
++ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+ if test "x$HAVE_GTK_2_10" != "xyes"; then
+- { $as_echo "$as_me:$LINENO: Found libgtkhtml-3.14, but not gtk+-2.0 >= 2.10" >&5
+-$as_echo "$as_me: Found libgtkhtml-3.14, but not gtk+-2.0 >= 2.10" >&6;}
++ { echo "$as_me:$LINENO: Found libgtkhtml-3.14, but not gtk+-2.0 >= 2.10" >&5
++echo "$as_me: Found libgtkhtml-3.14, but not gtk+-2.0 >= 2.10" >&6;}
+ elif test "x$goffice_with_cairo" != "x1"; then
+- { $as_echo "$as_me:$LINENO: Found libgtkhtml-3.14, but goffice lacks a cairo renderer" >&5
+-$as_echo "$as_me: Found libgtkhtml-3.14, but goffice lacks a cairo renderer" >&6;}
++ { echo "$as_me:$LINENO: Found libgtkhtml-3.14, but goffice lacks a cairo renderer" >&5
++echo "$as_me: Found libgtkhtml-3.14, but goffice lacks a cairo renderer" >&6;}
+ else
+ gtkhtml=1
+
+@@ -32321,10 +32212,7 @@ _ACEOF
+
+ fi
+
+- else
+- gtkhtml=0
+- fi
+-
++fi
+ if test "x$gtkhtml" = "x1"; then
+ GTKHTML_USES_GTKPRINT_TRUE=
+ GTKHTML_USES_GTKPRINT_FALSE='#'
+@@ -32336,18 +32224,18 @@ fi
+
+ # GOffice >= 0.5 requires GtkHTML >= 3.14
+ if test x$have_goffice_0_5 = x1 -a x$gtkhtml = x0 ; then
+- { { $as_echo "$as_me:$LINENO: error: Goffice uses Cairo/GtkPrint but didn't find GtkHTML with GtkPrint support" >&5
+-$as_echo "$as_me: error: Goffice uses Cairo/GtkPrint but didn't find GtkHTML with GtkPrint support" >&2;}
++ { { echo "$as_me:$LINENO: error: Goffice uses Cairo/GtkPrint but didn't find GtkHTML with GtkPrint support" >&5
++echo "$as_me: error: Goffice uses Cairo/GtkPrint but didn't find GtkHTML with GtkPrint support" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ # check for gtkhtml >= 3.16 (includes gtk_html_print_operation_run())
+ if test x$gtkhtml = x1; then
+- { $as_echo "$as_me:$LINENO: checking for GtkHTML - version >= 3.16.0" >&5
+-$as_echo_n "checking for GtkHTML - version >= 3.16.0... " >&6; }
++ { echo "$as_me:$LINENO: checking for GtkHTML - version >= 3.16.0" >&5
++echo $ECHO_N "checking for GtkHTML - version >= 3.16.0... $ECHO_C" >&6; }
+ if $PKG_CONFIG 'libgtkhtml-3.14 >= 3.16.0'; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_GTKHTML_3_16 1
+@@ -32355,8 +32243,8 @@ _ACEOF
+
+ HAVE_GTKHTML_3_16=1
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ fi
+
+@@ -32364,510 +32252,1196 @@ $as_echo "no" >&6; }
+ if test x$gtkhtml = x0
+ then
+
+- succeeded=no
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
++echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++if test -n "$GTKHTML_CFLAGS"; then
++ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8 " 2>/dev/null`
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKHTML_LIBS"; then
++ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
+
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.8 " 2>&1`
++ else
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.8 " 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
++echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
++
++if test -n "$GTKHTML_CFLAGS"; then
++ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.6 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.6 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.6 " 2>/dev/null`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKHTML_LIBS"; then
++ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.6 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.6 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.6 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for libgtkhtml-3.8 " >&5
+-$as_echo_n "checking for libgtkhtml-3.8 ... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "libgtkhtml-3.8 " ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GTKHTML_CFLAGS" >&5
+-$as_echo_n "checking GTKHTML_CFLAGS... " >&6; }
+- GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8 "`
+- { $as_echo "$as_me:$LINENO: result: $GTKHTML_CFLAGS" >&5
+-$as_echo "$GTKHTML_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GTKHTML_LIBS" >&5
+-$as_echo_n "checking GTKHTML_LIBS... " >&6; }
+- GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8 "`
+- { $as_echo "$as_me:$LINENO: result: $GTKHTML_LIBS" >&5
+-$as_echo "$GTKHTML_LIBS" >&6; }
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.6 " 2>&1`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GTKHTML_CFLAGS=""
+- GTKHTML_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.8 " 2>&1`
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.6 " 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
++echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
++
++if test -n "$GTKHTML_CFLAGS"; then
++ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.2 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.2 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.2 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKHTML_LIBS"; then
++ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.2 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.2 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.2 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
+
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.2 " 2>&1`
++ else
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.2 " 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_PKG_ERRORS" >&5
+
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
++echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
+
+- if test $succeeded = yes; then
+- gtkhtml=1
+- else
++if test -n "$GTKHTML_CFLAGS"; then
++ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKHTML_LIBS"; then
++ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
+
+
+- succeeded=no
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.1 " 2>&1`
++ else
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.1 " 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_PKG_ERRORS" >&5
+
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
++echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
++ { (exit 1); exit 1; }; }
++
++elif test $pkg_failed = untried; then
++
++ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
++echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
++ { (exit 1); exit 1; }; }
++
++else
++ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
++ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ gtkhtml=1
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++
++elif test $pkg_failed = untried; then
++
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
++echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
++
++if test -n "$GTKHTML_CFLAGS"; then
++ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKHTML_LIBS"; then
++ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 " 2>/dev/null`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for libgtkhtml-3.6 " >&5
+-$as_echo_n "checking for libgtkhtml-3.6 ... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "libgtkhtml-3.6 " ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GTKHTML_CFLAGS" >&5
+-$as_echo_n "checking GTKHTML_CFLAGS... " >&6; }
+- GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.6 "`
+- { $as_echo "$as_me:$LINENO: result: $GTKHTML_CFLAGS" >&5
+-$as_echo "$GTKHTML_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GTKHTML_LIBS" >&5
+-$as_echo_n "checking GTKHTML_LIBS... " >&6; }
+- GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.6 "`
+- { $as_echo "$as_me:$LINENO: result: $GTKHTML_LIBS" >&5
+-$as_echo "$GTKHTML_LIBS" >&6; }
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.1 " 2>&1`
++ else
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.1 " 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
++echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
++ { (exit 1); exit 1; }; }
++
++elif test $pkg_failed = untried; then
++
++ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
++echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
++ { (exit 1); exit 1; }; }
++
++else
++ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
++ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ gtkhtml=1
++fi
++
++else
++ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
++ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ gtkhtml=1
++fi
++
++elif test $pkg_failed = untried; then
++
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
++echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
++
++if test -n "$GTKHTML_CFLAGS"; then
++ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.2 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.2 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.2 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKHTML_LIBS"; then
++ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.2 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.2 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.2 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.2 " 2>&1`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GTKHTML_CFLAGS=""
+- GTKHTML_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.6 " 2>&1`
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.2 " 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
++echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
++
++if test -n "$GTKHTML_CFLAGS"; then
++ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKHTML_LIBS"; then
++ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.1 " 2>&1`
++ else
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.1 " 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_PKG_ERRORS" >&5
+
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
++ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
++echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
++ { (exit 1); exit 1; }; }
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++elif test $pkg_failed = untried; then
+
+- if test $succeeded = yes; then
+- gtkhtml=1
+- else
++ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
++echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
++ { (exit 1); exit 1; }; }
+
++else
++ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
++ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ gtkhtml=1
++fi
+
+- succeeded=no
++elif test $pkg_failed = untried; then
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
++echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
++
++if test -n "$GTKHTML_CFLAGS"; then
++ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 " 2>/dev/null`
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKHTML_LIBS"; then
++ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
+
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.1 " 2>&1`
++ else
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.1 " 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
++echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
++ { (exit 1); exit 1; }; }
++
++elif test $pkg_failed = untried; then
++
++ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
++echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
++ { (exit 1); exit 1; }; }
++
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
++ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ gtkhtml=1
+ fi
+
++else
++ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
++ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ gtkhtml=1
++fi
+
+- fi
++else
++ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
++ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ gtkhtml=1
++fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for libgtkhtml-3.2 " >&5
+-$as_echo_n "checking for libgtkhtml-3.2 ... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "libgtkhtml-3.2 " ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GTKHTML_CFLAGS" >&5
+-$as_echo_n "checking GTKHTML_CFLAGS... " >&6; }
+- GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.2 "`
+- { $as_echo "$as_me:$LINENO: result: $GTKHTML_CFLAGS" >&5
+-$as_echo "$GTKHTML_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GTKHTML_LIBS" >&5
+-$as_echo_n "checking GTKHTML_LIBS... " >&6; }
+- GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.2 "`
+- { $as_echo "$as_me:$LINENO: result: $GTKHTML_LIBS" >&5
+-$as_echo "$GTKHTML_LIBS" >&6; }
++elif test $pkg_failed = untried; then
++
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
++echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
++
++if test -n "$GTKHTML_CFLAGS"; then
++ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.6 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.6 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.6 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKHTML_LIBS"; then
++ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.6 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.6 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.6 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.6 " 2>&1`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GTKHTML_CFLAGS=""
+- GTKHTML_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.2 " 2>&1`
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.6 " 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
++echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
++
++if test -n "$GTKHTML_CFLAGS"; then
++ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.2 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.2 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.2 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKHTML_LIBS"; then
++ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.2 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.2 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.2 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
+
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.2 " 2>&1`
++ else
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.2 " 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_PKG_ERRORS" >&5
+
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
++echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
+
+- if test $succeeded = yes; then
+- gtkhtml=1
+- else
++if test -n "$GTKHTML_CFLAGS"; then
++ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKHTML_LIBS"; then
++ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
+
+
+- succeeded=no
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.1 " 2>&1`
++ else
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.1 " 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_PKG_ERRORS" >&5
+
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
++echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
++ { (exit 1); exit 1; }; }
++
++elif test $pkg_failed = untried; then
++
++ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
++echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
++ { (exit 1); exit 1; }; }
++
++else
++ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
++ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ gtkhtml=1
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++
++elif test $pkg_failed = untried; then
++
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
++echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
++
++if test -n "$GTKHTML_CFLAGS"; then
++ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 " 2>/dev/null`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKHTML_LIBS"; then
++ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for libgtkhtml-3.1 " >&5
+-$as_echo_n "checking for libgtkhtml-3.1 ... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "libgtkhtml-3.1 " ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GTKHTML_CFLAGS" >&5
+-$as_echo_n "checking GTKHTML_CFLAGS... " >&6; }
+- GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 "`
+- { $as_echo "$as_me:$LINENO: result: $GTKHTML_CFLAGS" >&5
+-$as_echo "$GTKHTML_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GTKHTML_LIBS" >&5
+-$as_echo_n "checking GTKHTML_LIBS... " >&6; }
+- GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 "`
+- { $as_echo "$as_me:$LINENO: result: $GTKHTML_LIBS" >&5
+-$as_echo "$GTKHTML_LIBS" >&6; }
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.1 " 2>&1`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GTKHTML_CFLAGS=""
+- GTKHTML_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.1 " 2>&1`
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.1 " 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
++echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
++ { (exit 1); exit 1; }; }
++
++elif test $pkg_failed = untried; then
++
++ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
++echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
++ { (exit 1); exit 1; }; }
++
++else
++ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
++ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ gtkhtml=1
++fi
++
++else
++ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
++ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ gtkhtml=1
++fi
++
++elif test $pkg_failed = untried; then
++
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
++echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
++
++if test -n "$GTKHTML_CFLAGS"; then
++ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.2 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.2 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.2 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKHTML_LIBS"; then
++ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.2 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.2 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.2 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
+
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.2 " 2>&1`
++ else
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.2 " 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_PKG_ERRORS" >&5
+
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
++echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
++
++if test -n "$GTKHTML_CFLAGS"; then
++ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKHTML_LIBS"; then
++ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
+
+- if test $succeeded = yes; then
+- gtkhtml=1
+- else
+
+- { { $as_echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
+-$as_echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.1 " 2>&1`
++ else
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.1 " 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
++echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
+ { (exit 1); exit 1; }; }
+
+- fi
++elif test $pkg_failed = untried; then
+
++ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
++echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
++ { (exit 1); exit 1; }; }
+
+- fi
++else
++ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
++ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ gtkhtml=1
++fi
+
++elif test $pkg_failed = untried; then
+
+- fi
+
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
++echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
+
+- fi
++if test -n "$GTKHTML_CFLAGS"; then
++ pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKHTML_LIBS"; then
++ pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.1 \"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.1 ") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
+
+
+
+- succeeded=no
++if test $pkg_failed = yes; then
+
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
+ else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtkhtml-3.1 " 2>&1`
++ else
++ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtkhtml-3.1 " 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_PKG_ERRORS" >&5
+
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++
++ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
++echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
++ { (exit 1); exit 1; }; }
++
++elif test $pkg_failed = untried; then
++
++ { { echo "$as_me:$LINENO: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&5
++echo "$as_me: error: Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)" >&2;}
++ { (exit 1); exit 1; }; }
++
++else
++ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
++ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ gtkhtml=1
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
++ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ gtkhtml=1
+ fi
+
++else
++ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
++ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ gtkhtml=1
++fi
+
+- fi
++else
++ GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
++ GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ gtkhtml=1
++fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- pkg_config_min_version=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
+- { $as_echo "$as_me:$LINENO: checking for libgnomeprint-2.2 libgnomeprintui-2.2" >&5
+-$as_echo_n "checking for libgnomeprint-2.2 libgnomeprintui-2.2... " >&6; }
+-
+- if $PKG_CONFIG --silence-errors --exists "libgnomeprint-2.2 libgnomeprintui-2.2" ; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking GNOME_PRINT_CFLAGS" >&5
+-$as_echo_n "checking GNOME_PRINT_CFLAGS... " >&6; }
+- GNOME_PRINT_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprint-2.2 libgnomeprintui-2.2"`
+- { $as_echo "$as_me:$LINENO: result: $GNOME_PRINT_CFLAGS" >&5
+-$as_echo "$GNOME_PRINT_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking GNOME_PRINT_LIBS" >&5
+-$as_echo_n "checking GNOME_PRINT_LIBS... " >&6; }
+- GNOME_PRINT_LIBS=`$PKG_CONFIG --libs "libgnomeprint-2.2 libgnomeprintui-2.2"`
+- { $as_echo "$as_me:$LINENO: result: $GNOME_PRINT_LIBS" >&5
+-$as_echo "$GNOME_PRINT_LIBS" >&6; }
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GNOME_PRINT" >&5
++echo $ECHO_N "checking for GNOME_PRINT... $ECHO_C" >&6; }
++
++if test -n "$GNOME_PRINT_CFLAGS"; then
++ pkg_cv_GNOME_PRINT_CFLAGS="$GNOME_PRINT_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprint-2.2 libgnomeprintui-2.2\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GNOME_PRINT_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprint-2.2 libgnomeprintui-2.2" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GNOME_PRINT_LIBS"; then
++ pkg_cv_GNOME_PRINT_LIBS="$GNOME_PRINT_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprint-2.2 libgnomeprintui-2.2\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GNOME_PRINT_LIBS=`$PKG_CONFIG --libs "libgnomeprint-2.2 libgnomeprintui-2.2" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GNOME_PRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2" 2>&1`
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- GNOME_PRINT_CFLAGS=""
+- GNOME_PRINT_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GNOME_PRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2" 2>&1`
+- echo $GNOME_PRINT_PKG_ERRORS
++ GNOME_PRINT_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2" 2>&1`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GNOME_PRINT_PKG_ERRORS" >&5
+
++ { { echo "$as_me:$LINENO: error: Package requirements (libgnomeprint-2.2 libgnomeprintui-2.2) were not met:
+
++$GNOME_PRINT_PKG_ERRORS
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+- if test $succeeded = yes; then
+- :
+- else
+- { { $as_echo "$as_me:$LINENO: error: Library requirements (libgnomeprint-2.2 libgnomeprintui-2.2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+-$as_echo "$as_me: error: Library requirements (libgnomeprint-2.2 libgnomeprintui-2.2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
++Alternatively, you may set the environment variables GNOME_PRINT_CFLAGS
++and GNOME_PRINT_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++echo "$as_me: error: Package requirements (libgnomeprint-2.2 libgnomeprintui-2.2) were not met:
++
++$GNOME_PRINT_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables GNOME_PRINT_CFLAGS
++and GNOME_PRINT_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
+ { (exit 1); exit 1; }; }
+- fi
++elif test $pkg_failed = untried; then
++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables GNOME_PRINT_CFLAGS
++and GNOME_PRINT_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
++Alternatively, you may set the environment variables GNOME_PRINT_CFLAGS
++and GNOME_PRINT_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++else
++ GNOME_PRINT_CFLAGS=$pkg_cv_GNOME_PRINT_CFLAGS
++ GNOME_PRINT_LIBS=$pkg_cv_GNOME_PRINT_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ :
++fi
+
+ GIVEN_CFLAGS=$GNOME_PRINT_CFLAGS
+ INCLUDE_DIRS=`echo | cpp -v 2>&1`
+@@ -32910,7 +33484,7 @@ if test "${enable_efence+set}" = set; then
+ USE_EFENCE=1
+
+ cat >>confdefs.h <<\_ACEOF
+-#define USE_EFENCE /**/
++#define USE_EFENCE
+ _ACEOF
+
+ fi
+@@ -32930,7 +33504,7 @@ fi
+ GNOME=1
+
+ cat >>confdefs.h <<\_ACEOF
+-#define GNOME /**/
++#define GNOME
+ _ACEOF
+
+ else
+@@ -33068,11 +33642,11 @@ fi
+
+ for ac_func in pthread_mutex_init
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -33125,42 +33699,35 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -33170,11 +33737,11 @@ done
+
+ for ac_func in strptime localtime_r
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -33227,42 +33794,35 @@ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ else
+@@ -33290,8 +33850,8 @@ fi
+ ###-------------------------------------------------------------------------
+
+ # This has to come after AC_PROG_CC _AND_ GNOME_COMPILE_WARNINGS
+-{ $as_echo "$as_me:$LINENO: checking what extra warning flags to pass to the C compiler" >&5
+-$as_echo_n "checking what extra warning flags to pass to the C compiler... " >&6; }
++{ echo "$as_me:$LINENO: checking what extra warning flags to pass to the C compiler" >&5
++echo $ECHO_N "checking what extra warning flags to pass to the C compiler... $ECHO_C" >&6; }
+ if test ${GCC}x = yesx
+ then
+ warnFLAGS=
+@@ -33319,8 +33879,8 @@ if test "${enable_error_on_warning+set}" = set; then
+ enableval=$enable_error_on_warning; case "${enableval}" in
+ yes) warnFLAGS="${warnFLAGS} -Werror" ; gnc_error_on_warning=yes ;;
+ no) gnc_error_on_warning=no ;;
+- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-error-on-warning" >&5
+-$as_echo "$as_me: error: bad value ${enableval} for --enable-error-on-warning" >&2;}
++ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-error-on-warning" >&5
++echo "$as_me: error: bad value ${enableval} for --enable-error-on-warning" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+ else
+@@ -33357,8 +33917,8 @@ fi
+ else
+ warnFLAGS=none
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $warnFLAGS" >&5
+-$as_echo "$warnFLAGS" >&6; }
++{ echo "$as_me:$LINENO: result: $warnFLAGS" >&5
++echo "${ECHO_T}$warnFLAGS" >&6; }
+
+ # Adjust CFLAGS and LDFLAGS on Windows
+ if test "x${platform_win32}" = "xyes"; then
+@@ -33412,12 +33972,11 @@ _ACEOF
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+@@ -33450,12 +34009,12 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+ test "x$cache_file" != "x/dev/null" &&
+- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+-$as_echo "$as_me: updating cache $cache_file" >&6;}
++ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
++echo "$as_me: updating cache $cache_file" >&6;}
+ cat confcache >$cache_file
+ else
+- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
++ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
++echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ fi
+ fi
+ rm -f confcache
+@@ -33471,7 +34030,7 @@ ac_ltlibobjs=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
++ ac_i=`echo "$ac_i" | sed "$ac_script"`
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
+ # will be set to the directory where LIBOBJS objects are built.
+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+@@ -33483,16 +34042,16 @@ LTLIBOBJS=$ac_ltlibobjs
+
+
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
++echo "$as_me: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
++echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -33501,161 +34060,166 @@ fi
+
+
+ if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
++echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
++echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+-
+ if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"OS_WIN32\" was never defined.
++echo "$as_me: error: conditional \"OS_WIN32\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined.
++echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${BUILDING_FROM_SVN_TRUE}" && test -z "${BUILDING_FROM_SVN_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILDING_FROM_SVN\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"BUILDING_FROM_SVN\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"BUILDING_FROM_SVN\" was never defined.
++echo "$as_me: error: conditional \"BUILDING_FROM_SVN\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${GNUCASH_SEPARATE_BUILDDIR_TRUE}" && test -z "${GNUCASH_SEPARATE_BUILDDIR_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"GNUCASH_SEPARATE_BUILDDIR\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"GNUCASH_SEPARATE_BUILDDIR\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"GNUCASH_SEPARATE_BUILDDIR\" was never defined.
++echo "$as_me: error: conditional \"GNUCASH_SEPARATE_BUILDDIR\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${HAVE_X11_XLIB_H_TRUE}" && test -z "${HAVE_X11_XLIB_H_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_X11_XLIB_H\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_X11_XLIB_H\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_X11_XLIB_H\" was never defined.
++echo "$as_me: error: conditional \"HAVE_X11_XLIB_H\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${HAVE_GLIB_2_8_TRUE}" && test -z "${HAVE_GLIB_2_8_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GLIB_2_8\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GLIB_2_8\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_GLIB_2_8\" was never defined.
++echo "$as_me: error: conditional \"HAVE_GLIB_2_8\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${HAVE_GLIB_2_8_TRUE}" && test -z "${HAVE_GLIB_2_8_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GLIB_2_8\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GLIB_2_8\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_GLIB_2_8\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++if test -z "${GDK_TARGET_QUARTZ_TRUE}" && test -z "${GDK_TARGET_QUARTZ_FALSE}"; then
++ { { echo "$as_me:$LINENO: error: conditional \"GDK_TARGET_QUARTZ\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_GLIB_2_8\" was never defined.
++echo "$as_me: error: conditional \"GDK_TARGET_QUARTZ\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${GUILE_TRUE}" && test -z "${GUILE_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"GUILE\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"GUILE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"GUILE\" was never defined.
++echo "$as_me: error: conditional \"GUILE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${GNC_HAVE_GUILE_WWW_TRUE}" && test -z "${GNC_HAVE_GUILE_WWW_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"GNC_HAVE_GUILE_WWW\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"GNC_HAVE_GUILE_WWW\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"GNC_HAVE_GUILE_WWW\" was never defined.
++echo "$as_me: error: conditional \"GNC_HAVE_GUILE_WWW\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${USE_LIBQOF_TRUE}" && test -z "${USE_LIBQOF_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_LIBQOF\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"USE_LIBQOF\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"USE_LIBQOF\" was never defined.
++echo "$as_me: error: conditional \"USE_LIBQOF\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${USE_LIBQOF_TRUE}" && test -z "${USE_LIBQOF_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_LIBQOF\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"USE_LIBQOF\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"USE_LIBQOF\" was never defined.
++echo "$as_me: error: conditional \"USE_LIBQOF\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${GNC_ETAGS_FILE_TRUE}" && test -z "${GNC_ETAGS_FILE_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"GNC_ETAGS_FILE\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"GNC_ETAGS_FILE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"GNC_ETAGS_FILE\" was never defined.
++echo "$as_me: error: conditional \"GNC_ETAGS_FILE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${GNC_CTAGS_FILE_TRUE}" && test -z "${GNC_CTAGS_FILE_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"GNC_CTAGS_FILE\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"GNC_CTAGS_FILE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"GNC_CTAGS_FILE\" was never defined.
++echo "$as_me: error: conditional \"GNC_CTAGS_FILE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${DOC_TRUE}" && test -z "${DOC_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"DOC\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"DOC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"DOC\" was never defined.
++echo "$as_me: error: conditional \"DOC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${ENABLE_DOXYGEN_TRUE}" && test -z "${ENABLE_DOXYGEN_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_DOXYGEN\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_DOXYGEN\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"ENABLE_DOXYGEN\" was never defined.
++echo "$as_me: error: conditional \"ENABLE_DOXYGEN\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${GNUCASH_ENABLE_GUI_TRUE}" && test -z "${GNUCASH_ENABLE_GUI_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"GNUCASH_ENABLE_GUI\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"GNUCASH_ENABLE_GUI\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"GNUCASH_ENABLE_GUI\" was never defined.
++echo "$as_me: error: conditional \"GNUCASH_ENABLE_GUI\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${HAVE_GTK_2_10_TRUE}" && test -z "${HAVE_GTK_2_10_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_10\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_10\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_GTK_2_10\" was never defined.
++echo "$as_me: error: conditional \"HAVE_GTK_2_10\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${GTKHTML_USES_GTKPRINT_TRUE}" && test -z "${GTKHTML_USES_GTKPRINT_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"GTKHTML_USES_GTKPRINT\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"GTKHTML_USES_GTKPRINT\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"GTKHTML_USES_GTKPRINT\" was never defined.
++echo "$as_me: error: conditional \"GTKHTML_USES_GTKPRINT\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${HAVE_GTK_2_10_TRUE}" && test -z "${HAVE_GTK_2_10_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_10\" was never defined.
++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_2_10\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_GTK_2_10\" was never defined.
++echo "$as_me: error: conditional \"HAVE_GTK_2_10\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ : ${CONFIG_STATUS=./config.status}
+-ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
++echo "$as_me: creating $CONFIG_STATUS" >&6;}
++cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+ # Generated by $as_me.
+ # Run this file to recreate the current configuration.
+@@ -33668,7 +34232,7 @@ ac_cs_silent=false
+ SHELL=\${CONFIG_SHELL-$SHELL}
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ ## --------------------- ##
+ ## M4sh Initialization. ##
+ ## --------------------- ##
+@@ -33678,7 +34242,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+@@ -33700,45 +34264,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+-as_nl='
+-'
+-export as_nl
+-# Printing a long string crashes Solaris 7 /usr/bin/printf.
+-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+- as_echo='printf %s\n'
+- as_echo_n='printf %s'
+-else
+- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+- as_echo_n='/usr/ucb/echo -n'
+- else
+- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+- as_echo_n_body='eval
+- arg=$1;
+- case $arg in
+- *"$as_nl"*)
+- expr "X$arg" : "X\\(.*\\)$as_nl";
+- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+- esac;
+- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+- '
+- export as_echo_n_body
+- as_echo_n='sh -c $as_echo_n_body as_echo'
+- fi
+- export as_echo_body
+- as_echo='sh -c $as_echo_body as_echo'
+-fi
+-
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+- PATH_SEPARATOR=:
+- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+- PATH_SEPARATOR=';'
+- }
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
+ fi
+
+ # Support unset when possible.
+@@ -33754,6 +34290,8 @@ fi
+ # there to prevent editors from complaining about space-tab.
+ # (If _AS_PATH_WALK were called with IFS unset, it would disable word
+ # splitting by setting IFS to empty value.)
++as_nl='
++'
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
+@@ -33776,7 +34314,7 @@ if test "x$as_myself" = x; then
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ { (exit 1); exit 1; }
+ fi
+
+@@ -33789,10 +34327,17 @@ PS2='> '
+ PS4='+ '
+
+ # NLS nuisances.
+-LC_ALL=C
+-export LC_ALL
+-LANGUAGE=C
+-export LANGUAGE
++for as_var in \
++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++ LC_TELEPHONE LC_TIME
++do
++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++ eval $as_var=C; export $as_var
++ else
++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++ fi
++done
+
+ # Required to use basename.
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+@@ -33814,7 +34359,7 @@ as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X/"$0" |
++echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+@@ -33865,7 +34410,7 @@ $as_unset CDPATH
+ s/-\n.*//
+ ' >$as_me.lineno &&
+ chmod +x "$as_me.lineno" ||
+- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+@@ -33893,6 +34438,7 @@ case `echo -n x` in
+ *)
+ ECHO_N='-n';;
+ esac
++
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+@@ -33905,22 +34451,19 @@ if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+ else
+ rm -f conf$$.dir
+- mkdir conf$$.dir 2>/dev/null
+-fi
+-if (echo >conf$$.file) 2>/dev/null; then
+- if ln -s conf$$.file conf$$ 2>/dev/null; then
+- as_ln_s='ln -s'
+- # ... but there are two gotchas:
+- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+- # In both cases, we have to default to `cp -p'.
+- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+- as_ln_s='cp -p'
+- elif ln conf$$.file conf$$ 2>/dev/null; then
+- as_ln_s=ln
+- else
++ mkdir conf$$.dir
++fi
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s='ln -s'
++ # ... but there are two gotchas:
++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++ # In both cases, we have to default to `cp -p'.
++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+- fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s=ln
+ else
+ as_ln_s='cp -p'
+ fi
+@@ -33945,10 +34488,10 @@ else
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+- test -d "$1/.";
++ test -d "$1/.";
+ else
+ case $1 in
+- -*)set "./$1";;
++ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+@@ -33971,7 +34514,7 @@ exec 6>&1
+ # values after options handling.
+ ac_log="
+ This file was extended by gnucash $as_me 2.2.9, which was
+-generated by GNU Autoconf 2.63. Invocation command line was
++generated by GNU Autoconf 2.61. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -33984,16 +34527,7 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
+
+ _ACEOF
+
+-case $ac_config_files in *"
+-"*) set x $ac_config_files; shift; ac_config_files=$*;;
+-esac
+-
+-case $ac_config_headers in *"
+-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+-esac
+-
+-
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ # Files that config.status was made for.
+ config_files="$ac_config_files"
+ config_headers="$ac_config_headers"
+@@ -34001,23 +34535,22 @@ config_commands="$ac_config_commands"
+
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ ac_cs_usage="\
+ \`$as_me' instantiates files from templates according to the
+ current configuration.
+
+-Usage: $0 [OPTION]... [FILE]...
++Usage: $0 [OPTIONS] [FILE]...
+
+ -h, --help print this help, then exit
+ -V, --version print version number and configuration settings, then exit
+- -q, --quiet, --silent
+- do not print progress messages
++ -q, --quiet do not print progress messages
+ -d, --debug don't remove temporary files
+ --recheck update $as_me by reconfiguring in the same conditions
+- --file=FILE[:TEMPLATE]
+- instantiate the configuration file FILE
+- --header=FILE[:TEMPLATE]
+- instantiate the configuration header FILE
++ --file=FILE[:TEMPLATE]
++ instantiate the configuration file FILE
++ --header=FILE[:TEMPLATE]
++ instantiate the configuration header FILE
+
+ Configuration files:
+ $config_files
+@@ -34031,13 +34564,13 @@ $config_commands
+ Report bugs to <bug-autoconf at gnu.org>."
+
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ gnucash config.status 2.2.9
+-configured by $0, generated by GNU Autoconf 2.63,
+- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.61,
++ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+-Copyright (C) 2008 Free Software Foundation, Inc.
++Copyright (C) 2006 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+
+@@ -34045,12 +34578,11 @@ ac_pwd='$ac_pwd'
+ srcdir='$srcdir'
+ INSTALL='$INSTALL'
+ MKDIR_P='$MKDIR_P'
+-AWK='$AWK'
+-test -n "\$AWK" || AWK=awk
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-# The default lists apply if the user does not specify any file.
++cat >>$CONFIG_STATUS <<\_ACEOF
++# If no file are specified by the user, then we need to provide default
++# value. By we need to know if files were specified by the user.
+ ac_need_defaults=:
+ while test $# != 0
+ do
+@@ -34072,36 +34604,30 @@ do
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+ ac_cs_recheck=: ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+- $as_echo "$ac_cs_version"; exit ;;
++ echo "$ac_cs_version"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+ $ac_shift
+- case $ac_optarg in
+- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+- esac
+- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
++ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+ ac_need_defaults=false;;
+ --header | --heade | --head | --hea )
+ $ac_shift
+- case $ac_optarg in
+- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+- esac
+- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
++ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+ ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+- { $as_echo "$as_me: error: ambiguous option: $1
++ { echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; };;
+ --help | --hel | -h )
+- $as_echo "$ac_cs_usage"; exit ;;
++ echo "$ac_cs_usage"; exit ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
+ ac_cs_silent=: ;;
+
+ # This is an error.
+- -*) { $as_echo "$as_me: error: unrecognized option: $1
++ -*) { echo "$as_me: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; } ;;
+
+@@ -34120,41 +34646,36 @@ if $ac_cs_silent; then
+ fi
+
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ if \$ac_cs_recheck; then
+- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+- shift
+- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+- CONFIG_SHELL='$SHELL'
++ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++ CONFIG_SHELL=$SHELL
+ export CONFIG_SHELL
+- exec "\$@"
++ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ fi
+
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ exec 5>>config.log
+ {
+ echo
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+ ## Running $as_me. ##
+ _ASBOX
+- $as_echo "$ac_log"
++ echo "$ac_log"
+ } >&5
+
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ #
+ # INIT-COMMANDS
+ #
+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+-INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
+-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
+
+
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+
+ # Handling of arguments.
+ for ac_config_target in $ac_config_targets
+@@ -34162,7 +34683,6 @@ do
+ case $ac_config_target in
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+- "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+@@ -34310,8 +34830,8 @@ do
+ "src/business/business-reports/Makefile") CONFIG_FILES="$CONFIG_FILES src/business/business-reports/Makefile" ;;
+ "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
+
+- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
++ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
++echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+ done
+@@ -34352,144 +34872,431 @@ $debug ||
+ (umask 077 && mkdir "$tmp")
+ } ||
+ {
+- $as_echo "$as_me: cannot create a temporary directory in ." >&2
++ echo "$me: cannot create a temporary directory in ." >&2
+ { (exit 1); exit 1; }
+ }
+
+-# Set up the scripts for CONFIG_FILES section.
+-# No need to generate them if there are no CONFIG_FILES.
+-# This happens for instance with `./config.status config.h'.
++#
++# Set up the sed scripts for CONFIG_FILES section.
++#
++
++# No need to generate the scripts if there are no CONFIG_FILES.
++# This happens for instance when ./config.status config.h
+ if test -n "$CONFIG_FILES"; then
+
++_ACEOF
++
+
+-ac_cr='
'
+-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+- ac_cs_awk_cr='\\r'
+-else
+- ac_cs_awk_cr=$ac_cr
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ cat >conf$$subs.sed <<_ACEOF
++SHELL!$SHELL$ac_delim
++PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
++PACKAGE_NAME!$PACKAGE_NAME$ac_delim
++PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
++PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
++PACKAGE_STRING!$PACKAGE_STRING$ac_delim
++PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
++exec_prefix!$exec_prefix$ac_delim
++prefix!$prefix$ac_delim
++program_transform_name!$program_transform_name$ac_delim
++bindir!$bindir$ac_delim
++sbindir!$sbindir$ac_delim
++libexecdir!$libexecdir$ac_delim
++datarootdir!$datarootdir$ac_delim
++datadir!$datadir$ac_delim
++sysconfdir!$sysconfdir$ac_delim
++sharedstatedir!$sharedstatedir$ac_delim
++localstatedir!$localstatedir$ac_delim
++includedir!$includedir$ac_delim
++oldincludedir!$oldincludedir$ac_delim
++docdir!$docdir$ac_delim
++infodir!$infodir$ac_delim
++htmldir!$htmldir$ac_delim
++dvidir!$dvidir$ac_delim
++pdfdir!$pdfdir$ac_delim
++psdir!$psdir$ac_delim
++libdir!$libdir$ac_delim
++localedir!$localedir$ac_delim
++mandir!$mandir$ac_delim
++DEFS!$DEFS$ac_delim
++ECHO_C!$ECHO_C$ac_delim
++ECHO_N!$ECHO_N$ac_delim
++ECHO_T!$ECHO_T$ac_delim
++LIBS!$LIBS$ac_delim
++build_alias!$build_alias$ac_delim
++host_alias!$host_alias$ac_delim
++target_alias!$target_alias$ac_delim
++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
++INSTALL_DATA!$INSTALL_DATA$ac_delim
++am__isrc!$am__isrc$ac_delim
++CYGPATH_W!$CYGPATH_W$ac_delim
++PACKAGE!$PACKAGE$ac_delim
++VERSION!$VERSION$ac_delim
++ACLOCAL!$ACLOCAL$ac_delim
++AUTOCONF!$AUTOCONF$ac_delim
++AUTOMAKE!$AUTOMAKE$ac_delim
++AUTOHEADER!$AUTOHEADER$ac_delim
++MAKEINFO!$MAKEINFO$ac_delim
++install_sh!$install_sh$ac_delim
++STRIP!$STRIP$ac_delim
++INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
++mkdir_p!$mkdir_p$ac_delim
++AWK!$AWK$ac_delim
++SET_MAKE!$SET_MAKE$ac_delim
++am__leading_dot!$am__leading_dot$ac_delim
++AMTAR!$AMTAR$ac_delim
++am__tar!$am__tar$ac_delim
++am__untar!$am__untar$ac_delim
++CC!$CC$ac_delim
++CFLAGS!$CFLAGS$ac_delim
++LDFLAGS!$LDFLAGS$ac_delim
++CPPFLAGS!$CPPFLAGS$ac_delim
++ac_ct_CC!$ac_ct_CC$ac_delim
++EXEEXT!$EXEEXT$ac_delim
++OBJEXT!$OBJEXT$ac_delim
++DEPDIR!$DEPDIR$ac_delim
++am__include!$am__include$ac_delim
++am__quote!$am__quote$ac_delim
++AMDEP_TRUE!$AMDEP_TRUE$ac_delim
++AMDEP_FALSE!$AMDEP_FALSE$ac_delim
++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
++CCDEPMODE!$CCDEPMODE$ac_delim
++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
++USE_NLS!$USE_NLS$ac_delim
++INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
++INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
++INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
++INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
++INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
++INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
++INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim
++INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim
++INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim
++INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim
++INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim
++INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
++INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
++INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
++INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
++INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
++INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
++INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
++INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
++INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
++INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
++_ACEOF
++
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
++ break
++ elif $ac_last_try; then
++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ { (exit 1); exit 1; }; }
++ else
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++ fi
++done
++
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
+ fi
+
+-echo 'BEGIN {' >"$tmp/subs1.awk" &&
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
+ _ACEOF
+
+
+-{
+- echo "cat >conf$$subs.awk <<_ACEOF" &&
+- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+- echo "_ACEOF"
+-} >conf$$subs.sh ||
+- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+- { (exit 1); exit 1; }; }
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+- . ./conf$$subs.sh ||
+- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ cat >conf$$subs.sed <<_ACEOF
++INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
++XGETTEXT!$XGETTEXT$ac_delim
++MSGMERGE!$MSGMERGE$ac_delim
++MSGFMT!$MSGFMT$ac_delim
++GMSGFMT!$GMSGFMT$ac_delim
++INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
++ALL_LINGUAS!$ALL_LINGUAS$ac_delim
++DATADIRNAME!$DATADIRNAME$ac_delim
++GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim
++GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim
++GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim
++GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim
++GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY!$GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY$ac_delim
++GNUCASH_MAJOR_VERSION!$GNUCASH_MAJOR_VERSION$ac_delim
++GNUCASH_MINOR_VERSION!$GNUCASH_MINOR_VERSION$ac_delim
++GNUCASH_MICRO_VERSION!$GNUCASH_MICRO_VERSION$ac_delim
++GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
++CPP!$CPP$ac_delim
++GREP!$GREP$ac_delim
++EGREP!$EGREP$ac_delim
++MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
++CATALOGS!$CATALOGS$ac_delim
++CATOBJEXT!$CATOBJEXT$ac_delim
++GMOFILES!$GMOFILES$ac_delim
++INSTOBJEXT!$INSTOBJEXT$ac_delim
++INTLLIBS!$INTLLIBS$ac_delim
++PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
++PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
++POFILES!$POFILES$ac_delim
++POSUB!$POSUB$ac_delim
++MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
++build!$build$ac_delim
++build_cpu!$build_cpu$ac_delim
++build_vendor!$build_vendor$ac_delim
++build_os!$build_os$ac_delim
++host!$host$ac_delim
++host_cpu!$host_cpu$ac_delim
++host_vendor!$host_vendor$ac_delim
++host_os!$host_os$ac_delim
++SED!$SED$ac_delim
++LN_S!$LN_S$ac_delim
++ECHO!$ECHO$ac_delim
++AR!$AR$ac_delim
++RANLIB!$RANLIB$ac_delim
++DSYMUTIL!$DSYMUTIL$ac_delim
++NMEDIT!$NMEDIT$ac_delim
++DLLTOOL!$DLLTOOL$ac_delim
++AS!$AS$ac_delim
++OBJDUMP!$OBJDUMP$ac_delim
++CXX!$CXX$ac_delim
++CXXFLAGS!$CXXFLAGS$ac_delim
++ac_ct_CXX!$ac_ct_CXX$ac_delim
++CXXDEPMODE!$CXXDEPMODE$ac_delim
++am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
++am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
++CXXCPP!$CXXCPP$ac_delim
++F77!$F77$ac_delim
++FFLAGS!$FFLAGS$ac_delim
++ac_ct_F77!$ac_ct_F77$ac_delim
++LIBTOOL!$LIBTOOL$ac_delim
++LIBTOOL_DEPS!$LIBTOOL_DEPS$ac_delim
++OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim
++OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim
++PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim
++PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim
++REGEX_LIBS!$REGEX_LIBS$ac_delim
++HTMLHELP_LIBS!$HTMLHELP_LIBS$ac_delim
++SWIG!$SWIG$ac_delim
++BUILDING_FROM_SVN_TRUE!$BUILDING_FROM_SVN_TRUE$ac_delim
++BUILDING_FROM_SVN_FALSE!$BUILDING_FROM_SVN_FALSE$ac_delim
++GNUCASH_SEPARATE_BUILDDIR_TRUE!$GNUCASH_SEPARATE_BUILDDIR_TRUE$ac_delim
++GNUCASH_SEPARATE_BUILDDIR_FALSE!$GNUCASH_SEPARATE_BUILDDIR_FALSE$ac_delim
++HAVE_X11_XLIB_H_TRUE!$HAVE_X11_XLIB_H_TRUE$ac_delim
++HAVE_X11_XLIB_H_FALSE!$HAVE_X11_XLIB_H_FALSE$ac_delim
++BINRELOC_CFLAGS!$BINRELOC_CFLAGS$ac_delim
++BINRELOC_LIBS!$BINRELOC_LIBS$ac_delim
++PKG_CONFIG!$PKG_CONFIG$ac_delim
++GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
++GLIB_LIBS!$GLIB_LIBS$ac_delim
++GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim
++GOBJECT_QUERY!$GOBJECT_QUERY$ac_delim
++GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim
++GLIB26_LIBS!$GLIB26_LIBS$ac_delim
++HAVE_GLIB_2_8_TRUE!$HAVE_GLIB_2_8_TRUE$ac_delim
++HAVE_GLIB_2_8_FALSE!$HAVE_GLIB_2_8_FALSE$ac_delim
++DL_LIB!$DL_LIB$ac_delim
++GDK_TARGET_QUARTZ_TRUE!$GDK_TARGET_QUARTZ_TRUE$ac_delim
++GDK_TARGET_QUARTZ_FALSE!$GDK_TARGET_QUARTZ_FALSE$ac_delim
++IGE_MAC_CFLAGS!$IGE_MAC_CFLAGS$ac_delim
++IGE_MAC_LIBS!$IGE_MAC_LIBS$ac_delim
++QTTHREADS_LIB!$QTTHREADS_LIB$ac_delim
++TERMCAP_LIB!$TERMCAP_LIB$ac_delim
++READLINE_LIB!$READLINE_LIB$ac_delim
++BUILD_GUILE!$BUILD_GUILE$ac_delim
++GUILE_LIBS!$GUILE_LIBS$ac_delim
++GUILE_INCS!$GUILE_INCS$ac_delim
++GUILE_TRUE!$GUILE_TRUE$ac_delim
++_ACEOF
++
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
++ break
++ elif $ac_last_try; then
++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
++ else
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++ fi
++done
++
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
++
+
+- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+- if test $ac_delim_n = $ac_delim_num; then
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ cat >conf$$subs.sed <<_ACEOF
++GUILE_FALSE!$GUILE_FALSE$ac_delim
++GUILE!$GUILE$ac_delim
++GNC_ADD_ON_SRFIS!$GNC_ADD_ON_SRFIS$ac_delim
++GNC_SRFI_LOAD_PATH!$GNC_SRFI_LOAD_PATH$ac_delim
++GNC_TEST_SRFI_LOAD_CMD!$GNC_TEST_SRFI_LOAD_CMD$ac_delim
++GUILE_CONFIG!$GUILE_CONFIG$ac_delim
++GUILE_TOOLS!$GUILE_TOOLS$ac_delim
++GNC_HAVE_GUILE_WWW_TRUE!$GNC_HAVE_GUILE_WWW_TRUE$ac_delim
++GNC_HAVE_GUILE_WWW_FALSE!$GNC_HAVE_GUILE_WWW_FALSE$ac_delim
++GCONF_CFLAGS!$GCONF_CFLAGS$ac_delim
++GCONF_LIBS!$GCONF_LIBS$ac_delim
++GCONFTOOL!$GCONFTOOL$ac_delim
++LIBXML2_CFLAGS!$LIBXML2_CFLAGS$ac_delim
++LIBXML2_LIBS!$LIBXML2_LIBS$ac_delim
++LIBXML_VERSION!$LIBXML_VERSION$ac_delim
++ZLIB_LIBS!$ZLIB_LIBS$ac_delim
++LIBQOF_LIBRARY_VERSION!$LIBQOF_LIBRARY_VERSION$ac_delim
++LIBQOF_BACKEND_QSF_LIBRARY_VERSION!$LIBQOF_BACKEND_QSF_LIBRARY_VERSION$ac_delim
++USE_LIBQOF_TRUE!$USE_LIBQOF_TRUE$ac_delim
++USE_LIBQOF_FALSE!$USE_LIBQOF_FALSE$ac_delim
++USE_LIBQOF!$USE_LIBQOF$ac_delim
++QOF_CFLAGS!$QOF_CFLAGS$ac_delim
++QOF_LIBS!$QOF_LIBS$ac_delim
++QOF_PREFIX!$QOF_PREFIX$ac_delim
++QOF_LIB_DIR!$QOF_LIB_DIR$ac_delim
++QOF_XML_DIR!$QOF_XML_DIR$ac_delim
++GNC_ACCOUNTS_DIR!$GNC_ACCOUNTS_DIR$ac_delim
++GNC_CHECKS_DIR!$GNC_CHECKS_DIR$ac_delim
++GNC_CONFIGDIR!$GNC_CONFIGDIR$ac_delim
++GNC_DOC_INSTALL_DIR!$GNC_DOC_INSTALL_DIR$ac_delim
++GNC_GLADE_DIR!$GNC_GLADE_DIR$ac_delim
++GNC_UI_DIR!$GNC_UI_DIR$ac_delim
++GNC_INCLUDE_DIR!$GNC_INCLUDE_DIR$ac_delim
++GNC_PIXMAP_DIR!$GNC_PIXMAP_DIR$ac_delim
++GNC_SCM_INSTALL_DIR!$GNC_SCM_INSTALL_DIR$ac_delim
++GNC_SHAREDIR!$GNC_SHAREDIR$ac_delim
++GNC_LIBEXECDIR!$GNC_LIBEXECDIR$ac_delim
++PGSQL_CFLAGS!$PGSQL_CFLAGS$ac_delim
++PGSQL_LIBS!$PGSQL_LIBS$ac_delim
++SQL_DIR!$SQL_DIR$ac_delim
++LIBOFX_CFLAGS!$LIBOFX_CFLAGS$ac_delim
++LIBOFX_LIBS!$LIBOFX_LIBS$ac_delim
++OFX_DIR!$OFX_DIR$ac_delim
++AQBANKING_CFLAGS!$AQBANKING_CFLAGS$ac_delim
++AQBANKING_LIBS!$AQBANKING_LIBS$ac_delim
++AQBANKING_DIR!$AQBANKING_DIR$ac_delim
++GNC_HELPDIR!$GNC_HELPDIR$ac_delim
++GNC_ETAGS_FILE!$GNC_ETAGS_FILE$ac_delim
++GNC_ETAGS_FILE_TRUE!$GNC_ETAGS_FILE_TRUE$ac_delim
++GNC_ETAGS_FILE_FALSE!$GNC_ETAGS_FILE_FALSE$ac_delim
++GNC_CTAGS_FILE!$GNC_CTAGS_FILE$ac_delim
++GNC_CTAGS_FILE_TRUE!$GNC_CTAGS_FILE_TRUE$ac_delim
++GNC_CTAGS_FILE_FALSE!$GNC_CTAGS_FILE_FALSE$ac_delim
++PERL!$PERL$ac_delim
++PERLINCL!$PERLINCL$ac_delim
++DOXYGEN!$DOXYGEN$ac_delim
++DOT!$DOT$ac_delim
++DOC_TRUE!$DOC_TRUE$ac_delim
++DOC_FALSE!$DOC_FALSE$ac_delim
++ENABLE_DOXYGEN_TRUE!$ENABLE_DOXYGEN_TRUE$ac_delim
++ENABLE_DOXYGEN_FALSE!$ENABLE_DOXYGEN_FALSE$ac_delim
++enable_dot!$enable_dot$ac_delim
++enable_html_docs!$enable_html_docs$ac_delim
++enable_latex_docs!$enable_latex_docs$ac_delim
++GNUCASH_ENABLE_GUI_TRUE!$GNUCASH_ENABLE_GUI_TRUE$ac_delim
++GNUCASH_ENABLE_GUI_FALSE!$GNUCASH_ENABLE_GUI_FALSE$ac_delim
++WARN_CFLAGS!$WARN_CFLAGS$ac_delim
++GTK_CFLAGS!$GTK_CFLAGS$ac_delim
++GTK_LIBS!$GTK_LIBS$ac_delim
++HAVE_GTK_2_10_TRUE!$HAVE_GTK_2_10_TRUE$ac_delim
++HAVE_GTK_2_10_FALSE!$HAVE_GTK_2_10_FALSE$ac_delim
++GNOME_CFLAGS!$GNOME_CFLAGS$ac_delim
++GNOME_LIBS!$GNOME_LIBS$ac_delim
++GDK_PIXBUF_CFLAGS!$GDK_PIXBUF_CFLAGS$ac_delim
++GDK_PIXBUF_LIBS!$GDK_PIXBUF_LIBS$ac_delim
++GLADE_CFLAGS!$GLADE_CFLAGS$ac_delim
++GLADE_LIBS!$GLADE_LIBS$ac_delim
++GOFFICE_CFLAGS!$GOFFICE_CFLAGS$ac_delim
++GOFFICE_LIBS!$GOFFICE_LIBS$ac_delim
++GTKHTML_CFLAGS!$GTKHTML_CFLAGS$ac_delim
++GTKHTML_LIBS!$GTKHTML_LIBS$ac_delim
++GTKHTML_USES_GTKPRINT_TRUE!$GTKHTML_USES_GTKPRINT_TRUE$ac_delim
++GTKHTML_USES_GTKPRINT_FALSE!$GTKHTML_USES_GTKPRINT_FALSE$ac_delim
++GNOME_PRINT_CFLAGS!$GNOME_PRINT_CFLAGS$ac_delim
++GNOME_PRINT_LIBS!$GNOME_PRINT_LIBS$ac_delim
++EFENCE_LIBS!$EFENCE_LIBS$ac_delim
++LIBOBJS!$LIBOBJS$ac_delim
++LC_MESSAGES_ENUM!$LC_MESSAGES_ENUM$ac_delim
++LIBOBJS_SEDSCRIPT!$LIBOBJS_SEDSCRIPT$ac_delim
++LTLIBOBJS!$LTLIBOBJS$ac_delim
++_ACEOF
++
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
+ break
+ elif $ac_last_try; then
+- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+ done
+-rm -f conf$$subs.sh
+-
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+-_ACEOF
+-sed -n '
+-h
+-s/^/S["/; s/!.*/"]=/
+-p
+-g
+-s/^[^!]*!//
+-:repl
+-t repl
+-s/'"$ac_delim"'$//
+-t delim
+-:nl
+-h
+-s/\(.\{148\}\).*/\1/
+-t more1
+-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+-p
+-n
+-b repl
+-:more1
+-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+-p
+-g
+-s/.\{148\}//
+-t nl
+-:delim
+-h
+-s/\(.\{148\}\).*/\1/
+-t more2
+-s/["\\]/\\&/g; s/^/"/; s/$/"/
+-p
+-b
+-:more2
+-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+-p
+-g
+-s/.\{148\}//
+-t delim
+-' <conf$$subs.awk | sed '
+-/^[^""]/{
+- N
+- s/\n//
+-}
+-' >>$CONFIG_STATUS || ac_write_fail=1
+-rm -f conf$$subs.awk
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-_ACAWK
+-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+- for (key in S) S_is_set[key] = 1
+- FS = ""
+
+-}
+-{
+- line = $ 0
+- nfields = split(line, field, "@")
+- substed = 0
+- len = length(field[1])
+- for (i = 2; i < nfields; i++) {
+- key = field[i]
+- keylen = length(key)
+- if (S_is_set[key]) {
+- value = S[key]
+- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+- len += length(value) + length(field[++i])
+- substed = 1
+- } else
+- len += 1 + keylen
+- }
+-
+- print line
+-}
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
++fi
+
+-_ACAWK
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+-else
+- cat
+-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+- { (exit 1); exit 1; }; }
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++:end
++s/|#_!!_#|//g
++CEOF$ac_eof
+ _ACEOF
+
++
+ # VPATH may cause trouble with some makes, so we remove $(srcdir),
+ # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+@@ -34505,133 +35312,19 @@ s/^[^=]*=[ ]*$//
+ }'
+ fi
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ fi # test -n "$CONFIG_FILES"
+
+-# Set up the scripts for CONFIG_HEADERS section.
+-# No need to generate them if there are no CONFIG_HEADERS.
+-# This happens for instance with `./config.status Makefile'.
+-if test -n "$CONFIG_HEADERS"; then
+-cat >"$tmp/defines.awk" <<\_ACAWK ||
+-BEGIN {
+-_ACEOF
+-
+-# Transform confdefs.h into an awk script `defines.awk', embedded as
+-# here-document in config.status, that substitutes the proper values into
+-# config.h.in to produce config.h.
+-
+-# Create a delimiter string that does not exist in confdefs.h, to ease
+-# handling of long lines.
+-ac_delim='%!_!# '
+-for ac_last_try in false false :; do
+- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+- if test -z "$ac_t"; then
+- break
+- elif $ac_last_try; then
+- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+- { (exit 1); exit 1; }; }
+- else
+- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+- fi
+-done
+-
+-# For the awk script, D is an array of macro values keyed by name,
+-# likewise P contains macro parameters if any. Preserve backslash
+-# newline sequences.
+-
+-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+-sed -n '
+-s/.\{148\}/&'"$ac_delim"'/g
+-t rset
+-:rset
+-s/^[ ]*#[ ]*define[ ][ ]*/ /
+-t def
+-d
+-:def
+-s/\\$//
+-t bsnl
+-s/["\\]/\\&/g
+-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+-D["\1"]=" \3"/p
+-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
+-d
+-:bsnl
+-s/["\\]/\\&/g
+-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+-D["\1"]=" \3\\\\\\n"\\/p
+-t cont
+-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+-t cont
+-d
+-:cont
+-n
+-s/.\{148\}/&'"$ac_delim"'/g
+-t clear
+-:clear
+-s/\\$//
+-t bsnlc
+-s/["\\]/\\&/g; s/^/"/; s/$/"/p
+-d
+-:bsnlc
+-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+-b cont
+-' <confdefs.h | sed '
+-s/'"$ac_delim"'/"\\\
+-"/g' >>$CONFIG_STATUS || ac_write_fail=1
+-
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+- for (key in D) D_is_set[key] = 1
+- FS = ""
+-}
+-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+- line = \$ 0
+- split(line, arg, " ")
+- if (arg[1] == "#") {
+- defundef = arg[2]
+- mac1 = arg[3]
+- } else {
+- defundef = substr(arg[1], 2)
+- mac1 = arg[2]
+- }
+- split(mac1, mac2, "(") #)
+- macro = mac2[1]
+- prefix = substr(line, 1, index(line, defundef) - 1)
+- if (D_is_set[macro]) {
+- # Preserve the white space surrounding the "#".
+- print prefix "define", macro P[macro] D[macro]
+- next
+- } else {
+- # Replace #undef with comments. This is necessary, for example,
+- # in the case of _POSIX_SOURCE, which is predefined and required
+- # on some systems where configure will not decide to define it.
+- if (defundef == "undef") {
+- print "/*", prefix defundef, macro, "*/"
+- next
+- }
+- }
+-}
+-{ print }
+-_ACAWK
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+- { (exit 1); exit 1; }; }
+-fi # test -n "$CONFIG_HEADERS"
+-
+
+-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
+-shift
+-for ac_tag
++for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
+ do
+ case $ac_tag in
+ :[FHLC]) ac_mode=$ac_tag; continue;;
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
++ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
++echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+ { (exit 1); exit 1; }; };;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+@@ -34660,38 +35353,26 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
++echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+- ac_file_inputs="$ac_file_inputs '$ac_f'"
++ ac_file_inputs="$ac_file_inputs $ac_f"
+ done
+
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+- configure_input='Generated from '`
+- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+- `' by configure.'
++ configure_input="Generated from "`IFS=:
++ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+ if test x"$ac_file" != x-; then
+ configure_input="$ac_file. $configure_input"
+- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+-$as_echo "$as_me: creating $ac_file" >&6;}
++ { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
+ fi
+- # Neutralize special characters interpreted by sed in replacement strings.
+- case $configure_input in #(
+- *\&* | *\|* | *\\* )
+- ac_sed_conf_input=`$as_echo "$configure_input" |
+- sed 's/[\\\\&|]/\\\\&/g'`;; #(
+- *) ac_sed_conf_input=$configure_input;;
+- esac
+
+ case $ac_tag in
+- *:-:* | *:-) cat >"$tmp/stdin" \
+- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+- { (exit 1); exit 1; }; } ;;
++ *:-:* | *:-) cat >"$tmp/stdin";;
+ esac
+ ;;
+ esac
+@@ -34701,7 +35382,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$ac_file" |
++echo X"$ac_file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -34727,7 +35408,7 @@ $as_echo X"$ac_file" |
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+@@ -34736,7 +35417,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_dir" |
++echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -34757,17 +35438,17 @@ $as_echo X"$as_dir" |
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
+ ac_builddir=.
+
+ case "$ac_dir" in
+ .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *)
+- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ # A ".." for each directory in $ac_dir_suffix.
+- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+@@ -34812,13 +35493,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+ esac
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ # If the template does not know about datarootdir, expand it.
+ # FIXME: This hack should be removed a few years after 2.60.
+ ac_datarootdir_hack=; ac_datarootdir_seen=
+
+-ac_sed_dataroot='
+-/datarootdir/ {
++case `sed -n '/datarootdir/ {
+ p
+ q
+ }
+@@ -34827,14 +35507,13 @@ ac_sed_dataroot='
+ /@infodir@/p
+ /@localedir@/p
+ /@mandir@/p
+-'
+-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
++' $ac_file_inputs` in
+ *datarootdir*) ac_datarootdir_seen=yes;;
+ *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
++echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
+ s&@docdir@&$docdir&g
+@@ -34848,16 +35527,15 @@ _ACEOF
+ # Neutralize VPATH when `$srcdir' = `.'.
+ # Shell code in configure.ac might set extrasub.
+ # FIXME: do we really want to maintain this feature?
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-ac_sed_extra="$ac_vpsub
++cat >>$CONFIG_STATUS <<_ACEOF
++ sed "$ac_vpsub
+ $extrasub
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s|@configure_input@|$ac_sed_conf_input|;t t
++s&@configure_input@&$configure_input&;t t
+ s&@top_builddir@&$ac_top_builddir_sub&;t t
+-s&@top_build_prefix@&$ac_top_build_prefix&;t t
+ s&@srcdir@&$ac_srcdir&;t t
+ s&@abs_srcdir@&$ac_abs_srcdir&;t t
+ s&@top_srcdir@&$ac_top_srcdir&;t t
+@@ -34868,60 +35546,121 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+ s&@INSTALL@&$ac_INSTALL&;t t
+ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+-"
+-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+- { (exit 1); exit 1; }; }
++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
+
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined. Please make sure it is defined." >&5
+-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined. Please make sure it is defined." >&2;}
+
+ rm -f "$tmp/stdin"
+ case $ac_file in
+- -) cat "$tmp/out" && rm -f "$tmp/out";;
+- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+- esac \
+- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+- { (exit 1); exit 1; }; }
++ -) cat "$tmp/out"; rm -f "$tmp/out";;
++ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
++ esac
+ ;;
+ :H)
+ #
+ # CONFIG_HEADER
+ #
++_ACEOF
++
++# Transform confdefs.h into a sed script `conftest.defines', that
++# substitutes the proper values into config.h.in to produce config.h.
++rm -f conftest.defines conftest.tail
++# First, append a space to every undef/define line, to ease matching.
++echo 's/$/ /' >conftest.defines
++# Then, protect against being on the right side of a sed subst, or in
++# an unquoted here document, in config.status. If some macros were
++# called several times there might be several #defines for the same
++# symbol, which is useless. But do not sort them, since the last
++# AC_DEFINE must be honored.
++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
++# NAME is the cpp macro being defined, VALUE is the value it is being given.
++# PARAMS is the parameter list in the macro definition--in most cases, it's
++# just an empty string.
++ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
++ac_dB='\\)[ (].*,\\1define\\2'
++ac_dC=' '
++ac_dD=' ,'
++
++uniq confdefs.h |
++ sed -n '
++ t rset
++ :rset
++ s/^[ ]*#[ ]*define[ ][ ]*//
++ t ok
++ d
++ :ok
++ s/[\\&,]/\\&/g
++ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
++ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
++ ' >>conftest.defines
++
++# Remove the space that was appended to ease matching.
++# Then replace #undef with comments. This is necessary, for
++# example, in the case of _POSIX_SOURCE, which is predefined and required
++# on some systems where configure will not decide to define it.
++# (The regexp can be short, since the line contains either #define or #undef.)
++echo 's/ $//
++s,^[ #]*u.*,/* & */,' >>conftest.defines
++
++# Break up conftest.defines:
++ac_max_sed_lines=50
++
++# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
++# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
++# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
++# et cetera.
++ac_in='$ac_file_inputs'
++ac_out='"$tmp/out1"'
++ac_nxt='"$tmp/out2"'
++
++while :
++do
++ # Write a here document:
++ cat >>$CONFIG_STATUS <<_ACEOF
++ # First, check the format of the line:
++ cat >"\$tmp/defines.sed" <<\\CEOF
++/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
++/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
++b
++:def
++_ACEOF
++ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
++ echo 'CEOF
++ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
++ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
++ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
++ grep . conftest.tail >/dev/null || break
++ rm -f conftest.defines
++ mv conftest.tail conftest.defines
++done
++rm -f conftest.defines conftest.tail
++
++echo "ac_result=$ac_in" >>$CONFIG_STATUS
++cat >>$CONFIG_STATUS <<\_ACEOF
+ if test x"$ac_file" != x-; then
+- {
+- $as_echo "/* $configure_input */" \
+- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+- } >"$tmp/config.h" \
+- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+- { (exit 1); exit 1; }; }
+- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+-$as_echo "$as_me: $ac_file is unchanged" >&6;}
++ echo "/* $configure_input */" >"$tmp/config.h"
++ cat "$ac_result" >>"$tmp/config.h"
++ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
++ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
++echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+- rm -f "$ac_file"
+- mv "$tmp/config.h" "$ac_file" \
+- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+- { (exit 1); exit 1; }; }
++ rm -f $ac_file
++ mv "$tmp/config.h" $ac_file
+ fi
+ else
+- $as_echo "/* $configure_input */" \
+- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+-$as_echo "$as_me: error: could not create -" >&2;}
+- { (exit 1); exit 1; }; }
++ echo "/* $configure_input */"
++ cat "$ac_result"
+ fi
+-# Compute "$ac_file"'s index in $config_headers.
+-_am_arg="$ac_file"
++ rm -f "$tmp/out12"
++# Compute $ac_file's index in $config_headers.
++_am_arg=$ac_file
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+ case $_am_header in
+@@ -34936,7 +35675,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$_am_arg" |
++echo X"$_am_arg" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -34956,23 +35695,14 @@ $as_echo X"$_am_arg" |
+ s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+-$as_echo "$as_me: executing $ac_file commands" >&6;}
++ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
++echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+ esac
+
+
+ case $ac_file$ac_mode in
+- "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
+-# are listed without --file. Let's play safe and only enable the eval
+-# if we detect the quoting.
+-case $CONFIG_FILES in
+-*\'*) eval set x "$CONFIG_FILES" ;;
+-*) set x $CONFIG_FILES ;;
+-esac
+-shift
+-for mf
+-do
++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+@@ -34988,7 +35718,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$mf" : 'X\(//\)[^/]' \| \
+ X"$mf" : 'X\(//\)$' \| \
+ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$mf" |
++echo X"$mf" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -35032,7 +35762,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$file" : 'X\(//\)[^/]' \| \
+ X"$file" : 'X\(//\)$' \| \
+ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$file" |
++echo X"$file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -35058,7 +35788,7 @@ $as_echo X"$file" |
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+@@ -35067,7 +35797,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_dir" |
++echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -35088,35 +35818,23 @@ $as_echo X"$as_dir" |
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
+ done
+ ;;
+- "intltool":C)
+-
+-for file in intltool-extract intltool-merge intltool-update; do
+- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
+- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+- < ${ac_aux_dir}/${file}.in > ${file}.out
+- if cmp -s ${file} ${file}.out 2>/dev/null; then
+- rm -f ${file}.out
+- else
+- mv -f ${file}.out ${file}
+- fi
+- chmod ugo+x ${file}
+- chmod u+w ${file}
+-done
+-
+- ;;
+ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ esac ;;
+ "po/stamp-it":C)
++ if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
++ { { echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
++echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
++ { (exit 1); exit 1; }; }
++ fi
+ rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
+ >"po/stamp-it.tmp"
+ sed '/^#/d
+@@ -35125,17 +35843,11 @@ done
+ '"s|^| $ac_top_srcdir/|" \
+ "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
+
+- if test ! -f "po/Makefile"; then
+- { { $as_echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
+-$as_echo "$as_me: error: po/Makefile is not ready." >&2;}
+- { (exit 1); exit 1; }; }
+- fi
+- mv "po/Makefile" "po/Makefile.tmp"
+ sed '/^POTFILES =/,/[^\\]$/ {
+ /^POTFILES =/!d
+ r po/POTFILES
+ }
+- ' "po/Makefile.tmp" >"po/Makefile"
++ ' "po/Makefile.in" >"po/Makefile"
+ rm -f "po/Makefile.tmp"
+ mv "po/stamp-it.tmp" "po/stamp-it"
+ ;;
+@@ -35149,11 +35861,6 @@ _ACEOF
+ chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+
+-test $ac_write_fail = 0 ||
+- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+- { (exit 1); exit 1; }; }
+-
+
+ # configure is writing to config.log, and then calls config.status.
+ # config.status does its own redirection, appending to config.log.
+@@ -35175,10 +35882,6 @@ if test "$no_create" != yes; then
+ # would make configure fail if this is the last instruction.
+ $ac_cs_success || { (exit 1); exit 1; }
+ fi
+-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+-fi
+
+
+ pkgdatadir=${prefix}/${PACKAGE}
+@@ -35196,7 +35899,7 @@ if test x${AQBANKING_DIR} != x; then
+ components="$components $AQBANKING_DIR"
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result:
++{ echo "$as_me:$LINENO: result:
+ Options detected/selected
+ -------------------------
+ gnucash version ...... : $VERSION
+@@ -35214,7 +35917,7 @@ fi
+
+
+ " >&5
+-$as_echo "
++echo "${ECHO_T}
+ Options detected/selected
+ -------------------------
+ gnucash version ...... : $VERSION
+diff --git a/configure.in b/configure.in
+index e3d47d3..0e9ac1e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -350,6 +350,16 @@ update to latest darwin])
+ ;;
+ esac
+
++### --------------------------------------------------------------------------
++### Check to see if GDK uses the quartz backend and if we can use
++### MacOSX integration
++_gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
++AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
++if test "x$_gdk_tgt" = xquartz; then
++ PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration)
++ AC_SUBST(IGE_MAC_LIBS)
++ AC_SUBST(IGE_MAC_CFLAGS)
++fi
+
+ ### --------------------------------------------------------------------------
+ ### Guile version checks (should this be something other than the Gnome check?)
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index 364320a..207c527 100644
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -176,6 +175,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -183,29 +184,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -267,6 +249,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -288,7 +271,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = ${GNC_DOC_INSTALL_DIR}
+@@ -322,7 +304,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = examples
+@@ -373,8 +354,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -415,8 +396,8 @@ install-man1: $(man1_MANS) $(man_MANS)
+ esac; \
+ done; \
+ for i in $$list; do \
+- if test -f $$i; then file=$$i; \
+- else file=$(srcdir)/$$i; fi; \
++ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
++ else file=$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 1*) ;; \
+@@ -559,7 +540,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/doc/examples/Makefile.in b/doc/examples/Makefile.in
+index 78e10b3..d4af00a 100644
+--- a/doc/examples/Makefile.in
++++ b/doc/examples/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = ${GNC_DOC_INSTALL_DIR}/examples
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ doc_DATA = \
+@@ -345,8 +326,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/intl-scm/Makefile.in b/intl-scm/Makefile.in
+index bb7f99d..1fb7987 100644
+--- a/intl-scm/Makefile.in
++++ b/intl-scm/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -154,6 +153,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -161,29 +162,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -245,6 +227,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -266,7 +249,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -300,7 +282,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = \
+@@ -321,8 +302,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -358,7 +339,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/lib/Makefile.in b/lib/Makefile.in
+index 4f1de4d..d776e2f 100644
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = libc glib28 guile-www srfi $(am__append_1)
+@@ -320,8 +301,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -427,7 +408,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/lib/glib28/Makefile.in b/lib/glib28/Makefile.in
+index 3201a32..189440b 100644
+--- a/lib/glib28/Makefile.in
++++ b/lib/glib28/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -177,6 +176,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -184,29 +185,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -268,6 +250,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -289,7 +272,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -323,7 +305,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ noinst_LTLIBRARIES = libgnc-glib.la
+@@ -344,8 +325,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -422,7 +403,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/lib/guile-www/Makefile.in b/lib/guile-www/Makefile.in
+index f67d603..a3df786 100644
+--- a/lib/guile-www/Makefile.in
++++ b/lib/guile-www/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -160,6 +159,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -167,29 +168,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -251,6 +233,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -272,7 +255,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -306,7 +288,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+
+@@ -325,8 +306,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/lib/libc/Makefile.in b/lib/libc/Makefile.in
+index faafb26..e09b8f2 100644
+--- a/lib/libc/Makefile.in
++++ b/lib/libc/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -172,6 +171,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -179,29 +180,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+
+@@ -268,6 +250,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -289,7 +272,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -323,7 +305,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ noinst_LTLIBRARIES = libc-missing.la
+@@ -350,8 +331,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -430,7 +411,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/lib/libqof/Makefile.in b/lib/libqof/Makefile.in
+index dbb623d..0411db3 100644
+--- a/lib/libqof/Makefile.in
++++ b/lib/libqof/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . qof backend
+@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/lib/libqof/backend/Makefile.in b/lib/libqof/backend/Makefile.in
+index 80ad716..200c84b 100644
+--- a/lib/libqof/backend/Makefile.in
++++ b/lib/libqof/backend/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = file
+@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/lib/libqof/backend/file/Makefile.in b/lib/libqof/backend/file/Makefile.in
+index 0b7b9d3..5a323d5 100644
+--- a/lib/libqof/backend/file/Makefile.in
++++ b/lib/libqof/backend/file/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -197,6 +196,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -204,29 +205,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -288,6 +270,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -309,7 +292,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -343,7 +325,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = .
+@@ -393,8 +374,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -577,7 +558,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/lib/libqof/qof/Makefile.in b/lib/libqof/qof/Makefile.in
+index 97fb98e..23cc376 100644
+--- a/lib/libqof/qof/Makefile.in
++++ b/lib/libqof/qof/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -43,10 +43,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -211,6 +210,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -218,29 +219,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -302,6 +284,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -323,7 +306,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -357,7 +339,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ lib_LTLIBRARIES = libgnc-qof.la
+@@ -442,8 +423,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -618,7 +599,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/lib/srfi/Makefile.in b/lib/srfi/Makefile.in
+index bf567a5..e2b6cc9 100644
+--- a/lib/srfi/Makefile.in
++++ b/lib/srfi/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ gncscmdir = ${GNC_SHAREDIR}/guile-modules/srfi
+@@ -326,8 +307,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/ltmain.sh b/ltmain.sh
+index e589475..27d498a 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -44,7 +44,7 @@ EXIT_FAILURE=1
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+ VERSION=1.5.26
+-TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
++TIMESTAMP=" (1.1220.2.492 2008/01/30 06:40:56)"
+
+ # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+@@ -281,21 +281,7 @@ func_infer_tag ()
+ esac
+ CC_quoted="$CC_quoted $arg"
+ done
+- # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
+- trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"`
+- # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
+- extendcc=${host}-${CC}
+- # and sometimes libtool has CC=<OLDHOST>-gcc but user has CC=<NEWHOST>-gcc
+- # (Gentoo-specific hack because we always export $CHOST)
+- mungedcc=${CHOST-${host}}-${trimedcc}
+ case "$@ " in
+- "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\
+- "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
+- tagname=CC
+- break ;;
+- "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
+- "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
+- "$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\
+ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+ # The compiler in the base compile command matches
+ # the one in the tagged configuration.
+@@ -902,7 +888,7 @@ if test -z "$show_help"; then
+ # Lock this critical section if it is needed
+ # We use this script file to make the link, it avoids creating a new file
+ if test "$need_locks" = yes; then
+- until $run ln "$srcfile" "$lockfile" 2>/dev/null; do
++ until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ $show "Waiting for $lockfile to be removed"
+ sleep 2
+ done
+@@ -5482,11 +5468,6 @@ else
+ $echo >> $output "\
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
+ # Run the actual program with our arguments.
+-
+- # Make sure env LD_LIBRARY_PATH does not mess us up
+- if test -n \"\${LD_LIBRARY_PATH+set}\"; then
+- export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH
+- fi
+ "
+ case $host in
+ # Backslashes separate directories on plain windows
+diff --git a/packaging/Makefile.in b/packaging/Makefile.in
+index 1ebbff2..ff0b7be 100644
+--- a/packaging/Makefile.in
++++ b/packaging/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = win32
+@@ -324,8 +305,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -431,7 +412,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/packaging/win32/Makefile.in b/packaging/win32/Makefile.in
+index 062d3ce..aefbe1f 100644
+--- a/packaging/win32/Makefile.in
++++ b/packaging/win32/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -42,10 +42,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -184,6 +183,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -191,29 +192,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -275,6 +257,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -296,7 +279,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -330,7 +312,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = README defaults.sh dist.sh exetype.pl functions.sh \
+@@ -349,8 +330,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -465,7 +446,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/po/Makefile.in.in b/po/Makefile.in.in
+index 6891e8f..c7e8302 100644
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
+@@ -21,7 +21,7 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+
+-SHELL = /bin/sh
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+@@ -54,16 +54,16 @@ GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDA
+
+ ALL_LINGUAS = @ALL_LINGUAS@
+
+-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
++PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
+
+-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
++USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
+
+-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
++USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+-POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
++POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
+-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
+-EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
++DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
++EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
+
+ POTFILES = \
+ # This comment gets stripped out
+@@ -101,7 +101,6 @@ install: install-data
+ install-data: install-data- at USE_NLS@
+ install-data-no: all
+ install-data-yes: all
+- $(mkdir_p) $(DESTDIR)$(itlocaledir)
+ linguas="$(USE_LINGUAS)"; \
+ for lang in $$linguas; do \
+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 7197a25..ff8da98 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -167,6 +166,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -174,29 +175,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -258,6 +240,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -279,7 +262,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -313,7 +295,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ NONGUI_SUBDIRS = \
+@@ -367,8 +348,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -493,7 +474,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/app-utils/Makefile.in b/src/app-utils/Makefile.in
+index 1557bef..6dcc436 100644
+--- a/src/app-utils/Makefile.in
++++ b/src/app-utils/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -44,10 +44,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -231,6 +230,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -238,29 +239,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -322,6 +304,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -343,7 +326,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -377,7 +359,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -472,8 +453,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -711,7 +692,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/app-utils/test/Makefile.in b/src/app-utils/test/Makefile.in
+index 5cf1859..6fb7eeb 100644
+--- a/src/app-utils/test/Makefile.in
++++ b/src/app-utils/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -44,10 +44,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -249,6 +248,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -256,29 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -340,6 +322,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -361,7 +344,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -395,7 +377,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ test_exp_parser_SOURCES = \
+@@ -460,8 +441,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -571,7 +552,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -614,7 +595,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -625,7 +606,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -637,7 +618,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -651,36 +632,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/backend/Makefile.in b/src/backend/Makefile.in
+index 3fc074e..8adee38 100644
+--- a/src/backend/Makefile.in
++++ b/src/backend/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -160,6 +159,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -167,29 +168,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -251,6 +233,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -272,7 +255,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -306,7 +288,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = file ${SQL_DIR}
+@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/backend/file/Makefile.in b/src/backend/file/Makefile.in
+index 716330f..a794bfa 100644
+--- a/src/backend/file/Makefile.in
++++ b/src/backend/file/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -220,6 +219,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -227,29 +228,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -311,6 +293,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -332,7 +315,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -366,7 +348,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -451,8 +432,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -666,7 +647,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/backend/file/test/Makefile.in b/src/backend/file/test/Makefile.in
+index 23653df..c59116a 100644
+--- a/src/backend/file/test/Makefile.in
++++ b/src/backend/file/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -53,10 +53,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -426,6 +425,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -433,29 +434,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -517,6 +499,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -538,7 +521,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -572,7 +554,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = test-files
+@@ -802,8 +783,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -1308,7 +1289,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -1364,7 +1345,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -1375,7 +1356,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -1387,7 +1368,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -1401,36 +1382,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/backend/file/test/test-files/Makefile.in b/src/backend/file/test/test-files/Makefile.in
+index 14e9f78..adf56b1 100644
+--- a/src/backend/file/test/test-files/Makefile.in
++++ b/src/backend/file/test/test-files/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = xml2
+@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/backend/file/test/test-files/xml2/Makefile.in b/src/backend/file/test/test-files/xml2/Makefile.in
+index 1e80475..8bdf82a 100644
+--- a/src/backend/file/test/test-files/xml2/Makefile.in
++++ b/src/backend/file/test/test-files/xml2/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -149,6 +148,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -156,29 +157,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -240,6 +222,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -261,7 +244,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -295,7 +277,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = \
+@@ -321,8 +302,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/backend/postgres/Makefile.in b/src/backend/postgres/Makefile.in
+index f4e6f67..1cd0772 100644
+--- a/src/backend/postgres/Makefile.in
++++ b/src/backend/postgres/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -202,6 +201,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -209,29 +210,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -293,6 +275,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -314,7 +297,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -348,7 +330,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -459,8 +440,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -645,7 +626,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/backend/postgres/test/Makefile.in b/src/backend/postgres/test/Makefile.in
+index df723f0..cc70051 100644
+--- a/src/backend/postgres/test/Makefile.in
++++ b/src/backend/postgres/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -214,6 +213,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -221,29 +222,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -305,6 +287,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -326,7 +309,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -360,7 +342,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ GNC_TEST_DEPS := \
+@@ -440,8 +421,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -738,7 +719,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -781,7 +762,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -792,7 +773,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -804,7 +785,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -818,36 +799,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in
+index 873669c..25be006 100644
+--- a/src/bin/Makefile.in
++++ b/src/bin/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -193,6 +192,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -200,29 +201,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -284,6 +266,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -305,7 +288,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -339,7 +321,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+
+@@ -406,8 +387,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -592,7 +573,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/bin/overrides/Makefile.in b/src/bin/overrides/Makefile.in
+index 4e88bda..60aabe5 100644
+--- a/src/bin/overrides/Makefile.in
++++ b/src/bin/overrides/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -155,6 +154,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -162,29 +163,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -246,6 +228,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -267,7 +250,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -301,7 +283,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ gncoverridesdir = ${GNC_LIBEXECDIR}/overrides
+@@ -327,8 +308,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/bin/test/Makefile.in b/src/bin/test/Makefile.in
+index c645175..800ab1c 100644
+--- a/src/bin/test/Makefile.in
++++ b/src/bin/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -149,6 +148,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -156,29 +157,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -240,6 +222,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -261,7 +244,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -295,7 +277,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ TESTS = test-version
+@@ -310,8 +291,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -349,7 +330,7 @@ CTAGS:
+
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -360,7 +341,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -372,7 +353,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -386,36 +367,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/business/Makefile.in b/src/business/Makefile.in
+index 08d3492..a3f3ebd 100644
+--- a/src/business/Makefile.in
++++ b/src/business/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = \
+@@ -325,8 +306,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -432,7 +413,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/business/business-core/Makefile.in b/src/business/business-core/Makefile.in
+index 2fb8638..42bb54a 100644
+--- a/src/business/business-core/Makefile.in
++++ b/src/business/business-core/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -206,6 +205,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -213,29 +214,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -297,6 +279,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -318,7 +301,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -352,7 +334,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test file
+@@ -437,8 +418,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -633,7 +614,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/business/business-core/file/Makefile.in b/src/business/business-core/file/Makefile.in
+index a76796e..742a581 100644
+--- a/src/business/business-core/file/Makefile.in
++++ b/src/business/business-core/file/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -206,6 +205,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -213,29 +214,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -297,6 +279,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -318,7 +301,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -352,7 +334,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = .
+@@ -414,8 +395,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -590,7 +571,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/business/business-core/test/Makefile.in b/src/business/business-core/test/Makefile.in
+index dc70ea0..bc8b5f6 100644
+--- a/src/business/business-core/test/Makefile.in
++++ b/src/business/business-core/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -43,10 +43,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -235,6 +234,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -242,29 +243,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -326,6 +308,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -347,7 +330,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -381,7 +363,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = \
+@@ -426,8 +407,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -526,7 +507,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -569,7 +550,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -580,7 +561,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -592,7 +573,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -606,36 +587,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/business/business-gnome/Makefile.in b/src/business/business-gnome/Makefile.in
+index 04d38f2..aed3db2 100644
+--- a/src/business/business-gnome/Makefile.in
++++ b/src/business/business-gnome/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -220,6 +219,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -227,29 +228,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -311,6 +293,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -332,7 +315,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -366,7 +348,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . glade schemas ui
+@@ -479,8 +460,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -694,7 +675,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/business/business-gnome/glade/Makefile.in b/src/business/business-gnome/glade/Makefile.in
+index 8905e5a..fe9a45e 100644
+--- a/src/business/business-gnome/glade/Makefile.in
++++ b/src/business/business-gnome/glade/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ gladedir = $(GNC_GLADE_DIR)
+@@ -332,8 +313,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/business/business-gnome/schemas/Makefile.in b/src/business/business-gnome/schemas/Makefile.in
+index 00541a2..3086509 100644
+--- a/src/business/business-gnome/schemas/Makefile.in
++++ b/src/business/business-gnome/schemas/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ schemadir = @GCONF_SCHEMA_FILE_DIR@
+@@ -322,8 +303,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/business/business-gnome/ui/Makefile.in b/src/business/business-gnome/ui/Makefile.in
+index 068376b..d4e20d7 100644
+--- a/src/business/business-gnome/ui/Makefile.in
++++ b/src/business/business-gnome/ui/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ uidir = $(GNC_UI_DIR)
+@@ -321,8 +302,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/business/business-ledger/Makefile.in b/src/business/business-ledger/Makefile.in
+index 74521b2..b5c5d9e 100644
+--- a/src/business/business-ledger/Makefile.in
++++ b/src/business/business-ledger/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -204,6 +203,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -211,29 +212,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -295,6 +277,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -316,7 +299,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -350,7 +332,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = .
+@@ -411,8 +392,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -581,7 +562,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/business/business-reports/Makefile.in b/src/business/business-reports/Makefile.in
+index 5f4aea3..ce87a2e 100644
+--- a/src/business/business-reports/Makefile.in
++++ b/src/business/business-reports/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
+@@ -334,8 +315,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/business/business-utils/Makefile.in b/src/business/business-utils/Makefile.in
+index c30af69..dad90c1 100644
+--- a/src/business/business-utils/Makefile.in
++++ b/src/business/business-utils/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -195,6 +194,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -202,29 +203,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -286,6 +268,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -307,7 +290,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -341,7 +323,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ pkglib_LTLIBRARIES = libgncmod-business-utils.la
+@@ -403,8 +384,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -533,7 +514,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/business/dialog-tax-table/Makefile.in b/src/business/dialog-tax-table/Makefile.in
+index 3902125..63e9f50 100644
+--- a/src/business/dialog-tax-table/Makefile.in
++++ b/src/business/dialog-tax-table/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -198,6 +197,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -205,29 +206,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -289,6 +271,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -310,7 +293,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -344,7 +326,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ pkglib_LTLIBRARIES = libgncmod-dialog-tax-table.la
+@@ -411,8 +392,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -542,7 +523,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/calculation/Makefile.in b/src/calculation/Makefile.in
+index dd63b16..38d72ff 100644
+--- a/src/calculation/Makefile.in
++++ b/src/calculation/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -196,6 +195,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -203,29 +204,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -287,6 +269,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -308,7 +291,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -342,7 +324,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -388,8 +369,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -555,7 +536,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/calculation/test/Makefile.in b/src/calculation/test/Makefile.in
+index fd80d39..f1f3bba 100644
+--- a/src/calculation/test/Makefile.in
++++ b/src/calculation/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -170,6 +169,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -177,29 +178,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -261,6 +243,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -282,7 +265,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -316,7 +298,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ test_link_SOURCES = test-link.c
+@@ -333,8 +314,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -409,7 +390,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -452,7 +433,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -463,7 +444,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -475,7 +456,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -489,36 +470,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/core-utils/Makefile.in b/src/core-utils/Makefile.in
+index 2358007..a8d34c0 100644
+--- a/src/core-utils/Makefile.in
++++ b/src/core-utils/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -187,6 +186,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -194,29 +195,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -278,6 +260,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -299,7 +282,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -333,7 +315,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ lib_LTLIBRARIES = libgnc-core-utils.la
+@@ -387,8 +368,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -506,7 +487,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
+index 5ff2662..0432340 100644
+--- a/src/doc/Makefile.in
++++ b/src/doc/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = ${GNC_DOC_INSTALL_DIR}
+@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = \
+@@ -348,8 +329,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -455,7 +436,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/doc/design/Makefile.in b/src/doc/design/Makefile.in
+index 625d167..32e738d 100644
+--- a/src/doc/design/Makefile.in
++++ b/src/doc/design/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -170,6 +169,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -177,29 +178,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -261,6 +243,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -282,7 +265,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -316,7 +298,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ info_TEXINFOS = gnucash-design.texinfo
+@@ -346,8 +327,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/doc/xml/Makefile.in b/src/doc/xml/Makefile.in
+index ed883b3..6f2b7d9 100644
+--- a/src/doc/xml/Makefile.in
++++ b/src/doc/xml/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -149,6 +148,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -156,29 +157,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -240,6 +222,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -261,7 +244,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -295,7 +277,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = \
+@@ -316,8 +297,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
+index bbc65e8..e96dbbf 100644
+--- a/src/engine/Makefile.am
++++ b/src/engine/Makefile.am
+@@ -10,6 +10,7 @@ AM_CFLAGS = \
+ -I${top_srcdir}/src/gnc-module \
+ ${QOF_CFLAGS} \
+ ${GLIB_CFLAGS} \
++ ${IGE_MAC_CFLAGS} \
+ ${GUILE_INCS}
+
+ libgncmod_engine_la_SOURCES = \
+@@ -116,6 +117,7 @@ libgncmod_engine_la_LIBADD = \
+ ${REGEX_LIBS} \
+ ${GLIB_LIBS} \
+ ${BINRELOC_LIBS} \
++ ${IGE_MAC_LIBS} \
+ ${top_builddir}/lib/libc/libc-missing.la
+
+ gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+diff --git a/src/engine/Makefile.in b/src/engine/Makefile.in
+index 601a050..95fe6ea 100644
+--- a/src/engine/Makefile.in
++++ b/src/engine/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -42,10 +42,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -66,7 +65,7 @@ libgncmod_engine_la_DEPENDENCIES = ../gnc-module/libgnc-module.la \
+ ../core-utils/libgnc-core-utils.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- ${top_builddir}/lib/libc/libc-missing.la
++ $(am__DEPENDENCIES_1) ${top_builddir}/lib/libc/libc-missing.la
+ am_libgncmod_engine_la_OBJECTS = Account.lo Recurrence.lo Period.lo \
+ Query.lo SchedXaction.lo SX-book.lo SX-ttinfo.lo Scrub.lo \
+ Scrub2.lo Scrub3.lo Split.lo TransLog.lo Transaction.lo \
+@@ -215,6 +214,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -222,29 +223,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -306,6 +288,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -327,7 +310,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -361,7 +343,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test-core test
+@@ -374,6 +355,7 @@ AM_CFLAGS = \
+ -I${top_srcdir}/src/gnc-module \
+ ${QOF_CFLAGS} \
+ ${GLIB_CFLAGS} \
++ ${IGE_MAC_CFLAGS} \
+ ${GUILE_INCS}
+
+ libgncmod_engine_la_SOURCES = \
+@@ -477,6 +459,7 @@ libgncmod_engine_la_LIBADD = \
+ ${REGEX_LIBS} \
+ ${GLIB_LIBS} \
+ ${BINRELOC_LIBS} \
++ ${IGE_MAC_LIBS} \
+ ${top_builddir}/lib/libc/libc-missing.la
+
+ gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+@@ -525,8 +508,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -774,7 +757,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/engine/binreloc.c b/src/engine/binreloc.c
+index d582a5d..032f2af 100644
+--- a/src/engine/binreloc.c
++++ b/src/engine/binreloc.c
+@@ -18,6 +18,9 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#ifdef MAC_INTEGRATION
++#include <igemacintegration/ige-mac-bundle.h>
++#endif
+ #endif /* ENABLE_BINRELOC */
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -27,7 +30,9 @@
+ #include <glib.h>
+
+ G_BEGIN_DECLS
+-
++#if defined ENABLE_BINRELOC && defined MAC_INTEGRATION
++static IgeMacBundle *bundle = NULL;
++#endif
+
+ /** @internal
+ * Find the canonical filename of the executable. Returns the filename
+@@ -61,6 +66,23 @@ _br_find_exe (GbrInitError *error)
+ (char*)NULL);
+ g_free (prefix);
+ return result;
++#elif MAC_INTEGRATION
++ gchar *prefix = NULL, *result = NULL;
++ bundle = ige_mac_bundle_get_default();
++ if (!bundle) {
++ *error = GBR_INIT_ERROR_DISABLED;
++ return NULL;
++ }
++ if (!ige_mac_bundle_get_is_app_bundle (bundle)) {
++ *error = GBR_INIT_ERROR_OPEN_MAPS;
++ return NULL;
++ }
++ ige_mac_bundle_setup_environment(bundle);
++ prefix = g_strdup(ige_mac_bundle_get_path(bundle));
++ result = g_build_filename(prefix, "Contents/MacOS",
++ "gnucash-bin.exe", NULL);
++ g_free(prefix);
++ return result;
+ #else
+ char *path, *path2, *line, *result;
+ size_t buf_size;
+@@ -202,7 +224,7 @@ _br_find_exe_for_symbol (const void *symbol, GbrInitError *error)
+ *error = GBR_INIT_ERROR_DISABLED;
+ return (char *) NULL;
+ #else
+-#ifdef G_OS_WIN32
++#if defined G_OS_WIN32 || defined MAC_INTEGRATION
+ g_warning ("_br_find_exe_for_symbol not implemented on win32.");
+ if (error)
+ *error = GBR_INIT_ERROR_DISABLED;
+@@ -474,18 +496,33 @@ gbr_find_prefix (const gchar *default_prefix)
+ {
+ gchar *dir1, *dir2;
+
+- if (exe == NULL) {
++#if defined ENABLE_BINRELOC && defined MAC_INTEGRATION
++ gchar *prefix = NULL, *result = NULL;
++ if (bundle == NULL) {
+ /* BinReloc not initialized. */
+ if (default_prefix != NULL)
+ return g_strdup (default_prefix);
+ else
+ return NULL;
+ }
++ prefix = g_strdup(ige_mac_bundle_get_path(bundle));
++ result = g_build_filename(prefix, "Contents/Resources", NULL);
++ g_free(prefix);
++ return result;
++#else
+
++ if (exe == NULL) {
++ /* BinReloc not initialized. */
++ if (default_prefix != NULL)
++ return g_strdup (default_prefix);
++ else
++ return NULL;
++ }
+ dir1 = g_path_get_dirname (exe);
+ dir2 = g_path_get_dirname (dir1);
+ g_free (dir1);
+ return dir2;
++#endif //ENABLE_BINRELOC && MAC_INTEGRATION
+ }
+
+
+@@ -506,6 +543,19 @@ gchar *
+ gbr_find_bin_dir (const gchar *default_bin_dir)
+ {
+ gchar *prefix, *dir;
++#if defined ENABLE_BINRELOC && defined MAC_INTEGRATION
++ if (bundle == NULL) {
++ /* BinReloc not initialized. */
++ if (default_bin_dir != NULL)
++ return g_strdup (default_bin_dir);
++ else
++ return NULL;
++ }
++ prefix = g_strdup(ige_mac_bundle_get_path(bundle));
++ dir = g_build_filename(prefix, "Contents/MacOS", NULL);
++ g_free(prefix);
++ return dir;
++#else
+
+ prefix = gbr_find_prefix (NULL);
+ if (prefix == NULL) {
+@@ -519,6 +569,7 @@ gbr_find_bin_dir (const gchar *default_bin_dir)
+ dir = g_build_filename (prefix, "bin", NULL);
+ g_free (prefix);
+ return dir;
++#endif //ENABLE_BINRELOC && MAC_INTEGRATION
+ }
+
+
+diff --git a/src/engine/test-core/Makefile.in b/src/engine/test-core/Makefile.in
+index c2ae633..7721bb8 100644
+--- a/src/engine/test-core/Makefile.in
++++ b/src/engine/test-core/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -178,6 +177,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -185,29 +186,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -269,6 +251,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -290,7 +273,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -324,7 +306,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ check_LTLIBRARIES = libgncmod-test-engine.la
+@@ -360,8 +341,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -438,7 +419,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/engine/test/Makefile.in b/src/engine/test/Makefile.in
+index 37b440a..e0d7195 100644
+--- a/src/engine/test/Makefile.in
++++ b/src/engine/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -59,10 +59,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -384,6 +383,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -391,29 +392,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -475,6 +457,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -496,7 +479,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -530,7 +512,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = \
+@@ -583,8 +564,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -739,7 +720,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -782,7 +763,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -793,7 +774,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -805,7 +786,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -819,36 +800,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/gnc-module/Makefile.in b/src/gnc-module/Makefile.in
+index 0205851..d6840a6 100644
+--- a/src/gnc-module/Makefile.in
++++ b/src/gnc-module/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -197,6 +196,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -204,29 +205,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -288,6 +270,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -309,7 +292,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -343,7 +325,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -387,8 +368,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -587,7 +568,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/gnc-module/test/Makefile.in b/src/gnc-module/test/Makefile.in
+index c9a3087..92b95a9 100644
+--- a/src/gnc-module/test/Makefile.in
++++ b/src/gnc-module/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -45,10 +45,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -212,6 +211,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -219,29 +220,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -303,6 +285,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -324,7 +307,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -358,7 +340,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = mod-foo mod-bar mod-baz misc-mods
+@@ -406,8 +387,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -568,7 +549,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -624,7 +605,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -635,7 +616,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -647,7 +628,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -661,36 +642,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/gnc-module/test/misc-mods/Makefile.in b/src/gnc-module/test/misc-mods/Makefile.in
+index 5f43b09..e1638c2 100644
+--- a/src/gnc-module/test/misc-mods/Makefile.in
++++ b/src/gnc-module/test/misc-mods/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -185,6 +184,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -192,29 +193,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -276,6 +258,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -297,7 +280,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -331,7 +313,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = \
+@@ -368,8 +349,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -451,7 +432,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/gnc-module/test/mod-bar/Makefile.in b/src/gnc-module/test/mod-bar/Makefile.in
+index 01709da..8803a8e 100644
+--- a/src/gnc-module/test/mod-bar/Makefile.in
++++ b/src/gnc-module/test/mod-bar/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -180,6 +179,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -187,29 +188,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -271,6 +253,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -292,7 +275,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -326,7 +308,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = \
+@@ -367,8 +348,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -447,7 +428,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/gnc-module/test/mod-baz/Makefile.in b/src/gnc-module/test/mod-baz/Makefile.in
+index b95d79f..78841f2 100644
+--- a/src/gnc-module/test/mod-baz/Makefile.in
++++ b/src/gnc-module/test/mod-baz/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -180,6 +179,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -187,29 +188,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -271,6 +253,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -292,7 +275,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -326,7 +308,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = \
+@@ -371,8 +352,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -451,7 +432,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/gnc-module/test/mod-foo/Makefile.in b/src/gnc-module/test/mod-foo/Makefile.in
+index 4c8d157..0c76120 100644
+--- a/src/gnc-module/test/mod-foo/Makefile.in
++++ b/src/gnc-module/test/mod-foo/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -180,6 +179,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -187,29 +188,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -271,6 +253,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -292,7 +275,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -326,7 +308,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = \
+@@ -368,8 +349,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -448,7 +429,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/gnome-search/Makefile.in b/src/gnome-search/Makefile.in
+index 1db595b..b0b6daa 100644
+--- a/src/gnome-search/Makefile.in
++++ b/src/gnome-search/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -202,6 +201,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -209,29 +210,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -293,6 +275,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -314,7 +297,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -348,7 +330,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ pkglib_LTLIBRARIES = libgncmod-gnome-search.la
+@@ -430,8 +411,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -571,7 +552,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
+index 3a9f056..0fc611a 100644
+--- a/src/gnome-utils/Makefile.am
++++ b/src/gnome-utils/Makefile.am
+@@ -20,7 +20,8 @@ AM_CFLAGS = \
+ ${GTKHTML_CFLAGS} \
+ ${GUILE_INCS} \
+ ${QOF_CFLAGS} \
+- ${GOFFICE_CFLAGS}
++ ${GOFFICE_CFLAGS} \
++ $(IGE_MAC_CFLAGS)
+
+ libgncmod_gnome_utils_la_SOURCES = \
+ QuickFill.c \
+@@ -193,11 +194,14 @@ libgncmod_gnome_utils_la_LIBADD = \
+ ${QOF_LIBS} \
+ ${GOFFICE_LIBS} \
+ ${REGEX_LIBS} \
+- ${LIBXML2_LIBS}
++ ${LIBXML2_LIBS} \
++ ${IGE_MAC_LIBS}
+
+-if HAVE_X11_XLIB_H
++if HAVE_X11_XLIB_H
++if !GDK_TARGET_QUARTZ
+ libgncmod_gnome_utils_la_LIBADD += -lX11
+ endif
++endif
+
+ if BUILDING_FROM_SVN
+ swig-gnome-utils.c: gnome-utils.i gnc-html.h \
+diff --git a/src/gnome-utils/Makefile.in b/src/gnome-utils/Makefile.in
+index b7e5cd1..006ce82 100644
+--- a/src/gnome-utils/Makefile.in
++++ b/src/gnome-utils/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -34,7 +34,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+- at HAVE_X11_XLIB_H_TRUE@am__append_1 = -lX11
++ at GDK_TARGET_QUARTZ_FALSE@@HAVE_X11_XLIB_H_TRUE at am__append_1 = -lX11
+ @GTKHTML_USES_GTKPRINT_TRUE at am__append_2 = print-session.c
+ @GTKHTML_USES_GTKPRINT_FALSE at am__append_3 = ${GNOME_PRINT_CFLAGS}
+ @GTKHTML_USES_GTKPRINT_FALSE at am__append_4 = ${GNOME_PRINT_LIBS}
+@@ -46,10 +46,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -81,7 +80,8 @@ libgncmod_gnome_utils_la_DEPENDENCIES = \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_2)
+ am__libgncmod_gnome_utils_la_SOURCES_DIST = QuickFill.c \
+ account-quickfill.c cursors.c dialog-account.c \
+ dialog-book-close.c dialog-commodity.c dialog-options.c \
+@@ -280,6 +280,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -287,29 +289,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -371,6 +354,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -392,7 +376,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -426,7 +409,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = glade schemas . test ui
+@@ -439,7 +421,8 @@ AM_CFLAGS = -I${top_srcdir}/src/core-utils \
+ -I${top_srcdir}/src -I${top_builddir}/src \
+ -I${top_srcdir}/lib/libc ${GLIB_CFLAGS} ${GLADE_CFLAGS} \
+ ${GTK_CFLAGS} ${GNOME_CFLAGS} ${GTKHTML_CFLAGS} ${GUILE_INCS} \
+- ${QOF_CFLAGS} ${GOFFICE_CFLAGS} $(am__append_3)
++ ${QOF_CFLAGS} ${GOFFICE_CFLAGS} $(IGE_MAC_CFLAGS) \
++ $(am__append_3)
+ libgncmod_gnome_utils_la_SOURCES = QuickFill.c account-quickfill.c \
+ cursors.c dialog-account.c dialog-book-close.c \
+ dialog-commodity.c dialog-options.c dialog-preferences.c \
+@@ -557,8 +540,8 @@ libgncmod_gnome_utils_la_LIBADD = \
+ $(top_builddir)/lib/libc/libc-missing.la ${GNOME_LIBS} \
+ ${GTKHTML_LIBS} ${GUILE_LIBS} ${GDK_PIXBUF_LIBS} ${GLADE_LIBS} \
+ ${GUILE_LIBS} ${GLIB_LIBS} ${DB_LIBS} ${QOF_LIBS} \
+- ${GOFFICE_LIBS} ${REGEX_LIBS} ${LIBXML2_LIBS} $(am__append_1) \
+- $(am__append_4)
++ ${GOFFICE_LIBS} ${REGEX_LIBS} ${LIBXML2_LIBS} ${IGE_MAC_LIBS} \
++ $(am__append_1) $(am__append_4)
+ gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+ gncmod_DATA = gnome-utils.scm
+ gncscmdir = ${GNC_SHAREDIR}/scm
+@@ -585,8 +568,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -873,7 +856,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/gnome-utils/glade/Makefile.in b/src/gnome-utils/glade/Makefile.in
+index aff3c0b..fb16e23 100644
+--- a/src/gnome-utils/glade/Makefile.in
++++ b/src/gnome-utils/glade/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ gladedir = $(GNC_GLADE_DIR)
+@@ -332,8 +313,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c
+index a664630..42ed231 100644
+--- a/src/gnome-utils/gnc-main-window.c
++++ b/src/gnome-utils/gnc-main-window.c
+@@ -32,7 +32,6 @@
+ @author Copyright (C) 2003 Jan Arne Petersen <jpetersen at uni-bonn.de>
+ @author Copyright (C) 2003,2005,2006 David Hampton <hampton at employees.org>
+ */
+-
+ #include "config.h"
+
+ #include <gnome.h>
+@@ -67,6 +66,9 @@
+ // +JSLED
+ #include "gnc-html.h"
+ #include "gnc-autosave.h"
++#ifdef MAC_INTEGRATION
++#include <igemacintegration/igemacintegration.h>
++#endif
+
+ /** Names of signals generated by the main window. */
+ enum {
+@@ -145,6 +147,9 @@ static void do_popup_menu(GncPluginPage *page, GdkEventButton *event);
+ static gboolean gnc_main_window_popup_menu_cb (GtkWidget *widget, GncPluginPage *page);
+
+ static GtkAction *gnc_main_window_find_action (GncMainWindow *window, const gchar *name);
++#ifdef MAC_INTEGRATION
++static void gtk_quartz_set_menu(GncMainWindow* window);
++#endif
+
+ /** The instance private data structure for an embedded window
+ * object. */
+@@ -1344,7 +1349,14 @@ gnc_main_window_update_one_menu_action (GncMainWindow *window,
+ "label", data->label,
+ "visible", data->visible,
+ (char *)NULL);
+- LEAVE(" ");
++#ifdef MAC_INTEGRATION
++ {
++ GtkWidget *menu = gtk_ui_manager_get_widget(window->ui_merge,
++ "/menubar"
++);
++ ige_mac_menu_sync(GTK_MENU_SHELL( menu ));
++ }
++ #endif LEAVE(" ");
+ }
+
+
+@@ -1900,6 +1912,9 @@ gnc_main_window_init (GncMainWindow *window,
+ qof_event_register_handler(gnc_main_window_event_handler, window);
+
+ gnc_main_window_setup_window (window);
++#ifdef MAC_INTEGRATION
++ gtk_quartz_set_menu(window);
++#endif
+ gnc_gobject_tracking_remember(G_OBJECT(window),
+ G_OBJECT_CLASS(klass));
+ }
+@@ -2948,6 +2963,44 @@ gnc_main_window_setup_window (GncMainWindow *window)
+ LEAVE(" ");
+ }
+
++#ifdef MAC_INTEGRATION
++static void
++gtk_quartz_set_menu(GncMainWindow* window) {
++ IgeMacMenuGroup *group;
++ GtkWidget *menu;
++ GtkWidget *item;
++
++ menu = gtk_ui_manager_get_widget (window->ui_merge, "/menubar");
++ if (GTK_IS_MENU_ITEM (menu))
++ menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
++ gtk_widget_hide(menu);
++ ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (menu));
++
++ item = gtk_ui_manager_get_widget (window->ui_merge,
++ "/menubar/File/FileQuit");
++ if (GTK_IS_MENU_ITEM (item))
++ ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (item));
++
++ /* the about group */
++ group = ige_mac_menu_add_app_menu_group ();
++
++ item = gtk_ui_manager_get_widget (window->ui_merge,
++ "/menubar/Help/HelpAbout");
++ if (GTK_IS_MENU_ITEM (item))
++ ige_mac_menu_add_app_menu_item (group, GTK_MENU_ITEM (item),
++ _("About GnuCash"));
++
++ /* the preferences group */
++ group = ige_mac_menu_add_app_menu_group ();
++
++ item = gtk_ui_manager_get_widget (window->ui_merge,
++ "/menubar/Edit/EditPreferences");
++ if (GTK_IS_MENU_ITEM (item))
++ ige_mac_menu_add_app_menu_item (group, GTK_MENU_ITEM (item), NULL);
++
++}
++#endif //MAC_INTEGRATION
++
+ /* Callbacks */
+ static void
+ gnc_main_window_add_widget (GtkUIManager *merge,
+@@ -3103,6 +3156,9 @@ gnc_main_window_page_reordered (GtkNotebook *notebook,
+ LEAVE(" ");
+ }
+ #endif
++#ifdef MAC_INTEGRATION
++#include <igemacintegration/ige-mac-menu.h>
++#endif
+
+ static void
+ gnc_main_window_plugin_added (GncPlugin *manager,
+diff --git a/src/gnome-utils/schemas/Makefile.in b/src/gnome-utils/schemas/Makefile.in
+index b40e174..c4f350d 100644
+--- a/src/gnome-utils/schemas/Makefile.in
++++ b/src/gnome-utils/schemas/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ schemadir = @GCONF_SCHEMA_FILE_DIR@
+@@ -322,8 +303,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/gnome-utils/test/Makefile.in b/src/gnome-utils/test/Makefile.in
+index 5c303ed..4f255c2 100644
+--- a/src/gnome-utils/test/Makefile.in
++++ b/src/gnome-utils/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -191,6 +190,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -198,29 +199,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -282,6 +264,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -303,7 +286,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -337,7 +319,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+
+@@ -397,8 +378,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -481,7 +462,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -524,7 +505,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -535,7 +516,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -547,7 +528,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -561,36 +542,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/gnome-utils/ui/Makefile.in b/src/gnome-utils/ui/Makefile.in
+index 75fd307..a55c507 100644
+--- a/src/gnome-utils/ui/Makefile.in
++++ b/src/gnome-utils/ui/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ uidir = $(GNC_UI_DIR)
+@@ -320,8 +301,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/gnome/Makefile.in b/src/gnome/Makefile.in
+index 5ed9c07..f3a22fc 100644
+--- a/src/gnome/Makefile.in
++++ b/src/gnome/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -220,6 +219,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -227,29 +228,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -311,6 +293,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -332,7 +315,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -366,7 +348,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = glade schemas ui
+@@ -498,8 +479,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -714,7 +695,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/gnome/glade/Makefile.in b/src/gnome/glade/Makefile.in
+index 8f6d0af..cf38c05 100644
+--- a/src/gnome/glade/Makefile.in
++++ b/src/gnome/glade/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ gladedir = $(GNC_GLADE_DIR)
+@@ -337,8 +318,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/gnome/schemas/Makefile.in b/src/gnome/schemas/Makefile.in
+index 401c3cd..b634938 100644
+--- a/src/gnome/schemas/Makefile.in
++++ b/src/gnome/schemas/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ schemadir = @GCONF_SCHEMA_FILE_DIR@
+@@ -332,8 +313,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/gnome/ui/Makefile.in b/src/gnome/ui/Makefile.in
+index 998ca9c..88ff1c4 100644
+--- a/src/gnome/ui/Makefile.in
++++ b/src/gnome/ui/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ uidir = $(GNC_UI_DIR)
+@@ -333,8 +314,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/import-export/Makefile.in b/src/import-export/Makefile.in
+index db0a812..e7165f7 100644
+--- a/src/import-export/Makefile.in
++++ b/src/import-export/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -213,6 +212,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -220,29 +221,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -304,6 +286,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -325,7 +308,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -359,7 +341,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . schemas qif qif-import \
+@@ -450,8 +431,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -662,7 +643,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/import-export/aqbanking/Makefile.in b/src/import-export/aqbanking/Makefile.in
+index 6b712c6..aa69809 100644
+--- a/src/import-export/aqbanking/Makefile.in
++++ b/src/import-export/aqbanking/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -212,6 +211,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -219,29 +220,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -303,6 +285,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -324,7 +307,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -358,7 +340,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . schemas
+@@ -443,8 +424,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -654,7 +635,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/import-export/aqbanking/schemas/Makefile.in b/src/import-export/aqbanking/schemas/Makefile.in
+index b6bfb7c..798759c 100644
+--- a/src/import-export/aqbanking/schemas/Makefile.in
++++ b/src/import-export/aqbanking/schemas/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ schemadir = @GCONF_SCHEMA_FILE_DIR@
+@@ -322,8 +303,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/import-export/hbci/Makefile.in b/src/import-export/hbci/Makefile.in
+index f84f7b0..3b02edd 100644
+--- a/src/import-export/hbci/Makefile.in
++++ b/src/import-export/hbci/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -211,6 +210,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -218,29 +219,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -302,6 +284,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -323,7 +306,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -357,7 +339,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . glade schemas test
+@@ -454,8 +435,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -650,7 +631,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/import-export/hbci/glade/Makefile.in b/src/import-export/hbci/glade/Makefile.in
+index d20320f..09462e0 100644
+--- a/src/import-export/hbci/glade/Makefile.in
++++ b/src/import-export/hbci/glade/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ gladedir = $(GNC_GLADE_DIR)
+@@ -322,8 +303,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/import-export/hbci/schemas/Makefile.in b/src/import-export/hbci/schemas/Makefile.in
+index 7cbcead..5db711a 100644
+--- a/src/import-export/hbci/schemas/Makefile.in
++++ b/src/import-export/hbci/schemas/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ schemadir = @GCONF_SCHEMA_FILE_DIR@
+@@ -322,8 +303,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/import-export/hbci/test/Makefile.in b/src/import-export/hbci/test/Makefile.in
+index 074022c..3bdd775 100644
+--- a/src/import-export/hbci/test/Makefile.in
++++ b/src/import-export/hbci/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -168,6 +167,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -175,29 +176,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -259,6 +241,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -280,7 +263,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -314,7 +296,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ test_link_module_SOURCES = test-link-module.c
+@@ -327,8 +308,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -403,7 +384,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -446,7 +427,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -457,7 +438,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -469,7 +450,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -483,36 +464,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/import-export/log-replay/Makefile.in b/src/import-export/log-replay/Makefile.in
+index 89c72a3..fe92cbf 100644
+--- a/src/import-export/log-replay/Makefile.in
++++ b/src/import-export/log-replay/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -205,6 +204,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -212,29 +213,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -296,6 +278,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -317,7 +300,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -351,7 +333,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = .
+@@ -404,8 +385,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -588,7 +569,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/import-export/ofx/Makefile.in b/src/import-export/ofx/Makefile.in
+index fc6df42..f92a355 100644
+--- a/src/import-export/ofx/Makefile.in
++++ b/src/import-export/ofx/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -205,6 +204,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -212,29 +213,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -296,6 +278,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -317,7 +300,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -351,7 +333,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -408,8 +389,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -592,7 +573,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/import-export/ofx/test/Makefile.in b/src/import-export/ofx/test/Makefile.in
+index f8098ad..dda9288 100644
+--- a/src/import-export/ofx/test/Makefile.in
++++ b/src/import-export/ofx/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -168,6 +167,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -175,29 +176,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -259,6 +241,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -280,7 +263,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -314,7 +296,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = ${LIBOFX_CFLAGS}
+@@ -328,8 +309,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -404,7 +385,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -447,7 +428,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -458,7 +439,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -470,7 +451,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -484,36 +465,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/import-export/qif-import/Makefile.in b/src/import-export/qif-import/Makefile.in
+index 62968da..913aa1f 100644
+--- a/src/import-export/qif-import/Makefile.in
++++ b/src/import-export/qif-import/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -215,6 +214,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -222,29 +223,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -306,6 +288,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -327,7 +310,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -361,7 +343,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test schemas
+@@ -453,8 +434,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -690,7 +671,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/import-export/qif-import/schemas/Makefile.in b/src/import-export/qif-import/schemas/Makefile.in
+index d0b1cc2..fa5dd44 100644
+--- a/src/import-export/qif-import/schemas/Makefile.in
++++ b/src/import-export/qif-import/schemas/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ schemadir = @GCONF_SCHEMA_FILE_DIR@
+@@ -322,8 +303,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/import-export/qif-import/test/Makefile.in b/src/import-export/qif-import/test/Makefile.in
+index 3ec751e..3b96ea0 100644
+--- a/src/import-export/qif-import/test/Makefile.in
++++ b/src/import-export/qif-import/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -175,6 +174,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -182,29 +183,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -266,6 +248,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -287,7 +270,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -321,7 +303,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ test_link_SOURCES = \
+@@ -344,8 +325,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -420,7 +401,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -463,7 +444,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -474,7 +455,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -486,7 +467,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -500,36 +481,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/import-export/qif-io-core/Makefile.in b/src/import-export/qif-io-core/Makefile.in
+index 821b714..ca63190 100644
+--- a/src/import-export/qif-io-core/Makefile.in
++++ b/src/import-export/qif-io-core/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -191,6 +190,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -198,29 +199,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -282,6 +264,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -303,7 +286,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -337,7 +319,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -372,8 +353,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -571,7 +552,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/import-export/qif-io-core/test/Makefile.in b/src/import-export/qif-io-core/test/Makefile.in
+index 7ed1350..d2e6e4a 100644
+--- a/src/import-export/qif-io-core/test/Makefile.in
++++ b/src/import-export/qif-io-core/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -149,6 +148,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -156,29 +157,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -240,6 +222,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -261,7 +244,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -295,7 +277,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ LDADD = ${top_builddir}/src/gnc-module/libgnc-module.la ${GLIB_LIBS}
+@@ -329,8 +310,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -368,7 +349,7 @@ CTAGS:
+
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -379,7 +360,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -391,7 +372,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -405,36 +386,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/import-export/qif/Makefile.in b/src/import-export/qif/Makefile.in
+index 73b24d0..5424466 100644
+--- a/src/import-export/qif/Makefile.in
++++ b/src/import-export/qif/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -195,6 +194,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -202,29 +203,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -286,6 +268,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -307,7 +290,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -341,7 +323,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+
+@@ -390,8 +371,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -559,7 +540,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/import-export/qif/test/Makefile.in b/src/import-export/qif/test/Makefile.in
+index 676aedf..e3d3942 100644
+--- a/src/import-export/qif/test/Makefile.in
++++ b/src/import-export/qif/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -182,6 +181,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -189,29 +190,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -273,6 +255,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -294,7 +277,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -328,7 +310,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = \
+@@ -385,8 +366,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -465,7 +446,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -508,7 +489,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -519,7 +500,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -531,7 +512,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -545,36 +526,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/import-export/schemas/Makefile.in b/src/import-export/schemas/Makefile.in
+index 7489f65..8d2c3b0 100644
+--- a/src/import-export/schemas/Makefile.in
++++ b/src/import-export/schemas/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ schemadir = @GCONF_SCHEMA_FILE_DIR@
+@@ -322,8 +303,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/import-export/test/Makefile.in b/src/import-export/test/Makefile.in
+index 9865124..caa0e03 100644
+--- a/src/import-export/test/Makefile.in
++++ b/src/import-export/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -186,6 +185,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -193,29 +194,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -277,6 +259,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -298,7 +281,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -332,7 +314,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = \
+@@ -379,8 +360,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -459,7 +440,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -502,7 +483,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -513,7 +494,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -525,7 +506,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -539,36 +520,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/optional/Makefile.in b/src/optional/Makefile.in
+index 9a90d5a..7ab7e26 100644
+--- a/src/optional/Makefile.in
++++ b/src/optional/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = xsl
+@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/optional/xsl/Makefile.in b/src/optional/xsl/Makefile.in
+index 9de9957..e38e90b 100644
+--- a/src/optional/xsl/Makefile.in
++++ b/src/optional/xsl/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xsldir = ${datadir}/xml/gnucash/xsl
+@@ -327,8 +308,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/pixmaps/Makefile.in b/src/pixmaps/Makefile.in
+index 835efa8..3a424d3 100644
+--- a/src/pixmaps/Makefile.in
++++ b/src/pixmaps/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -172,6 +171,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -179,29 +180,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -263,6 +245,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -284,7 +267,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -318,7 +300,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ gncpixmapdir = ${GNC_PIXMAP_DIR}
+@@ -389,8 +370,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/quotes/Makefile.in b/src/quotes/Makefile.in
+index 4ff062e..575ccf9 100644
+--- a/src/quotes/Makefile.in
++++ b/src/quotes/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -153,6 +152,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -160,29 +161,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -244,6 +226,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -265,7 +248,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -299,7 +281,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ bin_SCRIPTS = gnc-fq-check gnc-fq-dump gnc-fq-helper gnc-fq-update
+@@ -319,8 +300,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/register/Makefile.in b/src/register/Makefile.in
+index 0b1633a..668c501 100644
+--- a/src/register/Makefile.in
++++ b/src/register/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = register-core register-gnome ledger-core
+@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/register/ledger-core/Makefile.in b/src/register/ledger-core/Makefile.in
+index 4d05a15..4d9ee9d 100644
+--- a/src/register/ledger-core/Makefile.in
++++ b/src/register/ledger-core/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -207,6 +206,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -214,29 +215,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -298,6 +280,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -319,7 +302,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -353,7 +335,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -419,8 +400,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -593,7 +574,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/register/ledger-core/test/Makefile.in b/src/register/ledger-core/test/Makefile.in
+index 87dbee8..35e9e2b 100644
+--- a/src/register/ledger-core/test/Makefile.in
++++ b/src/register/ledger-core/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -168,6 +167,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -175,29 +176,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -259,6 +241,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -280,7 +263,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -314,7 +296,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ test_link_module_SOURCES = test-link-module.c
+@@ -328,8 +309,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -404,7 +385,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -447,7 +428,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -458,7 +439,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -470,7 +451,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -484,36 +465,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/register/register-core/Makefile.in b/src/register/register-core/Makefile.in
+index e33b72a..4d45f62 100644
+--- a/src/register/register-core/Makefile.in
++++ b/src/register/register-core/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -207,6 +206,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -214,29 +215,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -298,6 +280,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -319,7 +302,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -353,7 +335,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -427,8 +408,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -624,7 +605,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/register/register-core/test/Makefile.in b/src/register/register-core/test/Makefile.in
+index 7e3854b..9516602 100644
+--- a/src/register/register-core/test/Makefile.in
++++ b/src/register/register-core/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -171,6 +170,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -178,29 +179,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -262,6 +244,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -283,7 +266,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -317,7 +299,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ test_link_module_SOURCES = test-link-module.c
+@@ -337,8 +318,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -413,7 +394,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -456,7 +437,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -467,7 +448,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -479,7 +460,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -493,36 +474,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/register/register-gnome/Makefile.in b/src/register/register-gnome/Makefile.in
+index 7e73b3f..ab24d2c 100644
+--- a/src/register/register-gnome/Makefile.in
++++ b/src/register/register-gnome/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -208,6 +207,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -215,29 +216,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -299,6 +281,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -320,7 +303,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -354,7 +336,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -431,8 +412,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -612,7 +593,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/register/register-gnome/test/Makefile.in b/src/register/register-gnome/test/Makefile.in
+index bd9883d..832367d 100644
+--- a/src/register/register-gnome/test/Makefile.in
++++ b/src/register/register-gnome/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -171,6 +170,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -178,29 +179,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -262,6 +244,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -283,7 +266,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -317,7 +299,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ test_link_module_SOURCES = test-link-module.c
+@@ -337,8 +318,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -413,7 +394,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -456,7 +437,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -467,7 +448,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -479,7 +460,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -493,36 +474,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/report/Makefile.in b/src/report/Makefile.in
+index 1b4d512..4dc5c8a 100644
+--- a/src/report/Makefile.in
++++ b/src/report/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -160,6 +159,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -167,29 +168,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -251,6 +233,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -272,7 +255,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -306,7 +288,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ NONGUI_SUBDIRS = \
+@@ -329,8 +310,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -436,7 +417,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/report/locale-specific/Makefile.in b/src/report/locale-specific/Makefile.in
+index a712fb7..934974b 100644
+--- a/src/report/locale-specific/Makefile.in
++++ b/src/report/locale-specific/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = us
+@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/report/locale-specific/us/Makefile.in b/src/report/locale-specific/us/Makefile.in
+index 53a5e08..478ce23 100644
+--- a/src/report/locale-specific/us/Makefile.in
++++ b/src/report/locale-specific/us/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -200,6 +199,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -207,29 +208,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -291,6 +273,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -312,7 +295,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -346,7 +328,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -391,8 +372,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -590,7 +571,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/report/locale-specific/us/test/Makefile.in b/src/report/locale-specific/us/test/Makefile.in
+index b63d02d..2781b08 100644
+--- a/src/report/locale-specific/us/test/Makefile.in
++++ b/src/report/locale-specific/us/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -168,6 +167,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -175,29 +176,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -259,6 +241,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -280,7 +263,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -314,7 +296,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
+@@ -348,8 +329,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -424,7 +405,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -467,7 +448,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -478,7 +459,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -490,7 +471,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -504,36 +485,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/report/report-gnome/Makefile.in b/src/report/report-gnome/Makefile.in
+index 9ac4f5b..c902948 100644
+--- a/src/report/report-gnome/Makefile.in
++++ b/src/report/report-gnome/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -215,6 +214,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -222,29 +223,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -306,6 +288,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -327,7 +310,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -361,7 +343,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -442,8 +423,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -680,7 +661,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/report/report-gnome/test/Makefile.in b/src/report/report-gnome/test/Makefile.in
+index 714dcf2..ae5529d 100644
+--- a/src/report/report-gnome/test/Makefile.in
++++ b/src/report/report-gnome/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -169,6 +168,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -176,29 +177,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -260,6 +242,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -281,7 +264,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -315,7 +297,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
+@@ -347,8 +328,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -423,7 +404,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -466,7 +447,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -477,7 +458,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -489,7 +470,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -503,36 +484,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/report/report-system/Makefile.in b/src/report/report-system/Makefile.in
+index 437b717..cc4122e 100644
+--- a/src/report/report-system/Makefile.in
++++ b/src/report/report-system/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -205,6 +204,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -212,29 +213,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -296,6 +278,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -317,7 +300,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -351,7 +333,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -418,8 +399,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -636,7 +617,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/report/report-system/test/Makefile.in b/src/report/report-system/test/Makefile.in
+index 1174b99..0ff4733 100644
+--- a/src/report/report-system/test/Makefile.in
++++ b/src/report/report-system/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -168,6 +167,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -175,29 +176,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -259,6 +241,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -280,7 +263,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -314,7 +296,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
+@@ -341,8 +322,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -417,7 +398,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -460,7 +441,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -471,7 +452,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +464,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -497,36 +478,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/report/standard-reports/Makefile.in b/src/report/standard-reports/Makefile.in
+index ec30eb0..73359ba 100644
+--- a/src/report/standard-reports/Makefile.in
++++ b/src/report/standard-reports/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -197,6 +196,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -204,29 +205,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -288,6 +270,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -309,7 +292,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -343,7 +325,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -401,8 +382,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -583,7 +564,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/report/standard-reports/test/Makefile.in b/src/report/standard-reports/test/Makefile.in
+index 340205a..b5d9b07 100644
+--- a/src/report/standard-reports/test/Makefile.in
++++ b/src/report/standard-reports/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -149,6 +148,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -156,29 +157,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -240,6 +222,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -261,7 +244,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -295,7 +277,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ TESTS = test-load-module
+@@ -323,8 +304,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -362,7 +343,7 @@ CTAGS:
+
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -373,7 +354,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -385,7 +366,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -399,36 +380,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/report/stylesheets/Makefile.in b/src/report/stylesheets/Makefile.in
+index 74ac9b1..4b58834 100644
+--- a/src/report/stylesheets/Makefile.in
++++ b/src/report/stylesheets/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,10 +41,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -205,6 +204,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -212,29 +213,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -296,6 +278,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -317,7 +300,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -351,7 +333,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -412,8 +393,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -612,7 +593,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/report/stylesheets/test/Makefile.in b/src/report/stylesheets/test/Makefile.in
+index 6823fba..69d4a74 100644
+--- a/src/report/stylesheets/test/Makefile.in
++++ b/src/report/stylesheets/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -149,6 +148,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -156,29 +157,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -240,6 +222,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -261,7 +244,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -295,7 +277,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ TESTS = test-load-module
+@@ -327,8 +308,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -366,7 +347,7 @@ CTAGS:
+
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -377,7 +358,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -389,7 +370,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -403,36 +384,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/report/utility-reports/Makefile.in b/src/report/utility-reports/Makefile.in
+index a682e3d..004b254 100644
+--- a/src/report/utility-reports/Makefile.in
++++ b/src/report/utility-reports/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -197,6 +196,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -204,29 +205,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -288,6 +270,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -309,7 +292,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -343,7 +325,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -389,8 +370,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -571,7 +552,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/report/utility-reports/test/Makefile.in b/src/report/utility-reports/test/Makefile.in
+index 2fb60cb..404dc66 100644
+--- a/src/report/utility-reports/test/Makefile.in
++++ b/src/report/utility-reports/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -149,6 +148,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -156,29 +157,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -240,6 +222,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -261,7 +244,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -295,7 +277,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ TESTS = test-load-module
+@@ -323,8 +304,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -362,7 +343,7 @@ CTAGS:
+
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -373,7 +354,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -385,7 +366,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -399,36 +380,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/scm/Makefile.in b/src/scm/Makefile.in
+index d09a7f1..bcda222 100644
+--- a/src/scm/Makefile.in
++++ b/src/scm/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -174,6 +173,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -181,29 +182,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -265,6 +247,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -286,7 +269,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -320,7 +302,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = gnumeric
+@@ -364,8 +345,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -522,7 +503,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/scm/gnumeric/Makefile.in b/src/scm/gnumeric/Makefile.in
+index a0713c0..b324e02 100644
+--- a/src/scm/gnumeric/Makefile.in
++++ b/src/scm/gnumeric/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,10 +38,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -159,6 +158,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -166,29 +167,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +232,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -271,7 +254,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -305,7 +287,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ gncscmdir = ${GNC_SCM_INSTALL_DIR}/gnumeric
+@@ -329,8 +310,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+diff --git a/src/tax/Makefile.in b/src/tax/Makefile.in
+index 39f79c7..6b49d62 100644
+--- a/src/tax/Makefile.in
++++ b/src/tax/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -37,10 +37,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -161,6 +160,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -168,29 +169,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -252,6 +234,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -273,7 +256,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -307,7 +289,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = us
+@@ -318,8 +299,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -425,7 +406,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/tax/us/Makefile.in b/src/tax/us/Makefile.in
+index 2e09c59..cd15682 100644
+--- a/src/tax/us/Makefile.in
++++ b/src/tax/us/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -196,6 +195,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -203,29 +204,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -287,6 +269,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -308,7 +291,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -342,7 +324,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = . test
+@@ -385,8 +366,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -584,7 +565,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff --git a/src/tax/us/test/Makefile.in b/src/tax/us/test/Makefile.in
+index e8323f4..f49476f 100644
+--- a/src/tax/us/test/Makefile.in
++++ b/src/tax/us/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -39,10 +39,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -170,6 +169,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -177,29 +178,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -261,6 +243,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -282,7 +265,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -316,7 +298,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+
+@@ -342,8 +323,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -418,7 +399,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -461,7 +442,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -472,7 +453,7 @@ check-TESTS: $(TESTS)
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -484,7 +465,7 @@ check-TESTS: $(TESTS)
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -498,36 +479,23 @@ check-TESTS: $(TESTS)
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff --git a/src/test-core/Makefile.in b/src/test-core/Makefile.in
+index 4db0eee..608f67f 100644
+--- a/src/test-core/Makefile.in
++++ b/src/test-core/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -40,10 +40,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/macros/ac_pkg_swig.m4 \
+ $(top_srcdir)/macros/as-scrub-include.m4 \
+ $(top_srcdir)/macros/binreloc.m4 \
+- $(top_srcdir)/macros/compiler-flags.m4 \
+ $(top_srcdir)/macros/gnome-guile-checks.m4 \
+ $(top_srcdir)/macros/legacy_macros.m4 \
+- $(top_srcdir)/macros/pkg.m4 $(top_srcdir)/configure.in
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -177,6 +176,8 @@ GUILE_INCS = @GUILE_INCS@
+ GUILE_LIBS = @GUILE_LIBS@
+ GUILE_TOOLS = @GUILE_TOOLS@
+ HTMLHELP_LIBS = @HTMLHELP_LIBS@
++IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
++IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -184,29 +185,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -268,6 +250,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
+ USE_LIBQOF = @USE_LIBQOF@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ abs_builddir = @abs_builddir@
+@@ -289,7 +272,6 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-cflags_set = @cflags_set@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -323,7 +305,6 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ noinst_LTLIBRARIES = libgncmod-test.la
+@@ -348,8 +329,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -426,7 +407,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
commit bba68dfae7a9f3852a13efb65b3f0f9f293c3dcc
Author: John Ralls <john at Methuselah.local>
Date: Mon May 4 16:16:58 2009 -0700
Now works with Tiger on PPC
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 49355e7..0bbf200 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -1,43 +1,25 @@
# -*- mode: python -*-
-import sys
-if sys.hexversion < 0x2050000:
- print "Python version %s, version 2.5 required" % sys.version
- sys.exit
#checkoutroot = '/usr/local/src/gnome'
#prefix = '/usr/local/gtk'
-
-#This somehow fell out of jhbuildrc:
-environ_prepend("PATH", prefix + "/bin")
if _osx_version.startswith("8."):
os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.4"
+ module_makeargs["gtk+"]="LDFLAGS='-framework AppKit -framework Carbon -framework CoreFoundation -framework ApplicationServices -lobjc'"
+ module_makeargs["ige-mac-integration"]="LDFLAGS='-framework AppKit -lobjc'"
+ module_makeargs["aqbanking"]="LDFLAGS='-liconv'"
+ # setup_sdk_10_4()
+ pass
else:
os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.5"
+ skip.append("bison")
-autogenargs='--disable-static --enable-shared --disable-gtk-doc --disable-docs --disable-scrollkeeper --disable-xlib'
-
-
-module_autogenargs={}
+autogenargs=autogenargs + ' --disable-xlib'
module_autogenargs["gconf"]="--enable-static --enable-shared --disable-scrollkeeper --disable-xlib"
module_autogenargs["libofx"]="--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib"
-module_autogenargs["libgnomeui"]="--disable-static --enable-shared --disable-scrollkeeper --disable-xlib --without-x"
-
-
-
-module_makeargs = {}
-module_makeargs["perl-xml-parser"]="EXPATLIBPATH=" + prefix + "/lib EXPATINCPATH=${prefix}/include "
-
-
-
-if os.path.exists( prefix + '/bin/install-check'):
- os.environ['INSTALL'] = prefix + '/bin/iinstall-check'
+#module_autogenargs["libgnomeui"]="--disable-static --enable-shared --disable-scrollkeeper --disable-xlib --without-x"
-#Comment this out if you want to build with your default sdk; make a
-#similar function (it's in .jhbuildrc) if you want to set a different
-#sdk altogether.
-#setup_sdk_10_4()
-moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
+#moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
#build_policy = "updated-deps"
commit 0b9a0ea01113d2d18afda7110ee1484271bcf5b3
Author: John Ralls <john at Methuselah.local>
Date: Mon May 4 16:16:08 2009 -0700
removed cups, added bison
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index a6f20da..b99d819 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -70,21 +70,19 @@ Optionally you may want to install GConf 1.0.7 (or later).
<dep package="enchant"/>
</dependencies>
</autotools>
-
- <autotools id="cups-1.2.12">
- <branch module="cups/cups-1.2.12-source.tar.gz" version="1.2.12"
- repo="sourceforge.net"/>
- </autotools>
-
<autotools id="libgnomecups">
<branch revision="236"/>
<dependencies>
- <dep package="cups-1.2.12"/>
<dep package="glib"/>
<dep package="gnome-common"/>
</dependencies>
</autotools>
+ <autotools id="bison">
+ <branch module="bison/bison-2.3.tar.gz" version="2.3"
+ repo="ftp.gnu.org"/>
+ </autotools>
+
<autotools id="libgnomeprint" autogen.sh="autoreconf">
<branch module="libgnomeprint/2.18/libgnomeprint-2.18.6.tar.gz"
repo="ftp.gnome.org" version="2.18.6"
@@ -92,7 +90,8 @@ Optionally you may want to install GConf 1.0.7 (or later).
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/libgnomeprint.patch" skip="0"/>
</branch>
<dependencies>
- <dep package="intltool"/>
+ <dep package="bison"/>
+ <dep package="intltool"/>
<dep package="libart_lgpl"/>
<dep package="glib"/>
<dep package="gnome-common"/>
commit f643df5b5d6f5375e5995e8abd04c081ecb06327
Author: John Ralls <john at Methuselah.local>
Date: Mon May 4 16:15:29 2009 -0700
set version tags
diff --git a/modulesets/goffice.modules b/modulesets/goffice.modules
index 6b2c3b9..8571b8c 100644
--- a/modulesets/goffice.modules
+++ b/modulesets/goffice.modules
@@ -39,7 +39,7 @@ You need: Debian package name
</autotools>
<autotools id="libgsf">
- <branch/>
+ <branch revision="1034"/>
<dependencies>
<dep package="glib"/>
<dep package="gnome-vfs"/>
@@ -48,7 +48,7 @@ You need: Debian package name
</autotools>
<autotools id="libart_lgpl">
- <branch/>
+ <branch revision="280"/>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
<dep package="meta-gtk-osx-core"/>
commit cc01a822f4aa9f38bb07bd8105ab0a526c4ee977
Author: John Ralls <john at Methuselah.local>
Date: Mon May 4 16:14:06 2009 -0700
changed include to point to jralls fork of gtk-osx-build
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index e05b4cd..8101d91 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -5,7 +5,7 @@
<repository type="svn" name="svn.gnome.org" default="yes"
href="http://svn.gnome.org/svn/"/>
<repository type="tarball" name="kernel.org"
- href="http://www.kernel.org/pub/linux/"/>
+ href="http://www.kernel.org/pub/linux/"/>
<repository type='tarball' name='ftp.gnu.org'
href="ftp://ftp.gnu.org/gnu/"/>
<!--repository type='tarball' name='www.freedesktop.org'
@@ -22,7 +22,7 @@
- <include href="http://github.com/rhult/gtk-osx-build/raw/master/modulesets/gtk-osx.modules"/>
+ <include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets/gtk-osx.modules"/>
<include href="gtkhtml.modules"/>
<include href="goffice.modules"/>
@@ -86,7 +86,7 @@
</autotools>
<autotools id="gnucash" autogen-sh="configure"
- autogenargs="--enable-ofx --enable-aqbanking">
+ autogenargs="--enable-ofx --enable-aqbanking ">
<branch module="gnucash-2.2.9.tar.gz" version="2.2.9"
repo="gnucash.org">
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-xlib.patch" skip="0"/>
commit 429112316e6200a927406693e4492c9382a55e72
Author: John Ralls <john at Methuselah.local>
Date: Mon May 4 16:12:26 2009 -0700
deleted duplicate gtk-osx-random-modules
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
deleted file mode 100644
index 3c815c0..0000000
--- a/modulesets/gtk-osx-random.modules
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0"?><!--*- mode: xml; indent-tabs-mode: nil -*-->
-<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
-<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
-<moduleset>
- <repository type="svn" name="svn.gnome.org" default="yes" href="http://svn.gnome.org/svn/"/>
- <repository type="git" name="git.imendio.com" href="git://git.imendio.com/projects/"/>
- <repository type="svn" name="inkscape.svn.sourceforge.net" href="https://inkscape.svn.sourceforge.net/svnroot/inkscape/"/>
- <repository type="svn" name="ardour" href="http://subversion.ardour.org/svn/"/>
- <repository type="git" name="github.com" href="git://github.com/"/>
-
- <autotools id="loudmouth" autogenargs="--with-ssl=openssl">
- <branch repo="github.com" module="hallski/loudmouth.git" checkoutdir="loudmouth" />
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="glib"/>
- </after>
- </autotools>
-
- <autotools id="gossip">
- <branch/>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="meta-gtk-osx-themes"/>
- <dep package="meta-gtk-osx-core"/>
- </after>
- <dependencies>
- <dep package="loudmouth"/>
- <dep package="libglade"/>
- </dependencies>
- </autotools>
-
- <autotools id="gtksourceview" autogenargs="--disable-gnome-print">
- <branch revision="gnome-2-18"/> <!-- module="ardour2" checkoutdir="ardour"/-->
- <after>
- <dep package="meta-gtk-osx-core"/>
- </after>
- </autotools>
-
- <autotools id="libIDL">
- <branch/>
- <after>
- <dep package="meta-gtk-osx-core"/>
- </after>
- </autotools>
- <autotools id="ORBit2">
- <branch/>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- </after>
- <dependencies>
- <dep package="libIDL"/>
- </dependencies>
- </autotools>
- <autotools id="gconf">
- <branch/>
- <dependencies>
- <dep package="ORBit2"/>
- <dep package="libxml2"/>
- <dep package="dbus-glib"/>
- </dependencies>
- </autotools>
-
- <tarball id="lcms" version="1.17">
- <source href="http://www.littlecms.com/lcms-1.17.tar.gz"
- md5sum="07bdbb4cfb05d21caa58fe3d1c84ddc1" size="898816"/>
- </tarball>
-
- <tarball id="shared-mime-info" supports-non-srcdir-builds="no" version="0.19">
- <source href="http://freedesktop.org/~hadess/shared-mime-info-0.19.tar.gz"
- md5sum="056a86a8245aecfd9c80740380c5265a" size="595168"/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="libxml2"/>
- <dep package="glib"/>
- </dependencies>
- </tarball>
-
- <autotools id="gimp" autogenargs="--disable-python --disable-print --without-x">
- <branch/>
- <dependencies>
- <dep package="gtk+"/>
- <dep package="lcms"/>
- <dep package="libart_lgpl"/>
- <dep package="fontconfig"/>
- <dep package="gegl"/>
- </dependencies>
- </autotools>
-
- <autotools id="babl">
- <branch/>
- </autotools>
-
- <autotools id="gegl">
- <branch/>
- <dependencies>
- <dep package="babl"/>
- </dependencies>
- </autotools>
-
- <autotools id="libart_lgpl">
- <branch/>
- <dependencies>
- <dep package="glib"/>
- </dependencies>
- </autotools>
-
- <autotools id="libgnomecanvas">
- <branch/>
- <dependencies>
- <dep package="gtk+"/>
- <dep package="libart_lgpl"/>
- </dependencies>
- </autotools>
-
- <tarball autogenargs="--disable-selinux --disable-static --enable-shared" id="dbus" version="1.2.1">
- <source href="http://dbus.freedesktop.org/releases/dbus/dbus-1.2.1.tar.gz" />
- <dependencies>
- <dep package="glib"/>
- </dependencies>
- <after>
- <dep package="gtk+"/>
- </after>
- </tarball>
-
- <tarball id="dbus-glib" autogenargs="--disable-selinux --disable-static --enable-shared" version="0.74">
- <source href="http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.74.tar.gz"/>
- <dependencies>
- <dep package="libxml2"/>
- <dep package="dbus"/>
- <dep package="glib"/>
- </dependencies>
- </tarball>
-
- <tarball id="poppler" version="0.5.9"
- autogenargs="--disable-qt --disable-qt4 --without-x --disable-gtk-test --enable-xpdf-headers">
- <source href="http://poppler.freedesktop.org/poppler-0.5.9.tar.gz"
- md5sum="8d1ac008614c0e413bcac95b8102fa07" size="1169002"/>
- <dependencies>
- <dep package="cairo"/>
- </dependencies>
- <after>
- <dep package="gtk+"/>
- </after>
- </tarball>
-
- <!-- Inkscape doesn't work with 0.6.x yet
- href="http://poppler.freedesktop.org/poppler-0.6.1.tar.gz"
- md5sum="78a5f8ff1a3464eddb127577eea7a191" size="1286501"/
- -->
-
- <!-- This is just the upstream tarball but had to be retarred
- instead of patched since the tarball is broken.
- -->
- <tarball id="popt" version="1.7">
- <source href="http://people.imendio.com/richard/gtk-osx/files/popt-1.7.tar.gz"
- md5sum="a13a3c7ec893200db3e0287dfd40487d" size="575089"/>
- </tarball>
-
- <tarball id="gc" version="6.7" checkoutdir="gc6.7">
- <source href="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc.tar.gz"
- md5sum="be780413a0360306ad3b701e45fa8871" size="755999"/>
- </tarball>
-
- <tarball id="libsamplerate" version="0.1.2">
- <source href="http://www.mega-nerd.com/SRC/libsamplerate-0.1.2.tar.gz"
- md5sum="06861c2c6b8e5273c9b80cf736b9fd0e" size="707867"/>
- </tarball>
- <tarball id="raptor" version="1.4.15" autogenargs="--disable-www">
- <source href="http://download.librdf.org/source/raptor-1.4.15.tar.gz"
- md5sum="658fac0c25d50274c879f6cc49c3364b" size="1445553"/>
- <dependencies>
- <dep package="libxslt"/>
- </dependencies>
- </tarball>
-
- <!-- this doesn't build, needs:
- make -k install
- -->
- <tarball id="liblrdf" version="0.4.0">
- <source href="http://switch.dl.sourceforge.net/sourceforge/lrdf/liblrdf-0.4.0.tar.gz"
- md5sum="327a5674f671c4b360c6353800226877" size="336959"/>
- <dependencies>
- <dep package="raptor"/>
- </dependencies>
- </tarball>
- <tarball id="jack" version="0.103.0">
- <source href="http://mesh.dl.sourceforge.net/sourceforge/jackit/jack-audio-connection-kit-0.103.0.tar.gz"
- md5sum="03a0f63b997ce7b83a1eeaa6b80f4388" size="763244"/>
- </tarball>
- <tarball id="liblo" version="0.24">
- <source href="http://users.ecs.soton.ac.uk/~njh/liblo/liblo-0.24.tar.gz"
- md5sum="a9b5e7c6fcc835cd468e26cc95aba91a" size="432285"/>
- </tarball>
-
- <!-- - This needs to be configured manually, and libtool might need
- renaming temporarily while building so it doesn't conflict with
- /usr/bin/libtool.
-
- - Also $prefix/include/boost_*/boost needs to be symlinked to
- $prefix/include/boost
-
- - And SConstructs might need symlinking /usr/local -> $prefix.
- -->
- <tarball id="boost" version="1.34.1">
- <source href="http://dfn.dl.sourceforge.net/sourceforge/boost/boost_1_34_1.tar.bz2"
- md5sum="2d938467e8a448a2c9763e0a9f8ca7e5" size="12986931"/>
- </tarball>
-
- <!-- this is not an autotools module, uses scons:
- scons PREFIX=/opt/gtk GTKOSX=yes install
- -->
- <autotools id="ardour">
- <branch repo="ardour" revision="2.0-ongoing" module="ardour2" checkoutdir="ardour"/>
- <dependencies>
- <dep package="gtk+"/>
- <dep package="libgnomecanvas"/>
- <dep package="gconf"/>
- <dep package="libsamplerate"/>
- <dep package="raptor"/>
- <dep package="liblrdf"/>
- <dep package="liblo"/>
- <dep package="jack"/>
- <dep package="boost"/>
- </dependencies>
- </autotools>
-
- <autotools id="inkscape">
- <branch repo="inkscape.svn.sourceforge.net"/>
- <dependencies>
- <dep package="poppler"/>
- <dep package="gtkmm"/>
- <dep package="popt"/>
- <dep package="gc"/>
- <dep package="boost"/>
- <dep package="lcms"/>
- </dependencies>
- </autotools>
-
-</moduleset>
commit 5f31b02c122d3d2dda20ed005e8bce03fc4f5d6d
Author: John Ralls <john at Methuselah.local>
Date: Tue Apr 21 13:04:05 2009 -0700
Changed dbus patch from bus/Makefile.in to Makefile.in
diff --git a/patches/dbus-install.patch b/patches/dbus-install.patch
index 48ae6b6..924a1c2 100644
--- a/patches/dbus-install.patch
+++ b/patches/dbus-install.patch
@@ -1,19 +1,57 @@
---- bus/Makefile.in 2009-01-06 16:30:41.000000000 -0800
-+++ bus/Makefile.in 2009-03-23 12:35:39.000000000 -0700
-@@ -1295,6 +1295,7 @@
- $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
- $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
- $(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1
-+ $(mkinstalldirs) $(DESTDIR)/tmp
- $(INSTALL_PROGRAM) dbus-daemon-launch-helper $(DESTDIR)$(libexecdir)
- if test `id -u` -eq 0; then \
- chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
-@@ -1303,6 +1304,8 @@
- echo "Not installing $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \
- echo "You'll need to manually set permissions to root:$(DBUS_USER) and permissions 4750"; \
- fi
-+ $(DESTDIR)$(bindir)/dbus-uuidgen --ensure=$(DESTDIR)$(localstatedir)/lib/dbus/machine-id
+--- Makefile.in 2009-01-06 16:30:43.000000000 -0800
++++ Makefile.in 2009-04-19 15:06:17.000000000 -0700
+@@ -762,6 +762,8 @@
+ info-am:
+
+ install-data-am: install-pkgconfigDATA
++ @$(NORMAL_INSTALL)
++ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+ install-dvi: install-dvi-recursive
+
+@@ -800,7 +802,7 @@
+ uninstall-am: uninstall-pkgconfigDATA
+
+ .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++ install-data-am install-strip
+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am all-local am--refresh check check-am clean \
+@@ -809,15 +811,16 @@
+ dist-zip distcheck distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+- install-ps-am install-strip installcheck installcheck-am \
+- installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am uninstall-pkgconfigDATA
++ install install-am install-data install-data-am \
++ install-data-hook install-dvi install-dvi-am install-exec \
++ install-exec-am install-html install-html-am install-info \
++ install-info-am install-man install-pdf install-pdf-am \
++ install-pkgconfigDATA install-ps install-ps-am install-strip \
++ installcheck installcheck-am installdirs installdirs-am \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am \
++ uninstall-pkgconfigDATA
+
+
+ all-local: Doxyfile
+@@ -854,6 +857,10 @@
+
+ @DBUS_GCOV_ENABLED_FALSE at check-coverage:
+ @DBUS_GCOV_ENABLED_FALSE@ echo "Need to reconfigure with --enable-gcov"
+
++install-data-hook:
++ $(mkinstalldirs) $(DESTDIR)/tmp
++ $(DESTDIR)$(bindir)/dbus-uuidgen --ensure=$(DESTDIR)$(localstatedir)/lib/dbus/machine-id
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
commit c3706f4319ef7601bd6179ee8af5ba24f85068d3
Author: John Ralls <john at Methuselah.local>
Date: Sun Apr 19 15:30:09 2009 -0700
Added ending newline to gnucash-xlib.patch
diff --git a/patches/gnucash-xlib.patch b/patches/gnucash-xlib.patch
index 972aa60..818476f 100644
--- a/patches/gnucash-xlib.patch
+++ b/patches/gnucash-xlib.patch
@@ -8,4 +8,4 @@
+for ac_header in glob.h
do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
\ No newline at end of file
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
commit 1287ff57d7cbecb7820392fe6ed045fd4531f549
Author: John Ralls <john at Methuselah.local>
Date: Sun Apr 19 15:26:36 2009 -0700
Reset destination to write the bundle into cwd
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 9f259db..c7c5d2e 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -16,7 +16,7 @@
app. If you leave out the path, the current directory is
used.
-->
- <destination overwrite="yes">${env:HOME}/gnucash-bundler</destination>
+ <!--destination overwrite="yes">${env:HOME}/gnucash-bundler</destination-->
<image>
<!-- Not implemented yet (DMG image). -->
commit 9d7c5867240097c1bd3a6bf5169b238d9eb9bac4
Author: John Ralls <john at Methuselah.local>
Date: Sat Apr 18 16:58:05 2009 -0700
Fixed error in cups archive name in gtkhtml.modules
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index 5577ef1..a6f20da 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -20,6 +20,8 @@
href="ftp://xmlsoft.org/libxml2/python/"/>
<repository type="tarball" name="freedesktop.org"
href="http://dbus.freedesktop.org/releases/"/>
+ <repository type="tarball" name="sourceforge.net"
+ href ="http://downloads.sourceforge.net/"/>
<metamodule id="meta-gtkhtml">
<dependencies>
@@ -56,7 +58,7 @@ later).
Optionally you may want to install GConf 1.0.7 (or later).
-->
- <branch/>
+ <branch revision="gnome-2-26"/>
<dependencies>
<dep package="gtk+"/>
<dep package="libgnomeui"/>
@@ -69,9 +71,15 @@ Optionally you may want to install GConf 1.0.7 (or later).
</dependencies>
</autotools>
+ <autotools id="cups-1.2.12">
+ <branch module="cups/cups-1.2.12-source.tar.gz" version="1.2.12"
+ repo="sourceforge.net"/>
+ </autotools>
+
<autotools id="libgnomecups">
- <branch/>
+ <branch revision="236"/>
<dependencies>
+ <dep package="cups-1.2.12"/>
<dep package="glib"/>
<dep package="gnome-common"/>
</dependencies>
@@ -84,7 +92,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/libgnomeprint.patch" skip="0"/>
</branch>
<dependencies>
- <dep package="intltool"/>
+ <dep package="intltool"/>
<dep package="libart_lgpl"/>
<dep package="glib"/>
<dep package="gnome-common"/>
@@ -95,7 +103,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
</autotools>
<autotools id="libgnomeprintui">
- <branch/>
+ <branch revision="2716"/>
<dependencies>
<dep package="libgnomeprint"/>
<dep package="gtk+"/>
@@ -133,7 +141,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
but building them on OS-X proved problematic and gnome-vfs builds well
without them -->
<autotools id="gnome-vfs">
- <branch/>
+ <branch revision="5547"/>
<dependencies>
<dep package="gconf"/>
<dep package="shared-mime-info"/>
@@ -166,7 +174,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
</autotools>
<autotools id="gnome-keyring">
- <branch/>
+ <branch revision="gnome-2-26"/>
<dependencies>
<dep package="gtk+"/>
<dep package="libgcrypt"/>
@@ -176,7 +184,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
<autotools id="libbonobo">
<!-- DEPENDS says "ORBit" -->
- <branch/>
+ <branch revision="3527"/>
<dependencies>
<dep package="popt"/>
<dep package="ORBit2"/>
@@ -188,7 +196,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
</autotools>
<autotools id="libbonoboui">
- <branch/>
+ <branch revision="2665"/>
<dependencies>
<dep package="libgnome"/>
<dep package="libbonobo"/>
@@ -198,7 +206,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
</autotools>
<autotools id="libgnome" autogenargs="--disable-esd" >
- <branch/>
+ <branch revision="3912"/>
<dependencies>
<dep package="libxml2"/>
<dep package="libxslt"/>
@@ -235,7 +243,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
</autotools>
<autotools id="libgnomecanvas">
- <branch/>
+ <branch revision="1349"/>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
<dep package="meta-gtk-osx-core"/>
commit a76747d94ceee74ec1ca2081cd73adbcf1310d7e
Author: jralls <jralls at ceridwen.us>
Date: Tue Mar 31 20:32:46 2009 -0700
Corrected error in file path
diff --git a/patches/libgnomeprint.patch b/patches/libgnomeprint.patch
index 0f89885..3d1a6fe 100644
--- a/patches/libgnomeprint.patch
+++ b/patches/libgnomeprint.patch
@@ -1,5 +1,5 @@
-*** /usr/local/src/gnome3/libgnomeprint-2.18.6/configure~ Fri Mar 6 02:31:09 2009
---- /usr/local/src/gnome3/libgnomeprint-2.18.6/configure Sun Mar 22 10:38:33 2009
+*** configure Fri Mar 6 02:31:09 2009
+--- configure Sun Mar 22 10:38:33 2009
***************
*** 20084,20090 ****
esac
commit 74e6d2da3fef85fb60798c01918ecfb06f7e795e
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Mar 31 14:20:48 2009 -0700
Fixed error in dbus-glib module tag, thanks to Mike Evans
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index 5a70518..5577ef1 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -212,7 +212,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
<autotools id="dbus" autogen-sh='configure'
autogenargs="--disable-selinux --without-x
--with-session-socket-dir=$PREFIX/tmp">
- <branch module=" dbus/dbus-1.2.12.tar.gz" version="1.2.12"
+ <branch module="dbus/dbus-1.2.12.tar.gz" version="1.2.12"
repo="freedesktop.org">
<patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/dbus-install.patch"/>
</branch>
commit e48d5c401f178b20800b734f973a911389ee32e5
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Mar 24 11:48:18 2009 -0700
Cleaned up gnucash-bundler, fixed a couple of problems with gnucash-launcher, renamed gnucash-icons-48x48.icns to just gnucash.icns, fixed gnucash.bundle to copy gnucash.icns from here instead of $PREFIX/share/gnucash/pixmaps, fixed gnucash.bundle to include some more etc/ subdirs, tarred up the result.
diff --git a/gnucash-bundler.tar.gz b/gnucash-bundler.tar.gz
index cc9a1f5..7fef277 100644
Binary files a/gnucash-bundler.tar.gz and b/gnucash-bundler.tar.gz differ
diff --git a/gnucash-bundler/.rsync-rules b/gnucash-bundler/.rsync-rules
deleted file mode 100644
index 8cb4246..0000000
--- a/gnucash-bundler/.rsync-rules
+++ /dev/null
@@ -1 +0,0 @@
-+ */
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 659c9cc..9f259db 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -87,6 +87,14 @@
"${bundle}", which refers to the bundle root directory.
-->
<data>
+ ${prefix}/etc/gnucash
+ </data>
+
+ <data>
+ ${prefix}/etc/xdg
+ </data>
+
+ <data>
${prefix}/share/gnucash
</data>
@@ -108,7 +116,7 @@
</data>
<data dest="${bundle}/Contents/Resources">
- ${prefix}/share/gnucash/pixmaps/gnucash.icns
+ ${project}/gnucash.icns
</data>
<data dest='${bundle}/Contents/Resources/lib/'>
diff --git a/gnucash-bundler/gnucash-icon-48x48.icns b/gnucash-bundler/gnucash.icns
similarity index 100%
rename from gnucash-bundler/gnucash-icon-48x48.icns
rename to gnucash-bundler/gnucash.icns
commit 5dab405347de25dcd7146e3fe7753f4b6a3fa482
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 23 15:22:33 2009 -0700
Add README.markdown for a pretty set of instructions on the github page.
diff --git a/README.markdown b/README.markdown
new file mode 100644
index 0000000..faa6af5
--- /dev/null
+++ b/README.markdown
@@ -0,0 +1,79 @@
+#Building GnuCash with GTK-OSX#
+##Overview##
+
+GnuCash can be built to run more or less natively on OSX -- meaning
+without X11. Better yet, the build is almost automatic.
+
+I've succeeded in building this under various incarnations of Leopard
+while perfecting the modulesets, always on a Mac Pro... but it ought
+to work on any Mac running Tiger or Leopard.
+
+The default configuration builds in your home folder. On my system, I
+build in /usr/local/src/gnome and install to /usr/local/gtk. If you
+want to do that, uncomment the checkoutroot and prefix lines in
+.jhbuildrc-custom, then create the folders up front and give yourself
+ownership. If you don't know how to do that, then you should probably
+leave it the way it is.
+
+##Preliminaries##
+Tiger or newer is <em>required</em> for gtk-osx.
+
+You need Python 2.5 to run jhbuild. This is already part of Leopard
+(OSX 10.5), but Tiger (10.4) provided Python 2.3, so the gtk-osx
+maintainer has included logic to make a new python for Tiger users.
+
+Download
+ http://github.com/jralls/gnucash-on-osx/raw/master/.jhbuildrc-custom
+into your home directory.
+
+Note that by default, jhbuild will put everything into your home
+directory. I prefer to build and install into /usr/local, so you'll
+find commented out settings to do it that way at the top of
+.jhbuildrc-custom. You can uncomment these and change them to whatever
+you like -- or leave them as they are.
+
+Go to http://live.gnome.org/GTK%2B/OSX/BuildInstructions and follow
+the instructions. <b><em>Don't run jhbuild build yet!</em></b>
+
+At the moment, in order to build gtk-doc (which is required by a bunch
+of packages), you need python bindings for libxml2. For Leopard users,
+if you don't have this installed somewhere on your $PYTHONPATH, and
+for all Tiger users, run
+
+ $> jhbuild buildone libxml-py
+
+##Building##
+
+Once all of the preliminaries are complete, run:
+ $> jhbuild build
+
+##Running from the commandline##
+
+Now you're ready to try it out:
+ $> $PREFIX/bin/gnucash
+
+##Making a Bundle##
+
+So far so good, but you don't really want to have to open a Terminal
+window every time you want to use GnuCash, now do you? Of course
+not. You want a nice icon in your Applications folder (and maybe in
+the Dock) to click on when you run GnuCash. Here's how to do this:
+
+ * Download the bundler from http://github.com/jralls/gnucash-on-osx/raw/master/ige-mac-bundler.tar.gz, unpack it, cd into the ige-mac-bundler directory, and
+ make install
+ * Download http://github.com/jralls/gnucash-on-osx/raw/master/gnucash-bundler.tar.gz and unpack it.
+ *
+ cd gnucash-bundler</tt>
+ * Look through gnucash-launcher and gnucash.bundle and adjust the paths to match your installation.
+ * make gnucash-launcher executable :
+ chmod +x gnucash-launcher
+ * execute
+ jhbuild shell
+ to set up the environment for the bundler
+ * while in the shell, execute
+ ige-mac-bundler gnucash.bundle
+ * exit the shell
+
+And your bundle should be ready to go.
+Try <tt>GnuCash.app/Contents/MacOSX/GnuCash</tt> from the command-line so that you can see any error messages. If that works, try <tt>open GnuCash.app</tt>. If that works, then you can move GnuCash.app to your Applications folder and it's ready to use. <em>Don't move or remove the installation directory (~/gtk/inst by default): Both dbus and GnuCash have links pointing into it which can't at present be changed.</em>
+
commit 92e7ae517d5e55cfd86554a405afbd8059345a1e
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 23 15:04:04 2009 -0700
Updated build instructions, greatly simplified because the new modulesets and patchfiles automate most everything.
diff --git a/Gnucash Build Instructions b/Gnucash Build Instructions
index b49ac9e..2e028fe 100644
--- a/Gnucash Build Instructions
+++ b/Gnucash Build Instructions
@@ -2,130 +2,44 @@
==Overview==
GnuCash can be built to run more or less natively on OSX -- meaning without X11. Better yet, the build is almost automatic.
-To pull this off, you'll need Developer Tools installed. The instructions which follow assume that you're comfortable building programs from the command line and editing text files.
+You can do this also with MacPorts: The details are described at MacOSX/MacPortsDetail. If you already have MacPorts installed, you should use that procedure, as gtk-osx doesn't work well with a MacPorts installation.
+
+If you want to have a clickable GnuCash.app to put in your Applications folder, this is the solution to use. If you want to be able to easily customize your installation, this is also the solution for you. Don't want all of the extra stuff that MacPorts drags in? Well, this might be a bit better... but GnuCash is notorious for its huge list of dependencies. Want to keep up with the latest work from the Gnome developers? This solution gets many of its packages directly from source-code-control... That's a double-edged sword, of course, because if a build gets broken, you're pretty well stuck until the developers for that package fix it.
+
+
I've succeeded in building this under various incarnations of Leopard while perfecting the modulesets, always on a Mac Pro... but it ought to work on any Mac running Tiger or Leopard.
The default configuration builds in your home folder. On my system, I build in /usr/local/src/gnome and install to /usr/local/gtk. If you want to do that, uncomment the checkoutroot and prefix lines in .jhbuildrc-custom, then create the folders up front and give yourself ownership. If you don't know how to do that, then you should probably leave it the way it is.
==Preliminaries==
+Tiger or newer is '''''required'''' for gtk-osx.
-Go to http://developer.imendio.com/projects/gtk-macosx/build-instructions and follow the instructions. '''''Don't run jhbuild build yet!'''''
+You need Python 2.5 to run jhbuild. This is already part of Leopard (OSX 10.5), but Tiger (10.4) provided Python 2.3, so the gtk-osx maintainer has included logic to make a new python for Tiger users.
-If you have set <tt>$MACOSX_DEPLOYMENT_TARGET</tt> to something other than your running version of OSX, you may get an error during jhbuld bootstrap.
+Download http://github.com/jralls/gnucash-on-osx/raw/master/.jhbuildrc-custom into your home directory.
-You may get an error about <tt>$PREFIX/inst/man/man1/cjpeg.1</tt> not existing. What this really means is that install wasn't set to make the directory, so select '[4] start shell" and mkdir -p $PREFIX/inst/man/man1, quit the shell, and select '[1] rerun stage install'.
+Note that by default, jhbuild will put everything into your home directory. I prefer to build and install into /usr/local, so you'll find commented out settings to do it that way at the top of .jhbuildrc-custom. You can uncomment these and change them to whatever you like -- or leave them as they are.
-Paste the code from [[#Customize jhbuildrc]] into a file named ".jhbuildrc-custom" in your home folder.
-Do likewise for [[#Gnucash Moduleset]], with a filename "gnucash.modules".
+Go to http://live.gnome.org/GTK%2B/OSX/BuildInstructions and follow the instructions. '''''Don't run jhbuild build yet!'''''
-==Building==
-
-Once all of the preliminaries are complete, do:
+At the moment, in order to build gtk-doc (which is required by a bunch of packages), you need python bindings for libxml2. For Leopard users, if you don't have this installed somewhere on your $PYTHONPATH, and for all Tiger users, run
<tt>
-$> jhbuild build
+$> jhbuild buildone libxml-py
</tt>
-You'll get a few errors:
-
-'''libgnomeprint''' has a defective configure.ac which fails when libm isn't found. I've filed a bug report (Bug 540837) with a patch, but a similar bug report (Bug 471730) has been sitting for a year, so there's no telling when the developers will get around to fixing this (and libgnomeprint is deprecated anyway). Here's the patch:
-
-<pre>
---- configure.in 2008-07-03 14:18:44.000000000 -0700
-+++ configure.in.mod 2008-07-03 14:17:11.000000000 -0700
-@@ -148,9 +148,17 @@
- dnl Checking for libm
- dnl =================================
- AC_CHECK_LIBM
--if test "x$LIBM" = "x"; then
-- AC_MSG_ERROR(You need -lm(mathematic library) for this version of libgnomeprint.)
--fi
-+case $host in
-+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-+ # These system don't have libm, or don't need it
-+ ;;
-+*)
-+ if test "x$LIBM" = "x"; then
-+ AC_MSG_ERROR(You need -lm(mathematic library) for this version of
-+libgnomeprint.)
-+ fi
-+ ;;
-+esac
- LDFLAGS="$LDFLAGS $LIBM"
-
- dnl =================================
-</pre>
-
-Select '[4] start shell', apply the patch (you probably will need to use <tt>patch -l</tt>) , quit the shell, and select "[6] go to stage configure"
-
-'''goffice''' will complain about a misconfiguration of gtk-doc. It doesn't matter, so select "[2] ignore error".
-
-'''libgnomeui''' Another configure.in bug (Bug 535958). The patch:
-<pre>
-Index: configure.in
-===================================================================
---- configure.in (revision 5608)
-+++ configure.in (working copy)
-@@ -116,7 +116,7 @@
- gnome_keyring_requirement="gnome-keyring-1 >= gnome_keyring_required_version"
- GNOME_KEYRING="gnome-keyring-1"
-
-- if test x$GNOME_HAVE_X11 != xyes ; then
-+ if test x$have_x != xdisabled && test x$GNOME_HAVE_X11 != xyes ; then
- AC_MSG_ERROR([libX11 not found])
- fi
- ;;
-
+If you have set <tt>$MACOSX_DEPLOYMENT_TARGET</tt> to something other than your running version of OSX, you may get an error during jhbuld bootstrap or later when building targets.
-</pre>
-
-Select "[4] start shell", apply the patch, quit the shell, and select "[1] rerun configure"
+==Building==
-'''slib''' will fail because it wants to install to /usr/local, and you'd have to be building with root authority for that to work. We don't want to install there anyway, so select "[4] start shell" and:
+Once all of the preliminaries are complete, run:
<tt>
-$> mkdir $PREFIX/lib/slib
-$> cp *.scm $PREFIX/lib/slib/
-$> cp guile.init $PREFIX/lib/slib
-$> cd $PREFIX/share/guile/1.6/
-$> ln -s ../../../lib/slib .
-$> $PREFIX/bin/guile
-guile> (use-modules (ice-9 slib))
-guile> (require 'new-catalog)
-guile> (quit)
+$> jhbuild build
</tt>
-Quit the shell and select "[2] ignore error and continue to done".
-You'll have to stop the build (control-c will do it) after the gnucash tarball unpacks to apply the following patch. '''''Make sure to do it before configure finishes!'''''
-Select "[4] start shell", apply the patch, exit the shell, and select "[1]" rerun configure'''.
-
-Here's the patch:
-<pre>
---- configure 2008-05-31 16:07:04.000000000 -0700
-+++ configure 2008-04-27 03:21:24.000000000 -0700
-@@ -23798,7 +23798,7 @@
- # These are unavailable on windows/mingw32
-
-
--for ac_header in X11/Xlib.h glob.h
-+for ac_header in glob.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-</pre>
==Running from the commandline==
-There's a few more things to fix before we can run GnuCash. GnuCash uses dbus to find its configuration data. First we need to fix up dbus's config file. Open $PREFIX/etc/dbus-1/session.conf in your editor. Quite near the top you'll see a line that looks something like
-<pre>
- <listen>unix:tmpdir=/var/folders/8Z/8ZMrxptP2RW3+U+8ZNMZY++++TI/-Tmp-/</listen>
-</pre>
-That's a perfectly valid temp directory... but dbus itself can't handle those +s, so change the spec to <code>unix:tmpdir=$PREFIX/tmp</code> and save the file.
-
-:Run <tt>$PREFIX/bin/dbus-uuidgen --ensure=$PREFIX/var/lib/dbus/machine-id</tt>
-
-:Rename <code>$PREFIX/lib/libjpeg.dylib, $PREFIX/lib/libtiff.dylib</code>, and <code>$PREFIX/lib/libpng.dylib</code> to something else (I use names like <code>$PREFIX/lib/libjpeg.dylib.hidden</code>).
-
-:Replace <code>$PREFIX/bin/gnucash</code> with the code from [[#GnuCash Start Script (commandline)]].
Now you're ready to try it out:
<tt>
@@ -135,10 +49,10 @@ $> $PREFIX/bin/gnucash
==Making a Bundle==
So far so good, but you don't really want to have to open a Terminal window every time you want to use GnuCash, now do you? Of course not. You want a nice icon in your Applications folder (and maybe in the Dock) to click on when you run GnuCash. Here's how to do this:
-:Install the bundler from http://developer.imendio.com/projects/gtk-macosx/creating-app-bundles.
-:I like to create a subfolder called gnucash-bundler and keep everything in there, but you don't have to.
-:Paste the contents of [[#GnuCash Bundle Description]] into a file called "gnucash.bundle", [[#Gnucash Info.Plist]] into "Info.Plist", and [[#Gnucash Start Script (Bundler)]] into "gnucash-launcher", all in the same folder.
-:Look through both files and adjust the paths to match your installation.
+:Download the bundler from http://github.com/jralls/gnucash-on-osx/raw/master/ige-mac-bundler.tar.gz, unpack it, cd into the ige-mac-bundler directory, and <tt>make install</tt>
+:Download http://github.com/jralls/gnucash-on-osx/raw/master/gnucash-bundler.tar.gz and unpack it.
+:<tt>cd gnucash-bundler</tt>
+:Look through gnucash-launcher and gnucash.bundle and adjust the paths to match your installation.
:make gnucash-launcher executable (<tt>chmod +x gnucash-launcher</tt>)
:execute <tt>jhbuild shell</tt> to set up the environment for the bundler
:while in the shell, execute <tt> ige-mac-bundler gnucash.bundle</tt>.
@@ -146,444 +60,3 @@ So far so good, but you don't really want to have to open a Terminal window ever
And your bundle should be ready to go.
Try <tt>GnuCash.app/Contents/MacOSX/GnuCash</tt> from the command-line so that you can see any error messages. If that works, try <tt>open GnuCash.app</tt>. If that works, then you can move GnuCash.app to your Applications folder and it's ready to use. '''''Don't move or remove the installation directory (~/gtk/inst by default): Both dbus and GnuCash have links pointing into it which can't at present be changed.'''''
-==Files==
-===Customize jhbuildrc===
-Paste this into .jhbuildrc-custom in your home folder:
-<pre>
-# -*- mode: python -*-
-
-#You can override the build and install directories by uncommenting
-#and editing the next two lines. Be sure to create these directories
-#and change their ownership to you before you try to build!
-#checkoutroot = '/usr/local/src/gnome'
-#prefix = '/usr/local/gtk'
-
-autogenargs='--disable-static --enable-shared --disable-gtk-doc --disable-docs --disable-scrollkeeper --disable-xlib'
-
-module_autogenargs={}
-module_autogenargs["gconf"]="--enable-static --enable-shared --disable-scrollkeeper --disable-xlib"
-module_autogenargs["libofx"]="--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib"
-module_autogenargs["libgnomeui"]="--disable-static --enable-shared --disable-scrollkeeper --disable-xlib --without-x"
-
-module_makeargs = {}
-module_makeargs["perl-xml-parser"]="EXPATLIBPATH=" + prefix + "/lib EXPATINCPATH=${prefix}/include "
-
-
-path = prefix + '/bin/install-check'
-if os.path.exists(path):
- os.environ['INSTALL'] = path
-#Comment this out if you want to build with your default sdk; make a
-#similar function (it's in .jhbuildrc) if you want to set a different
-#sdk altogether.
-#setup_sdk_10_4()
-
-
-moduleset = os.path.expanduser("~/gnucash.modules")
-
-modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
-
-build_policy = "updated-deps"
-</pre>
-
-===Gnucash Moduleset===
-Paste the following into a file named gnucash.modules in your home folder:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
-<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
-<moduleset>
- <repository type="svn" name="svn.gnome.org" default="yes"
- href="http://svn.gnome.org/svn/"/>
- <repository type="tarball" name="kernel.org"
- href="http://www.kernel.org/pub/linux/"/>
- <repository type='tarball' name='ftp.gnu.org'
- href="ftp://ftp.gnu.org/gnu/"/>
- <repository type='tarball' name='sourceforge'
- href="http://downloads.sourceforge.net/"/>
- <repository type="cvs" name="slib.savannah.gnu.org"
- cvsroot=":pserver:anonymous at cvs.savannah.gnu.org:/sources/slib"
- password=""/>
- <repository type="tarball" name="gnucash.org"
- href="http://www.gnucash.org/pub/gnucash/sources/stable/"/>
-
-
-
- <include
- href="http://people.imendio.com/richard/gtk-osx-build/modulesets/gtk-osx.modules"/>
-
-
- <tarball id='readline' autogen-sh='configure'>
- <source href='ftp://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz'/>
- <patches>
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-001' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-002' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-003' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-004' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-005' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-006' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-007' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-008' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-009' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-010' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-011' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-012' strip='2' />
- </patches>
- </tarball>
-
- <autotools id="OpenSP" autogen-sh='configure'
- autogenargs="--disable-static --enable-shared --disable-doc-build">
- <branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
- version='1.5.2'/>>
- </autotools>
-
- <autotools id="libofx" autogen-sh='configure'>
- <branch repo="sourceforge" module="libofx/libofx-0.9.0.tar.gz"
- version='0.9.0'/>
- <dependencies>
- <dep package='guile-1.6'/>
- <dep package="OpenSP"/>
- </dependencies>
- </autotools>
-
- <autotools id="guile-1.6" autogen-sh="configure"
- autogenargs="--disable-static --enable-shared
- --disable-scrollkeeper --disable-xlib">
- <branch repo="ftp.gnu.org" module="guile/guile-1.6.8.tar.gz"
- version="1.6.7" size="3114052" />
- <dependencies>
- <dep package='readline'/>
- </dependencies>
- </autotools>
-
- <autotools id="Slib" skip-autogen="true">
- <branch repo="slib.savannah.gnu.org"
- module="slib"/>
- <dependencies>
- <dep package="guile-1.6"/>
- </dependencies>
- </autotools>
-
- <autotools id="gnucash" autogen-sh="configure"
- autogenargs="--enable-ofx">
- <branch module="gnucash-2.2.5.tar.gz" version="2.2.5"
- repo="gnucash.org"/>
-
- <dependencies>
- <dep package="goffice"/>
- <dep package="libofx"/>
- <dep package="gtkhtml"/>
- <dep package="Slib"/>
- </dependencies>
-
- </autotools>
-
-</moduleset>
-</pre>
-
-===GnuCash Start Script (commandline)===
-Replace $PREFIX/bin/gnucash with this:
-<pre>
-PREFIX="~/gtk/inst/" #You'll have to fix this up if you changed it
-export PREFIX
-PATH="$PREFIX/bin:${PATH}"
-export PATH
-
-GUILE_WARN_DEPRECATED="no"
-export GUILE_WARN_DEPRECATED
-
-if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
- eval `dbus-launch --sh-syntax --exit-with-session --config-file=$PREFIX/etc/dbus-1/session.conf`
-fi
-
-GNC_MODULE_PATH="$PREFIX/lib/gnucash:${GNC_MODULE_PATH}"
-
-EXTRA_PATH="${EXTRA_PATH}:$PREFIX/share/gnucash/guile-modules"
-EXTRA_PATH="${EXTRA_PATH}:$PREFIX/share/gnucash/scm"
-GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
-
-EXTRA_LIBS="${GNC_MODULE_PATH}"
-EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
-EXTRA_LIBS="${EXTRA_LIBS}:$PREFIX/lib"
-EXTRA_LIBS="${EXTRA_LIBS}:$PREFIX/lib/gnucash"
-
-LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
-DYLD_LIBRARY_PATH="${EXTRA_LIBS}:${DYLD_LIBRARY_PATH}"
-
-export GNC_MODULE_PATH
-export GUILE_LOAD_PATH
-export LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH
-
-exec gnucash-bin "$@"
-</pre>
-===Gnucash Start Script (Bundler)===
-If you're going to use the bundler, paste this file into your bundle directory named gnucash-launcher; to run from the command line, put this in $PREFIX/bin/gnucash.
-<pre>
-#!/bin/sh
-
-if test "x$IGE_DEBUG_LAUNCHER" != x; then
- set -x
-fi
-
-if test "x$IGE_DEBUG_GDB" != x; then
- EXEC="gdb --args"
-else
- EXEC=exec
-fi
-
-name="`basename $0`"
-tmp="`pwd`/$0"
-tmp=`dirname "$tmp"`
-tmp=`dirname "$tmp"`
-bundle=`dirname "$tmp"`
-bundle_contents="$bundle"/Contents
-bundle_res="$bundle_contents"/Resources
-bundle_lib="$bundle_res"/lib
-bundle_bin="$bundle_res"/bin
-bundle_data="$bundle_res"/share
-bundle_etc="$bundle_res"/etc
-
-export DYLD_LIBRARY_PATH="$bundle_lib"
-export XDG_CONFIG_DIRS="$bundle_etc"/xdg
-export XDG_DATA_DIRS="$bundle_data"
-export GTK_DATA_PREFIX="$bundle_data"
-export GTK_EXE_PREFIX="$bundle_res"
-export GTK_PATH="$bundle_res"
-
-export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
-export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
-export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
-export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
-
-# We need a UTF-8 locale.
-export LANG="`grep \`defaults read .GlobalPreferences AppleCollationOrder 2>&1\`_ /usr/share/locale/locale.alias | tail -n1 | sed 's/\./ /' | awk '{print $2}'`.UTF-8"
-
-if test -f "$bundle_lib/charset.alias"; then
- export CHARSETALIASDIR="$bundle_lib"
-fi
-
-# Extra arguments can be added in environment.sh.
-EXTRA_ARGS="--config-path $bundle_etc/gnucash --share-path $bundle_data/gnucash --debug"
-
-if test -f "$bundle_res/environment.sh"; then
- source "$bundle_res/environment.sh"
-fi
-
-# Strip out the argument added by the OS.
-if [ x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ]; then
- shift 1
-fi
-
-PFX=${bundle_res}
-export PFX
-PATH="${PFX}/bin:${PATH}"
-export PATH
-
-GUILE_WARN_DEPRECATED="no"
-export GUILE_WARN_DEPRECATED
-
-if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
- eval `dbus-launch --sh-syntax --exit-with-session --config-file=$bundle_res/etc/dbus-1/session.conf`
-fi
-
-GNC_MODULE_PATH="${PFX}/lib/gnucash:${GNC_MODULE_PATH}"
-
-EXTRA_PATH="${EXTRA_PATH}:${PFX}/share/gnucash/guile-modules"
-EXTRA_PATH="${EXTRA_PATH}:${PFX}/share/gnucash/scm"
-GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
-
-EXTRA_LIBS="${GNC_MODULE_PATH}"
-EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
-EXTRA_LIBS="${EXTRA_LIBS}:${PFX}/lib"
-EXTRA_LIBS="${EXTRA_LIBS}:${PFX}/lib/gnucash"
-
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
-DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
-
-export GNC_MODULE_PATH
-export GUILE_LOAD_PATH
-export LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH
-
-$EXEC "$bundle_contents/MacOS/$name-bin" $* $EXTRA_ARGS
-</pre>
-
-===GnuCash Info.Plist===
-This is the Info.Plist required of all App Bundles. Paste into "Info.Plist" in the bundle directory.
-<pre>
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>GnuCash</string>
- <key>CFBundleGetInfoString</key>
- <string>GnuCash version 2.2.5 © 2007 Free Software Foundation</string>
- <key>CFBundleIconFile</key>
- <string>gnucash.icns</string>
- <key>CFBundleIdentifier</key>
- <string>org.gnucash.GnuCash</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleLongVersionString</key>
- <string>2.2.5 © 2007 Free Software Foundation</string>
- <key>CFBundleName</key>
- <string>GnuCash</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>2.2.5</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>2.2.5</string>
- <key>CSResourcesFileMapped</key>
- <true/>
- <key>LSRequiresCarbon</key>
- <true/>
- <key>NSHumanReadableCopyright</key>
- <string>Copyright 2007 Free Software Foundation</string>
-</dict>
-</plist>
-
-</pre>
-
-===GnuCash Bundle Description===
-This one configures the bundler to create the app bundle. Paste it into the bundler directory and name it 'gnucash.bundle':
-<pre>
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<app-bundle>
-
- <meta>
- <!-- Where to pick up the GTK+ installation, icon themes,
- etc. Note that "${env:PREFIX}" is evaluated to the value of
- the environment variable PREFIX, and likewise with HOME. You
- can define additional prefixes and refer to them in paths
- throughout this file on the form "${prefix:name}". This is
- useful for installing certain libraries or even the
- application itself separately.
- -->
- <prefix name="default">${env:PREFIX}</prefix>
-
- <!-- The project directory is the default location of the created
- app. If you leave out the path, the current directory is
- used.
- -->
- <destination overwrite="yes">${env:HOME}/gnucash-bundler</destination>
-
- <image>
- <!-- Not implemented yet (DMG image). -->
- </image>
- <run-install-name-tool/>
-
- <!-- Optionally specify a launcher script to use. If the
- application sets up everything needed itself, like
- environment variable, linker paths, etc, a launcher script is
- not needed. If the source path is left out, the default
- script will be used.
- -->
- <launcher-script>${project}/gnucash-launcher</launcher-script>
-
- <!-- Not implemented: Optional runtime, could be python or mono
- for example.
- -->
- <!--runtime copy="yes">/usr/bin/python</runtime-->
- </meta>
-
- <!-- The special macro "${project}" refers to the directory where
- this bundle file is located. The application name and bundle
- identifier are taken from the plist file.
- -->
- <plist>${project}/Info.plist</plist>
-
- <main-binary>${prefix}/bin/gnucash-bin</main-binary>
-
- <!-- Copy in GTK+ and Pango modules. Note the use of the
- "${pkg:module:variable}" macro, which evaluates to a pkg-config
- variable in the specified module. Note that any libraries that
- binaries link to are also copied in automatically.
- -->
- <binary>
- ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/loaders/*.so
- </binary>
- <binary>
- ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-fc.so
- </binary>
-
- <binary>
- ${prefix}/lib/GConf/2/*.so
- </binary>
-
- <binary>
- ${prefix}/lib/gnucash
- </binary>
- <binary>
- ${prefix}/libexec
- </binary>
-
- <binary>
- ${prefix}/bin/dbus-launch
- </binary>
-
- <binary>
- ${prefix}/bin/dbus-daemon
- </binary>
-
- <!-- Data to copy in, usually Glade/UI files, images, sounds files
- etc. The destination inside the bundle can be specified if the
- files should end up at a different location, by using the
- "dest" property. The destination must then start with the macro
- "${bundle}", which refers to the bundle root directory.
- -->
- <data>
- ${prefix}/share/gnucash
- </data>
-
- <data>
- ${prefix}/share/guile
- </data>
-
- <data>
- ${prefix}/share/gnome
- </data>
-
- <!--data dest="${bundle}/Contents/Resources/slib"-->
- <data>
- ${prefix}/lib/slib
- </data>
-
- <data dest="${bundle}/Contents/Resources">
- ${prefix}/share/gnucash/pixmaps/gnucash.icns
- </data>
-
- <data dest='${bundle}/Contents/Resources/lib/'>
- ${prefix}/lib/*.la
- </data>
-
- <data dest='${bundle}/Contents/Resources/var/lib/dbus/machine-id'>
- ${prefix}/var/lib/dbus/machine-id
- </data>
-
- <data dest='${bundle}/Contents/Resources/etc/dbus-1/'>
- ${prefix}/etc/dbus-1/
- </data>
-
-
- <!-- Icon themes to copy. The "icons" property can be either of
- "auto", "all", or "none". All or none should be
- self-explanatory, while auto means that the script will try to
- figure out which icons are needed. This is done by getting all
- the strings from all copied binaries, and matching them against
- icon names. To be safe, you should use "all". "none" is useful
- if you want just the index.theme file but no icons, mostly
- needed for the "hicolor" base theme.
- -->
- <!-- icon-theme icons="auto"/>
- Tango
- </icon-theme -->
-
-</app-bundle>
-</pre>
-
commit 7295439c07d5951aa971a918ee4d1156b99f3bde
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 23 14:54:44 2009 -0700
Created tarballs of gnucash-bundler and ige-mac-bundler for convenient downloading by GnuCash builders.
diff --git a/gnucash-bundler.tar.gz b/gnucash-bundler.tar.gz
new file mode 100644
index 0000000..cc9a1f5
Binary files /dev/null and b/gnucash-bundler.tar.gz differ
diff --git a/ige-mac-bundler.tar.gz b/ige-mac-bundler.tar.gz
new file mode 100644
index 0000000..34e824e
Binary files /dev/null and b/ige-mac-bundler.tar.gz differ
commit 2d5aab35b73e04c13474e39ca9f9984fc3752bdd
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 23 14:53:46 2009 -0700
Modulesets fixed up for completely automatic building of GnuCash
.jhbuildrc-custom cleaned up and setup to pull modulesets from github.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 7a72c30..49355e7 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -1,48 +1,46 @@
# -*- mode: python -*-
+import sys
+if sys.hexversion < 0x2050000:
+ print "Python version %s, version 2.5 required" % sys.version
+ sys.exit
-checkoutroot = '/usr/local/src/gnome3'
-prefix = '/usr/local/gtk3'
+#checkoutroot = '/usr/local/src/gnome'
+#prefix = '/usr/local/gtk'
#This somehow fell out of jhbuildrc:
environ_prepend("PATH", prefix + "/bin")
+if _osx_version.startswith("8."):
+ os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.4"
+else:
+ os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.5"
autogenargs='--disable-static --enable-shared --disable-gtk-doc --disable-docs --disable-scrollkeeper --disable-xlib'
-#environ_append("LDFLAGS", "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib")
-
module_autogenargs={}
module_autogenargs["gconf"]="--enable-static --enable-shared --disable-scrollkeeper --disable-xlib"
module_autogenargs["libofx"]="--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib"
module_autogenargs["libgnomeui"]="--disable-static --enable-shared --disable-scrollkeeper --disable-xlib --without-x"
-module_autogenargs["guile"]="ABI=32"
-#module_autogenargs["dbus"]="--localstatedir=/var"
-module_autogenargs["libxslt"]="--with-libxml-prefix=${prefix}"
-#NB: to compile libgnomeprint, one must repair a defect in
-#/usr/share/aclocal/libtool.m4, because libgnomeprint abuses it a bit:
-#Find the defun for AC_CHECK_LIBM, and for the $host case for darwin,
-#add
-#LIBM=" "
-#before the ";;"
+
module_makeargs = {}
module_makeargs["perl-xml-parser"]="EXPATLIBPATH=" + prefix + "/lib EXPATINCPATH=${prefix}/include "
-if os.path.exists(prefix + '/bin/install-check'):
- os.environ['INSTALL'] = prefix + '/bin/install-check'
+
+if os.path.exists( prefix + '/bin/install-check'):
+ os.environ['INSTALL'] = prefix + '/bin/iinstall-check'
+
#Comment this out if you want to build with your default sdk; make a
#similar function (it's in .jhbuildrc) if you want to set a different
#sdk altogether.
#setup_sdk_10_4()
-
-moduleset = os.path.join(os.environ['CONFIG_DIR'], "gnucash.modules")
-
+moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
-build_policy = "updated-deps"
+#build_policy = "updated-deps"
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index f99983d..e05b4cd 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -12,16 +12,17 @@
href="http://www.freedesktop.org/software/" /-->
<repository type='tarball' name='sourceforge'
href="http://downloads.sourceforge.net/"/>
- <repository type="cvs" name="slib.savannah.gnu.org"
+ <!-- <repository type="cvs" name="slib.savannah.gnu.org"
cvsroot=":pserver:anonymous at cvs.savannah.gnu.org:/sources/slib"
- password=""/>
+ password=""/> -->
+ <repository type="tarball" name="csail"
+ href="http://groups.csail.mit.edu/mac/ftpdir/"/>
<repository type="tarball" name="gnucash.org"
href="http://www.gnucash.org/pub/gnucash/sources/stable/"/>
- <include
- href="/usr/local/src/jhbuild/jhbuild/modulesets/gtk-osx.modules"/>
+ <include href="http://github.com/rhult/gtk-osx-build/raw/master/modulesets/gtk-osx.modules"/>
<include href="gtkhtml.modules"/>
<include href="goffice.modules"/>
@@ -31,18 +32,20 @@
version="6.0"/>
</autotools>
-<!--
- <autotools id="desktop-file-utils">
- <branch repo="www.freedesktop.org"
- module="desktop-file-utils/releases/desktop-file-utils-0.10.tar.gz"
- md5sum="8b930e9ad08ac6b8205dd00a1d694b0c" size="341508"/>
+ <autotools id="gwenhywfar" autogen-sh="configure">
+ <branch module="gwenhywfar/gwenhywfar-2.6.2.tar.gz" version="2.6.2"
+ repo="sourceforge"/>
+ </autotools>
+
+ <autotools id="aqbanking" autogen-sh="configure"
+ autogenargs='--enable-ofx=yes --disable-qt3 --disable-kde --disable-chipcard-client --with-backends="aqhbci aqdtaus aqofxconnect" --with-frontends="cbanking g2banking"' >
+ <branch module="aqbanking/aqbanking-2.3.3.tar.gz" version="2.3.3"
+ repo="sourceforge"/>
<dependencies>
- <dep package="glib"/>
- <dep package="intltool"/>
+ <dep package="libofx"/>
+ <dep package="gwenhywfar"/>
</dependencies>
</autotools>
--->
-
<autotools id="OpenSP" autogen-sh='configure'
autogenargs="--disable-static --enable-shared --disable-doc-build">
@@ -51,8 +54,8 @@
</autotools>
<autotools id="libofx" autogen-sh='configure'>
- <branch repo="sourceforge" module="libofx/libofx-0.9.0.tar.gz"
- version='0.9.0'/>
+ <branch repo="sourceforge" module="libofx/libofx-0.8.3.tar.gz"
+ version='0.8.3'/>
<dependencies>
<dep package='guile-1.6'/>
<dep package="OpenSP"/>
@@ -69,38 +72,30 @@
</dependencies>
</autotools>
- <autotools id="Slib" skip-autogen="true">
- <branch repo="slib.savannah.gnu.org"
- module="slib"/>
+ <autotools id="Slib" autogen-sh="install.sh" makeargs="-f Makefile.gnucash"
+ makeinstallargs="-f Makefile.gnucash">
+ <!-- <branch repo="slib.savannah.gnu.org"
+ module="slib"/> -->
+ <branch repo="csail" module="scm/slib-3b1.zip" version="3b1"
+ checkoutdir="slib">
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/slib-install.patch"/>
+ </branch>
<dependencies>
<dep package="guile-1.6"/>
</dependencies>
</autotools>
<autotools id="gnucash" autogen-sh="configure"
- autogenargs="--enable-ofx">
+ autogenargs="--enable-ofx --enable-aqbanking">
<branch module="gnucash-2.2.9.tar.gz" version="2.2.9"
repo="gnucash.org">
- <patches>
- <patch>
- --- src/gnome-utils/Makefile.in 2009-02-23 12:25:26.000000000 -0800
- +++ src/gnome-utils/Makefile.in 2009-03-06 16:24:45.000000000 -0800
- @@ -34,7 +34,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- - at HAVE_X11_XLIB_H_TRUE@am__append_1 = -lX11
- +#@HAVE_X11_XLIB_H_TRUE at am__append_1 = -lX11
- @GTKHTML_USES_GTKPRINT_TRUE at am__append_2 = print-session.c
- @GTKHTML_USES_GTKPRINT_FALSE at am__append_3 = ${GNOME_PRINT_CFLAGS}
- @GTKHTML_USES_GTKPRINT_FALSE at am__append_4 = ${GNOME_PRINT_LIBS}
- </patch>
- </patches>
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-xlib.patch" skip="0"/>
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/gnucash-in.patch" skip="0"/>
</branch>
<dependencies>
<dep package="meta-goffice"/>
<dep package="libofx"/>
-<!-- <dep package="libgnomeprint"/> -->
+ <dep package="aqbanking"/>
<dep package="meta-gtkhtml"/>
<dep package="Slib"/>
</dependencies>
diff --git a/modulesets/gtkhtml.modules b/modulesets/gtkhtml.modules
index 1a6451b..5a70518 100644
--- a/modulesets/gtkhtml.modules
+++ b/modulesets/gtkhtml.modules
@@ -6,6 +6,8 @@
<repository type="svn" name="svn.gnome.org" default="yes"
href="http://svn.gnome.org/svn/"/>
+ <repository type="tarball" name="ftp.gnome.org"
+ href="http://ftp.gnome.org/pub/GNOME/sources/"/>
<repository type='tarball' name='rpm5.org'
href="http://rpm5.org/files/"/>
<repository type="tarball" name="abisource/enchant"
@@ -14,6 +16,10 @@
href="http://www.68k.org/~michael/"/>
<repository type="tarball" name="ftp.gnu.org"
href="ftp://ftp.gnu.org/gnu/"/>
+ <repository type="tarball" name="xmlsoft"
+ href="ftp://xmlsoft.org/libxml2/python/"/>
+ <repository type="tarball" name="freedesktop.org"
+ href="http://dbus.freedesktop.org/releases/"/>
<metamodule id="meta-gtkhtml">
<dependencies>
@@ -37,6 +43,11 @@
</dependencies>
</metamodule>
+ <distutils id="libxml-py" suports-non-srcdir-builds="no">
+ <branch module="libxml2-python-2.6.15.tar.gz" version="2.6.15"
+ repo="xmlsoft"/>
+ </distutils>
+
<autotools id="gtkhtml" >
<!--
In order to compile GtkHTML, you need libgnome[ui] 1.112.1 (or later),
@@ -66,8 +77,12 @@ Optionally you may want to install GConf 1.0.7 (or later).
</dependencies>
</autotools>
- <autotools id="libgnomeprint">
- <branch/>
+ <autotools id="libgnomeprint" autogen.sh="autoreconf">
+ <branch module="libgnomeprint/2.18/libgnomeprint-2.18.6.tar.gz"
+ repo="ftp.gnome.org" version="2.18.6"
+ md5sum="10a9e58aabecf541bc6852f64b3a9294">
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/libgnomeprint.patch" skip="0"/>
+ </branch>
<dependencies>
<dep package="intltool"/>
<dep package="libart_lgpl"/>
@@ -105,7 +120,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
</dependencies>
</autotools>
-->
- <autotools id="popt">
+ <autotools id="popt" autogen-sh='configure'>
<branch module="popt/popt-1.14.tar.gz" version="1.14"
repo="rpm5.org"/>
</autotools>
@@ -137,8 +152,11 @@ Optionally you may want to install GConf 1.0.7 (or later).
</dependencies>
</autotools>
- <autotools id="libgnomeui">
- <branch/>
+ <autotools id="libgnomeui" >
+ <branch module="libgnomeui/2.24/libgnomeui-2.24.1.tar.gz" version="2.24.1"
+ repo="ftp.gnome.org" md5sum="4494a9e25eebd33fdf66ef30069179ee">
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/libgnomeui.patch" skip="0"/>
+ </branch>
<dependencies>
<dep package="libbonoboui"/>
<dep package="libglade"/>
@@ -191,16 +209,21 @@ Optionally you may want to install GConf 1.0.7 (or later).
</dependencies>
</autotools>
- <tarball id="dbus" version="1.2.12"
- autogenargs="--disable-selinux --without-x">
- <source href="http://dbus.freedesktop.org/releases/dbus/dbus-1.2.12.tar.gz"/>
+ <autotools id="dbus" autogen-sh='configure'
+ autogenargs="--disable-selinux --without-x
+ --with-session-socket-dir=$PREFIX/tmp">
+ <branch module=" dbus/dbus-1.2.12.tar.gz" version="1.2.12"
+ repo="freedesktop.org">
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/dbus-install.patch"/>
+ </branch>
<after>
<dep package="gtk+"/>
</after>
- </tarball>
+ </autotools>
- <tarball id="dbus-glib" version="0.80" autogenargs="--disable-selinux">
- <source href="http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.80.tar.gz"/>
+ <autotools id="dbus-glib" autogenargs="--disable-selinux">
+ <branch module="dbus-glib/dbus-glib-0.80.tar.gz" version="0.80"
+ repo="freedesktop.org"/>
<dependencies>
<dep package="libxml2"/>
<dep package="dbus"/>
@@ -209,7 +232,7 @@ Optionally you may want to install GConf 1.0.7 (or later).
<dep package="meta-gtk-osx-bootstrap"/>
<dep package="meta-gtk-osx-core"/>
</after>
- </tarball>
+ </autotools>
<autotools id="libgnomecanvas">
<branch/>
@@ -221,7 +244,9 @@ Optionally you may want to install GConf 1.0.7 (or later).
<autotools id="libtasn1" supports-non-srcdir-builds="no">
<branch module="gnutls/libtasn1-1.8.tar.gz" version="1.8"
- repo="ftp.gnu.org"/>
+ repo="ftp.gnu.org">
+ <patch file="http://github.com/jralls/gnucash-on-osx/raw/master/patches/libtasn1.patch" skip="0"/>
+ </branch>
</autotools>
commit fcf0ffbf55225e31ea241921449892f24446f484
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 23 12:48:12 2009 -0700
Fixes for gnucash-in and gnucash-xlib; new dbus-install
diff --git a/patches/dbus-install.patch b/patches/dbus-install.patch
new file mode 100644
index 0000000..48ae6b6
--- /dev/null
+++ b/patches/dbus-install.patch
@@ -0,0 +1,19 @@
+--- bus/Makefile.in 2009-01-06 16:30:41.000000000 -0800
++++ bus/Makefile.in 2009-03-23 12:35:39.000000000 -0700
+@@ -1295,6 +1295,7 @@
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
+ $(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1
++ $(mkinstalldirs) $(DESTDIR)/tmp
+ $(INSTALL_PROGRAM) dbus-daemon-launch-helper $(DESTDIR)$(libexecdir)
+ if test `id -u` -eq 0; then \
+ chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
+@@ -1303,6 +1304,8 @@
+ echo "Not installing $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \
+ echo "You'll need to manually set permissions to root:$(DBUS_USER) and permissions 4750"; \
+ fi
++ $(DESTDIR)$(bindir)/dbus-uuidgen --ensure=$(DESTDIR)$(localstatedir)/lib/dbus/machine-id
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/patches/gnucash-in.patch b/patches/gnucash-in.patch
index 90f57f6..4130e36 100644
--- a/patches/gnucash-in.patch
+++ b/patches/gnucash-in.patch
@@ -1,56 +1,42 @@
---- src/bin/gnucash.in
-+++ src/bin/gnucash.in
+--- src/bin/gnucash.in 2008-01-07 17:05:50.000000000 -0800
++++ src/bin/gnucash.in 2009-03-22 22:33:05.000000000 -0700
@@ -2,6 +2,11 @@
PATH="@-BIN_DIR-@:${PATH}"
export PATH
-+XDG_CONFIG_DIRS=@-PREFIX-@@-PATH_SEPARATOR- at etc@-PATH_SEPARATOR- at xdg
++XDG_CONFIG_DIRS=@-PREFIX-@/etc/xdg
+export XDG_CONFIG_DIRS
-+XDG_DATA_DIRS=@-PREFIX-@@-PATH_SEPARATOR- at share
++XDG_DATA_DIRS=@-PREFIX-@/share
+export XDG_DATA_DIRS
+
GUILE_WARN_DEPRECATED="no"
export GUILE_WARN_DEPRECATED
-@@ -13,6 +18,7 @@ EXTRA_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@@-GNC_SCM_INSTALL_DIR-@"
+@@ -13,6 +18,7 @@
GUILE_LOAD_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@${GUILE_LOAD_PATH}"
EXTRA_LIBS="${GNC_MODULE_PATH}"
-+EXTRA_LIBS="${EXTRA_LIBS}:@-PATH_SEPARATOR- at System@-PATH_SEPARATOR- at Library@-PATH_SEPARATOR- at Frameworks@-PATH_SEPARATOR- at ApplicationServices.framework@-PATH_SEPARATOR- at Versions@-PATH_SEPARATOR- at A@-PATH_SEPARATOR- at Frameworks@-PATH_SEPARATOR- at ImageIO.framework@-PATH_SEPARATOR- at Versions@-PATH_SEPARATOR- at A@-PATH_SEPARATOR- at Resources@-PATH_SEPARATOR-@"
++EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_LIB_INSTALLDIR-@"
EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_PKGLIB_INSTALLDIR-@"
-@@ -26,4 +32,8 @@ export LD_LIBRARY_PATH
+@@ -24,4 +30,8 @@
+ export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
- export GNC_DBD_DIR
+if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-+ eval `dbus-launch --sh-syntax --exit-with-session --config-file=@-PREFIX-@@-PATH_SEPARATOR- at etc@-PATH_SEPARATOR- at dbus-1@-PATH_SEPARATOR- at session.conf`
++ eval `dbus-launch --sh-syntax --exit-with-session --config-file=@-PREFIX-@/etc/dbus-1/session.conf`
+fi
+
exec gnucash-bin "$@"
--@@-GNC_LIB_INSTALLDIR-@"
- EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_PKGLIB_INSTALLDIR-@"
-
-@@ -26,4 +32,8 @@ export LD_LIBRARY_PATH
- export DYLD_LIBRARY_PATH
- export GNC_DBD_DIR
-
-+if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-+ eval `dbus-launch --sh-syntax --exit-with-session --config-file=@-PREFIX-@@-PATH_SEPARATOR- at etc@-PATH_SEPARATOR- at dbus-1@-PATH_SEPARATOR- at session.conf`
-+fi
-+
- exec gnucash-bin "$@"
-*** src/bin/Makefile~ Mon Mar 9 16:44:41 2009
---- src/bin/Makefile Sun Mar 22 15:45:23 2009
-***************
-*** 800,805 ****
---- 800,806 ----
- gnucash: gnucash.in ${top_builddir}/config.status Makefile
- rm -f $@.tmp
- sed < $< > $@.tmp \
-+ -e 's#@-PREFIX-@#${prefix}#g' \
- -e 's#@-BIN_DIR-@#${bindir}#g' \
- -e 's#@-GNC_DBD_DIR-@#${GNC_DBD_DIR}#g' \
- -e 's#@-GNC_GUILE_MODULE_DIR-@#${GNC_SHAREDIR}/guile-modules#g' \
+--- src/bin/Makefile.in 2009-02-23 12:25:48.000000000 -0700
++++ src/bin/Makefile.in 2009-03-22 22:32:32.000000000 -0700
+@@ -804,6 +804,7 @@
+ gnucash: gnucash.in ${top_builddir}/config.status Makefile
+ rm -f $@.tmp
+ sed < $< > $@.tmp \
++ -e 's#@-PREFIX-@#${prefix}#g' \
+ -e 's#@-BIN_DIR-@#${bindir}#g' \
+ -e 's#@-GNC_GUILE_MODULE_DIR-@#${GNC_SHAREDIR}/guile-modules#g' \
+ -e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
diff --git a/patches/gnucash-xlib.patch b/patches/gnucash-xlib.patch
index b2dc2d5..972aa60 100644
--- a/patches/gnucash-xlib.patch
+++ b/patches/gnucash-xlib.patch
@@ -1,12 +1,11 @@
-
---- src/gnome-utils/Makefile.in 2009-02-23 12:25:26.000000000 -0800
-+++ src/gnome-utils/Makefile.in 2009-03-06 16:24:45.000000000 -0800
-@@ -34,7 +34,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-- at HAVE_X11_XLIB_H_TRUE@am__append_1 = -lX11
-+#@HAVE_X11_XLIB_H_TRUE at am__append_1 = -lX11
- @GTKHTML_USES_GTKPRINT_TRUE at am__append_2 = print-session.c
- @GTKHTML_USES_GTKPRINT_FALSE at am__append_3 = ${GNOME_PRINT_CFLAGS}
- @GTKHTML_USES_GTKPRINT_FALSE at am__append_4 = ${GNOME_PRINT_LIBS}
+--- configure 2009-02-23 12:25:34.000000000 -0800
++++ configure 2009-03-23 11:37:40.000000000 -0700
+@@ -24912,7 +24912,7 @@
+ # These are unavailable on windows/mingw32
+
+
+-for ac_header in X11/Xlib.h glob.h
++for ac_header in glob.h
+ do
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
\ No newline at end of file
commit 5120dd56d160052b6a7a52e22663751686e0af87
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 22 16:13:44 2009 -0700
Added gnucash-in.patch
diff --git a/patches/gnucash-in.patch b/patches/gnucash-in.patch
new file mode 100644
index 0000000..90f57f6
--- /dev/null
+++ b/patches/gnucash-in.patch
@@ -0,0 +1,56 @@
+--- src/bin/gnucash.in
++++ src/bin/gnucash.in
+@@ -2,6 +2,11 @@
+
+ PATH="@-BIN_DIR-@:${PATH}"
+ export PATH
++XDG_CONFIG_DIRS=@-PREFIX-@@-PATH_SEPARATOR- at etc@-PATH_SEPARATOR- at xdg
++export XDG_CONFIG_DIRS
++XDG_DATA_DIRS=@-PREFIX-@@-PATH_SEPARATOR- at share
++export XDG_DATA_DIRS
++
+
+ GUILE_WARN_DEPRECATED="no"
+ export GUILE_WARN_DEPRECATED
+@@ -13,6 +18,7 @@ EXTRA_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@@-GNC_SCM_INSTALL_DIR-@"
+ GUILE_LOAD_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@${GUILE_LOAD_PATH}"
+
+ EXTRA_LIBS="${GNC_MODULE_PATH}"
++EXTRA_LIBS="${EXTRA_LIBS}:@-PATH_SEPARATOR- at System@-PATH_SEPARATOR- at Library@-PATH_SEPARATOR- at Frameworks@-PATH_SEPARATOR- at ApplicationServices.framework@-PATH_SEPARATOR- at Versions@-PATH_SEPARATOR- at A@-PATH_SEPARATOR- at Frameworks@-PATH_SEPARATOR- at ImageIO.framework@-PATH_SEPARATOR- at Versions@-PATH_SEPARATOR- at A@-PATH_SEPARATOR- at Resources@-PATH_SEPARATOR-@"
+ EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_LIB_INSTALLDIR-@"
+ EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_PKGLIB_INSTALLDIR-@"
+
+@@ -26,4 +32,8 @@ export LD_LIBRARY_PATH
+ export DYLD_LIBRARY_PATH
+ export GNC_DBD_DIR
+
++if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
++ eval `dbus-launch --sh-syntax --exit-with-session --config-file=@-PREFIX-@@-PATH_SEPARATOR- at etc@-PATH_SEPARATOR- at dbus-1@-PATH_SEPARATOR- at session.conf`
++fi
++
+ exec gnucash-bin "$@"
+
+-@@-GNC_LIB_INSTALLDIR-@"
+ EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_PKGLIB_INSTALLDIR-@"
+
+@@ -26,4 +32,8 @@ export LD_LIBRARY_PATH
+ export DYLD_LIBRARY_PATH
+ export GNC_DBD_DIR
+
++if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
++ eval `dbus-launch --sh-syntax --exit-with-session --config-file=@-PREFIX-@@-PATH_SEPARATOR- at etc@-PATH_SEPARATOR- at dbus-1@-PATH_SEPARATOR- at session.conf`
++fi
++
+ exec gnucash-bin "$@"
+*** src/bin/Makefile~ Mon Mar 9 16:44:41 2009
+--- src/bin/Makefile Sun Mar 22 15:45:23 2009
+***************
+*** 800,805 ****
+--- 800,806 ----
+ gnucash: gnucash.in ${top_builddir}/config.status Makefile
+ rm -f $@.tmp
+ sed < $< > $@.tmp \
++ -e 's#@-PREFIX-@#${prefix}#g' \
+ -e 's#@-BIN_DIR-@#${bindir}#g' \
+ -e 's#@-GNC_DBD_DIR-@#${GNC_DBD_DIR}#g' \
+ -e 's#@-GNC_GUILE_MODULE_DIR-@#${GNC_SHAREDIR}/guile-modules#g' \
commit 11846851667ebba8269ef4005e2547ec027fbb40
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 22 14:54:09 2009 -0700
Fix Makefile.gnucash in slib-install.patch
diff --git a/patches/slib-install.patch b/patches/slib-install.patch
index a0e1ede..2445031 100644
--- a/patches/slib-install.patch
+++ b/patches/slib-install.patch
@@ -14,7 +14,7 @@
@@ -0,0 +1,4 @@
+all:
+
-+install
++install:
+
commit 979ab1372cc2314b0bb0648dcee9cc9bc3768667
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 22 14:48:16 2009 -0700
Add Makefile.gnucash to slib-install.patch
diff --git a/patches/slib-install.patch b/patches/slib-install.patch
index 55a2d80..a0e1ede 100644
--- a/patches/slib-install.patch
+++ b/patches/slib-install.patch
@@ -9,3 +9,12 @@
+mkdir ../site
+ln -s ../../../lib/slib .
+$PREFIX/bin/guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
+--- /dev/null 2009-03-22 11:30:58.000000000 -0700
++++ Makefile.gnucash 2009-03-22 12:54:40.000000000 -0700
+@@ -0,0 +1,4 @@
++all:
++
++install
++
+
+
commit 04c0c68005520cc72c44be6a2f8ee4eb2d8518a5
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 22 14:20:20 2009 -0700
Add mkdir ../site to slib-install.patch
diff --git a/patches/slib-install.patch b/patches/slib-install.patch
index 42a4fd4..55a2d80 100644
--- a/patches/slib-install.patch
+++ b/patches/slib-install.patch
@@ -1,10 +1,11 @@
--- /dev/null 2009-03-22 11:30:58.000000000 -0700
+++ install.sh 2009-03-22 12:54:40.000000000 -0700
-@@ -0,0 +1,7 @@
+@@ -0,0 +1,8 @@
+#!/bin/sh
+mkdir $PREFIX/lib/slib
+cp *.scm $PREFIX/lib/slib/
+cp guile.init $PREFIX/lib/slib
+cd $PREFIX/share/guile/1.6/
++mkdir ../site
+ln -s ../../../lib/slib .
+$PREFIX/bin/guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
commit 2e0a12211647c880626c5a8f542c3153e4661673
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 22 12:56:59 2009 -0700
Added new patchfile slib-install.patch
diff --git a/patches/slib-install.patch b/patches/slib-install.patch
new file mode 100644
index 0000000..42a4fd4
--- /dev/null
+++ b/patches/slib-install.patch
@@ -0,0 +1,10 @@
+--- /dev/null 2009-03-22 11:30:58.000000000 -0700
++++ install.sh 2009-03-22 12:54:40.000000000 -0700
+@@ -0,0 +1,7 @@
++#!/bin/sh
++mkdir $PREFIX/lib/slib
++cp *.scm $PREFIX/lib/slib/
++cp guile.init $PREFIX/lib/slib
++cd $PREFIX/share/guile/1.6/
++ln -s ../../../lib/slib .
++$PREFIX/bin/guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
commit 1b6abf23832d20cef769b22e7613999217ebc229
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 22 10:41:02 2009 -0700
Fixed libgnomeprint patch for configure vs. configure.in
diff --git a/patches/libgnomeprint.patch b/patches/libgnomeprint.patch
index 532ce46..0f89885 100644
--- a/patches/libgnomeprint.patch
+++ b/patches/libgnomeprint.patch
@@ -1,23 +1,19 @@
---- configure.in 2008-07-03 14:18:44.000000000 -0700
-+++ configure.in.mod 2008-07-03 14:17:11.000000000 -0700
-@@ -148,9 +148,17 @@
- dnl Checking for libm
- dnl =================================
- AC_CHECK_LIBM
--if test "x$LIBM" = "x"; then
-- AC_MSG_ERROR(You need -lm(mathematic library) for this version of libgnomeprint.)
--fi
-+case $host in
-+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-+ # These system don't have libm, or don't need it
-+ ;;
-+*)
-+ if test "x$LIBM" = "x"; then
-+ AC_MSG_ERROR(You need -lm(mathematic library) for this version of
-+libgnomeprint.)
-+ fi
-+ ;;
-+esac
- LDFLAGS="$LDFLAGS $LIBM"
-
- dnl =================================
+*** /usr/local/src/gnome3/libgnomeprint-2.18.6/configure~ Fri Mar 6 02:31:09 2009
+--- /usr/local/src/gnome3/libgnomeprint-2.18.6/configure Sun Mar 22 10:38:33 2009
+***************
+*** 20084,20090 ****
+ esac
+
+
+! if test "x$LIBM" = "x"; then
+ { { $as_echo "$as_me:$LINENO: error: You need -lm(mathematic library) for this version of libgnomeprint." >&5
+ $as_echo "$as_me: error: You need -lm(mathematic library) for this version of libgnomeprint." >&2;}
+ { (exit 1); exit 1; }; }
+--- 20084,20090 ----
+ esac
+
+
+! if $host != *-*-darwin* && test "x$LIBM" = "x"; then
+ { { $as_echo "$as_me:$LINENO: error: You need -lm(mathematic library) for this version of libgnomeprint." >&5
+ $as_echo "$as_me: error: You need -lm(mathematic library) for this version of libgnomeprint." >&2;}
+ { (exit 1); exit 1; }; }
commit 87a36819c3d8fb0524cd2ff5aa4bee7b257325a1
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 21 17:49:19 2009 -0700
Changed libgnomeui.patch from patching configure.in to patching configure
diff --git a/patches/libgnomeui.patch b/patches/libgnomeui.patch
index 4566da2..ad78d5f 100644
--- a/patches/libgnomeui.patch
+++ b/patches/libgnomeui.patch
@@ -1,13 +1,12 @@
-Index: configure.in
-===================================================================
---- configure.in (revision 5608)
-+++ configure.in (working copy)
-@@ -116,7 +116,7 @@
- gnome_keyring_requirement="gnome-keyring-1 >= gnome_keyring_required_version"
+--- configure.orig 2009-03-06 02:47:56.000000000 -0800
++++ configure 2009-03-21 17:44:49.000000000 -0700
+@@ -15866,7 +15866,7 @@
+ gnome_keyring_requirement="gnome-keyring-1 >= 0.4"
GNOME_KEYRING="gnome-keyring-1"
-
+
- if test x$GNOME_HAVE_X11 != xyes ; then
-+ if test x$have_x != xdisabled && test x$GNOME_HAVE_X11 != xyes ; then
- AC_MSG_ERROR([libX11 not found])
- fi
- ;;
++ if test x$have_x != xdisabled && x$GNOME_HAVE_X11 != xyes ; then
+ { { $as_echo "$as_me:$LINENO: error: libX11 not found" >&5
+ $as_echo "$as_me: error: libX11 not found" >&2;}
+ { (exit 1); exit 1; }; }
+
commit 1be708e50e00841081cc626873e53207c3d774e3
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 21 16:25:34 2009 -0700
Renamed patch files to end in .patch; apparently jhbuild ignores them otherwise
diff --git a/patches/gnucash-xlib b/patches/gnucash-xlib.patch
similarity index 100%
rename from patches/gnucash-xlib
rename to patches/gnucash-xlib.patch
diff --git a/patches/libgnomeprint b/patches/libgnomeprint.patch
similarity index 100%
rename from patches/libgnomeprint
rename to patches/libgnomeprint.patch
diff --git a/patches/libgnomeui b/patches/libgnomeui.patch
similarity index 100%
rename from patches/libgnomeui
rename to patches/libgnomeui.patch
diff --git a/patches/libtasn1 b/patches/libtasn1.patch
similarity index 100%
rename from patches/libtasn1
rename to patches/libtasn1.patch
commit 8ffa5c7b31a5a49f4f163fc9d374b8960f2773e7
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 21 15:45:58 2009 -0700
Added patchfiles, moved modules to new modulesets subdir, moved icns to gnucash-bundler subdir
diff --git a/gnucash-icon-48x48.icns b/gnucash-bundler/gnucash-icon-48x48.icns
similarity index 100%
rename from gnucash-icon-48x48.icns
rename to gnucash-bundler/gnucash-icon-48x48.icns
diff --git a/gnucash.modules b/modulesets/gnucash.modules
similarity index 100%
rename from gnucash.modules
rename to modulesets/gnucash.modules
diff --git a/goffice.modules b/modulesets/goffice.modules
similarity index 100%
rename from goffice.modules
rename to modulesets/goffice.modules
diff --git a/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
similarity index 100%
rename from gtk-osx-random.modules
rename to modulesets/gtk-osx-random.modules
diff --git a/gtkhtml.modules b/modulesets/gtkhtml.modules
similarity index 100%
rename from gtkhtml.modules
rename to modulesets/gtkhtml.modules
diff --git a/patches/gnucash-xlib b/patches/gnucash-xlib
new file mode 100644
index 0000000..b2dc2d5
--- /dev/null
+++ b/patches/gnucash-xlib
@@ -0,0 +1,12 @@
+
+--- src/gnome-utils/Makefile.in 2009-02-23 12:25:26.000000000 -0800
++++ src/gnome-utils/Makefile.in 2009-03-06 16:24:45.000000000 -0800
+@@ -34,7 +34,7 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+- at HAVE_X11_XLIB_H_TRUE@am__append_1 = -lX11
++#@HAVE_X11_XLIB_H_TRUE at am__append_1 = -lX11
+ @GTKHTML_USES_GTKPRINT_TRUE at am__append_2 = print-session.c
+ @GTKHTML_USES_GTKPRINT_FALSE at am__append_3 = ${GNOME_PRINT_CFLAGS}
+ @GTKHTML_USES_GTKPRINT_FALSE at am__append_4 = ${GNOME_PRINT_LIBS}
diff --git a/patches/libgnomeprint b/patches/libgnomeprint
new file mode 100644
index 0000000..532ce46
--- /dev/null
+++ b/patches/libgnomeprint
@@ -0,0 +1,23 @@
+--- configure.in 2008-07-03 14:18:44.000000000 -0700
++++ configure.in.mod 2008-07-03 14:17:11.000000000 -0700
+@@ -148,9 +148,17 @@
+ dnl Checking for libm
+ dnl =================================
+ AC_CHECK_LIBM
+-if test "x$LIBM" = "x"; then
+- AC_MSG_ERROR(You need -lm(mathematic library) for this version of libgnomeprint.)
+-fi
++case $host in
++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++ # These system don't have libm, or don't need it
++ ;;
++*)
++ if test "x$LIBM" = "x"; then
++ AC_MSG_ERROR(You need -lm(mathematic library) for this version of
++libgnomeprint.)
++ fi
++ ;;
++esac
+ LDFLAGS="$LDFLAGS $LIBM"
+
+ dnl =================================
diff --git a/patches/libgnomeui b/patches/libgnomeui
new file mode 100644
index 0000000..4566da2
--- /dev/null
+++ b/patches/libgnomeui
@@ -0,0 +1,13 @@
+Index: configure.in
+===================================================================
+--- configure.in (revision 5608)
++++ configure.in (working copy)
+@@ -116,7 +116,7 @@
+ gnome_keyring_requirement="gnome-keyring-1 >= gnome_keyring_required_version"
+ GNOME_KEYRING="gnome-keyring-1"
+
+- if test x$GNOME_HAVE_X11 != xyes ; then
++ if test x$have_x != xdisabled && test x$GNOME_HAVE_X11 != xyes ; then
+ AC_MSG_ERROR([libX11 not found])
+ fi
+ ;;
diff --git a/patches/libtasn1 b/patches/libtasn1
new file mode 100644
index 0000000..65845ac
--- /dev/null
+++ b/patches/libtasn1
@@ -0,0 +1,32 @@
+Index: lib/gllib/Makefile.am
+==============================================
+*** lib/gllib/Makefile.am Fri Jan 16 03:30:43 2009
+--- lib/gllib/Makefile.am Fri Mar 20 10:59:24 2009
+***************
+*** 28,40 ****
+
+ AM_CPPFLAGS =
+
+! noinst_LTLIBRARIES += libgnu.la
+
+! libgnu_la_SOURCES =
+! libgnu_la_LIBADD = $(lgl_LTLIBOBJS)
+! libgnu_la_DEPENDENCIES = $(lgl_LTLIBOBJS)
+! EXTRA_libgnu_la_SOURCES =
+! libgnu_la_LDFLAGS = $(AM_LDFLAGS)
+
+ ## begin gnulib module link-warning
+
+--- 28,40 ----
+
+ AM_CPPFLAGS =
+
+! # noinst_LTLIBRARIES += libgnu.la
+
+! # libgnu_la_SOURCES =
+! # libgnu_la_LIBADD = $(lgl_LTLIBOBJS)
+! # libgnu_la_DEPENDENCIES = $(lgl_LTLIBOBJS)
+! # EXTRA_libgnu_la_SOURCES =
+! # libgnu_la_LDFLAGS = $(AM_LDFLAGS)
+
+ ## begin gnulib module link-warning
commit 48180ffdbe846cca1cb1b1ea04f5cd74677b1181
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Mar 20 11:27:12 2009 -0700
Placed patches in module files, added new module files
diff --git a/.jhbuildrc b/.jhbuildrc
deleted file mode 100644
index e7a5ea1..0000000
--- a/.jhbuildrc
+++ /dev/null
@@ -1,301 +0,0 @@
-# -*- mode: python -*-
-#
-# Copyright (C) 2006, 2007, 2008 Imendio AB
-#
-# Default setup for building GTK+ on Mac OS X. Note that you should
-# normally never need to edit this file. Any custom settings should be
-# done in ~/.jhbuildrc-custom.
-#
-# Specific builds can be set up by creating files named
-# ~/.jhbuildrc-<build>. When setting the environment variable JHB to
-# such a name, the corresponding rc file will be read (e.g.:
-# JHB=mybuild jhbuild shell).
-#
-# Use .jhbuildrc-custom to override the moduleset, modules to build,
-# the source checkout location, installation prefix, or svn usernames
-# etc.
-#
-# Please email richard at imendio.com if you have suggestions for
-# improving this setup, or have any patches that you would like to get
-# included.
-
-import sys
-import errno
-
-# Some utitily functions used here and in custom files:
-#
-def environ_append(key, value, separator=' '):
- old_value = os.environ.get(key)
- if old_value is not None:
- value = old_value + separator + value
- os.environ[key] = value
-
-def environ_prepend(key, value, separator=' '):
- old_value = os.environ.get(key)
- if old_value is not None:
- value = value + separator + old_value
- os.environ[key] = value
-
-def parse_custom_argument(key):
- for i, arg in enumerate(sys.argv[:-1]):
- if arg == key:
- return sys.argv[i+1]
- return None
-
-def set_branch(module, branch):
- # Keep any overriden repo name here to keep custom usernames set
- # up in a custom setup.
- #
- repo = repos.get("svn.gnome.org", "http://svn.gnome.org/svn")
- if repo.endswith("/"):
- repo = repo[:-1]
-
- branches[module] = repo + "/" + module + "/" + branch
-
-def append_autogenargs(module, args):
- old_value = module_autogenargs.get(module, autogenargs)
- module_autogenargs[module] = old_value + " " + args
-
-# Set up the environment for building against 10.4 SDK.
-#
-sdkdir = None
-def setup_sdk_10_4():
- target = "10.4"
- sdk = "MacOSX10.4u.sdk"
- sdkdir = os.path.join("/Developer/SDKs", sdk)
-
- # To pick up cups-config from the right place. NOTE: Change this as
- # soon as GTK+ is fixed, and only set CUPS_CONFIG instead (GTK+ 2.13
- # is fixed).
- #
- prependpath("PATH", os.path.join(sdkdir, "usr/bin"))
-
- os.environ["MACOSX_DEPLOYMENT_TARGET"] = target
-
- # Seems like we need this since many libraries otherwise only look for
- # various dependencies (e.g. libiconv) in /usr/lib, hence pulling in
- # the wrong -L that doesn't have fat binaries on pre-10.5.
- #
- environ_prepend("LDFLAGS", "-L" + sdkdir + "/usr/lib")
- environ_prepend("CPPFLAGS", "-I" + sdkdir + "/usr/include")
-
- # It looks like -isysroot is broken on 10.4, causing link
- # problems. But we don't really need to set it for 10.4 so just
- # skip that.
- #
- if not osx_version.startswith("8."):
- environ_append("CFLAGS", "-isysroot " + sdkdir)
- environ_append("CXXFLAGS", "-isysroot " + sdkdir)
- environ_append("LDFLAGS", "-isysroot " + sdkdir)
-
- environ_append("CFLAGS", "-mmacosx-version-min=" + target)
- environ_append("LDFLAGS", "-mmacosx-version-min=" + target)
-
- return sdkdir
-
-def autogenargs_for_arch(root, arch, original_cflags, original_cxxflags, original_ldflags):
- if root is not None and not osx_version.startswith("8."):
- rootstr = " -isysroot " + root
- else:
- rootstr = ""
- archstr = " -arch " + arch
- return \
- 'CFLAGS="' + original_cflags + rootstr + archstr + '" ' + \
- 'CXXFLAGS="' + original_cxxflags + rootstr + archstr + '" ' + \
- 'LDFLAGS="' + original_ldflags + archstr + '"'
-
-osx_version = os.popen("uname -r").read().strip()
-
-# Moduleset to use.
-#
-moduleset = 'http://people.imendio.com/richard/gtk-osx-build/modulesets/gtk-osx.modules'
-
-# A list of the modules to build.
-#
-modules = [ 'meta-gtk-osx-core' ]
-
-# A list of modules to skip.
-#
-skip.append('gmp')
-skip.append('guile')
-
-# Source and installation locations.
-#
-root = os.path.expanduser("~/gtk")
-checkoutroot = os.path.join(root, "source")
-prefix = os.path.join(root, "inst")
-
-# Extra arguments to pass to all autogen.sh scripts.
-#
-autogenargs='--disable-static --disable-gtk-doc --disable-docs --disable-scrollkeeper'
-alwaysautogen = True
-
-# Set debugging format to the old one from Tiger and earlier since the new
-# default in Leopard breaks many things. Also set gnu89 as the new default
-# gnu99 changes how extern inline works, breaking, glib's inline setup,
-# until glib is fixed.
-#
-os.environ['CFLAGS'] = '-O -gstabs+3 -std=gnu89'
-os.environ['CXXFLAGS'] = '-O -gstabs+3'
-
-# Use the included install-check program if available. It won't update
-# timestamps if the header hasn't changed, which speeds up builds.
-#
-path = os.path.expanduser('~/bin/install-check')
-if os.path.exists(path):
- os.environ['INSTALL'] = path
-
-# When building on intel, force build to be 486, since glib won't
-# enable asm atomic operations otherwise.
-#
-try:
- f = os.popen("uname -p")
- if f.read().startswith("i386"):
- append_autogenargs("glib", "--build=i486-apple-darwin")
-except:
- pass
-
-# Prefix to use in the shell, can be overridden in the custom rc file
-# or in specific setups. Can be set to None to be removed.
-#
-prompt_prefix = "JH"
-
-default_build = ""
-
-if osx_version.startswith("7."):
- print "Error: Mac OS X 10.4 or newer is required, exiting."
- raise SystemExit
-elif osx_version.startswith("8."):
- # Tiger, we want to use the python version from jhbuild.
- want_jhbuild_python = True
-else:
- # Leopard or newer.
- want_jhbuild_python = False
-
-# Import optional user RC for further customization. You can override
-# the prefix or default build setup for example, or CFLAGS or
-# module_autogenargs, etc.
-#
-userrc = os.path.join(os.environ['HOME'], '.jhbuildrc-custom')
-if os.path.exists(userrc):
- execfile(userrc)
-
-# Allow including different variants depending on the environment
-# variable JHB. This can be used to have different setups for SDK
-# builds, for example.
-#
-build = os.environ.get('JHB', default_build)
-
-# Check and warn if jhbuild is started from within jhbuild, since that
-# will mess up environment variables, especially if different build
-# setups are used.
-#
-old_prefix = os.environ.get('JHBUILD_PREFIX', "")
-old_build = os.environ.get('JHBUILD_CONFIG', "")
-ran_recursively = old_prefix != ""
-if ran_recursively:
- if old_build != build:
- print "Error: jhbuild is already running with a different build setup, exiting."
- raise SystemExit
-
- print "Warning: jhbuild is started from within a jhbuild session."
-
-if build != "":
- try:
- execfile(os.path.join(os.environ['HOME'], '.jhbuildrc-' + build))
- except EnvironmentError, e:
- print "Couldn't find the file '.jhbuildrc-" + build + "', exiting."
- raise SystemExit
-
-tarballdir = os.path.join(checkoutroot, 'pkgs')
-
-os.environ['PREFIX'] = prefix # Deprecated, please move to JHBUILD_PREFIX.
-os.environ['JHBUILD_PREFIX'] = prefix
-os.environ['JHBUILD_SOURCE'] = checkoutroot
-
-os.environ['LIBTOOLIZE'] = prefix + '/bin/libtoolize'
-
-# By default, we want the system perl and python, not from macports or
-# so.
-#
-os.environ["PERL"] = "/usr/bin/perl"
-os.environ["INTLTOOL_PERL"] = "/usr/bin/perl"
-if not want_jhbuild_python:
- skip.append('python')
- os.environ["PYTHON"] = "/usr/bin/python"
-
-# Use libxml/libxslt from the system. Append to the pkg-config path to
-# get the system versions picked up.
-#
-skip.append("libxml2")
-skip.append("libxslt")
-addpath("PKG_CONFIG_PATH", "/usr/lib/pkgconfig")
-
-# The option "headerpad_max_install_names" is there to leave some room for
-# changing the library locations with install_name_tool. Note that GNU
-# libtool seems to drop the option if we don't use -W here.
-#
-environ_append('LDFLAGS', '-Wl,-headerpad_max_install_names')
-
-# Make sure we find our installed modules, and before other versions.
-environ_prepend('LDFLAGS', '-L' + prefix + '/lib')
-environ_prepend('CPPFLAGS', '-I' + prefix + '/include')
-
-# Add additional Python/Perl paths so that our modules can be found.
-#
-version = 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1])
-environ_append('PYTHONPATH', prefix + '/lib/' + version + '/site-packages/gtk-2.0', ':')
-environ_append('PERL5LIB', prefix + '/lib/perl5/vendor_perl', ':')
-environ_append('PERL5LIB', prefix + '/lib/perl5/site_perl', ':')
-
-# Point gtk-doc and other xlstproc users to our XML catalog.
-#
-os.environ['XML_CATALOG_FILES'] = prefix + '/etc/xml/catalog'
-
-# Speed up gettext build by disabling unneeded stuff.
-#
-append_autogenargs("gettext", "--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp")
-
-# Support prepending frameworks to the PKG_CONFIG_PATH, CFLAGS,
-# LDFLAGS and ACLOCAL_FLAGS variables.
-#
-frameworks = os.environ.get("JHB_PREPEND_FRAMEWORKS", "")
-for framework in frameworks.split(":"):
- if framework != "" and os.path.exists(framework):
- # Use prependpath where possible to ensure our paths are added
- # in front of the ones jhbuild sets up.
- if os.path.exists(framework + "/Headers"):
- environ_prepend("CPPFLAGS", "-I" + framework + "/Headers", " ")
- if os.path.exists(framework + "/Resources/dev/bin"):
- prependpath("PATH", framework + "/Resources/dev/bin")
- if os.path.exists(framework + "/Resources/dev/lib/pkgconfig"):
- prependpath("PKG_CONFIG_PATH", framework + "/Resources/dev/lib/pkgconfig")
- if os.path.exists(framework + "/Resources/dev/lib"):
- environ_prepend("LDFLAGS", "-L" + framework + "/Resources/dev/lib", " ")
- if os.path.exists(framework + "/Resources/dev/share/aclocal"):
- prependpath("ACLOCAL_FLAGS", framework + "/Resources/dev/share/aclocal")
-
-# We do some crude extra argument parsing just to add support for
-# getting environment variables. Used in framework creation to pick up
-# the jhbuild prefix.
-#
-value = parse_custom_argument("getenv")
-if value:
- print os.environ.get(value, "")
- raise SystemExit
-
-if build:
- print "Build setup: %s, prefix: %s" % (build, prefix)
- os.environ["JHBUILD_CONFIG"] = build
-else:
- print "Prefix: %s" % (prefix)
-
-if not ran_recursively and prompt_prefix:
- os.environ["JHBUILD_PROMPT"] = "[" + prompt_prefix + "] "
-
-# Unset this se we don't mess with the check for not starting
-# recursively.
-os.unsetenv("JHB")
-
-if "shell" in sys.argv:
- print "Entered jhbuild shell, type 'exit' to return."
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 043e295..7a72c30 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -1,7 +1,7 @@
# -*- mode: python -*-
-checkoutroot = '/usr/local/src/gnome2'
-prefix = '/usr/local/gtk2'
+checkoutroot = '/usr/local/src/gnome3'
+prefix = '/usr/local/gtk3'
#This somehow fell out of jhbuildrc:
environ_prepend("PATH", prefix + "/bin")
@@ -30,16 +30,15 @@ module_makeargs = {}
module_makeargs["perl-xml-parser"]="EXPATLIBPATH=" + prefix + "/lib EXPATINCPATH=${prefix}/include "
-path = prefix + '/bin/install-check'
-if os.path.exists(path):
- os.environ['INSTALL'] = path
+if os.path.exists(prefix + '/bin/install-check'):
+ os.environ['INSTALL'] = prefix + '/bin/install-check'
#Comment this out if you want to build with your default sdk; make a
#similar function (it's in .jhbuildrc) if you want to set a different
#sdk altogether.
#setup_sdk_10_4()
-moduleset = os.path.expanduser("~/gnucash.modules")
+moduleset = os.path.join(os.environ['CONFIG_DIR'], "gnucash.modules")
modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
diff --git a/gnucash-xlib.patch b/gnucash-xlib.patch
deleted file mode 100644
index e09c11d..0000000
--- a/gnucash-xlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in 2008-07-06 17:16:42.000000000 -0700
-+++ configure.in.new 2008-07-06 17:17:06.000000000 -0700
-@@ -213,7 +213,7 @@
- AM_CONDITIONAL(GNUCASH_SEPARATE_BUILDDIR, test "x${srcdir}" != "x.")
-
- # These are unavailable on windows/mingw32
--AC_CHECK_HEADERS(X11/Xlib.h glob.h)
-+AC_CHECK_HEADERS(glob.h)
- AC_CHECK_FUNCS(chown gethostname getppid getuid gettimeofday gmtime_r)
- AC_CHECK_FUNCS(gethostid link)
-
diff --git a/gnucash.modules b/gnucash.modules
index 2c24c6b..f99983d 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -21,26 +21,15 @@
<include
- href="http://people.imendio.com/richard/gtk-osx-build/modulesets/gtk-osx.modules"/>
+ href="/usr/local/src/jhbuild/jhbuild/modulesets/gtk-osx.modules"/>
+ <include href="gtkhtml.modules"/>
+ <include href="goffice.modules"/>
- <tarball id='readline' autogen-sh='configure'>
- <source href='ftp://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz'/>
- <patches>
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-001' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-002' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-003' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-004' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-005' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-006' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-007' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-008' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-009' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-010' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-011' strip='2' />
- <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-012' strip='2' />
- </patches>
- </tarball>
+ <autotools id='readline' >
+ <branch repo="ftp.gnu.org" module="readline/readline-6.0.tar.gz"
+ version="6.0"/>
+ </autotools>
<!--
<autotools id="desktop-file-utils">
@@ -90,14 +79,29 @@
<autotools id="gnucash" autogen-sh="configure"
autogenargs="--enable-ofx">
- <branch module="gnucash-2.2.8.tar.gz" version="2.2.8"
- repo="gnucash.org"/>
-
+ <branch module="gnucash-2.2.9.tar.gz" version="2.2.9"
+ repo="gnucash.org">
+ <patches>
+ <patch>
+ --- src/gnome-utils/Makefile.in 2009-02-23 12:25:26.000000000 -0800
+ +++ src/gnome-utils/Makefile.in 2009-03-06 16:24:45.000000000 -0800
+ @@ -34,7 +34,7 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ - at HAVE_X11_XLIB_H_TRUE@am__append_1 = -lX11
+ +#@HAVE_X11_XLIB_H_TRUE at am__append_1 = -lX11
+ @GTKHTML_USES_GTKPRINT_TRUE at am__append_2 = print-session.c
+ @GTKHTML_USES_GTKPRINT_FALSE at am__append_3 = ${GNOME_PRINT_CFLAGS}
+ @GTKHTML_USES_GTKPRINT_FALSE at am__append_4 = ${GNOME_PRINT_LIBS}
+ </patch>
+ </patches>
+ </branch>
<dependencies>
- <dep package="goffice"/>
+ <dep package="meta-goffice"/>
<dep package="libofx"/>
<!-- <dep package="libgnomeprint"/> -->
- <dep package="gtkhtml"/>
+ <dep package="meta-gtkhtml"/>
<dep package="Slib"/>
</dependencies>
diff --git a/goffice.modules b/goffice.modules
new file mode 100644
index 0000000..6b2c3b9
--- /dev/null
+++ b/goffice.modules
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Moduleset for building goffice libraries needed for GnuCash -->
+
+<moduleset>
+ <repository type="svn" name="svn.gnome.org" default="yes"
+ href="http://svn.gnome.org/svn/"/>
+
+ <metamodule id="meta-goffice">
+ <dependencies>
+ <dep package="goffice"/>
+ <dep package="libart_lgpl"/>
+ <dep package="libgsf"/>
+ </dependencies>
+ </metamodule>
+
+ <autotools id="goffice">
+ <!--
+You need: Debian package name
+ glib >= 2.8.0 libglib2.0-dev
+ gtk+ >= 2.6.0 libgtk2.0-dev
+ pango >= 1.8.1 libpango1.0-dev
+ libgsf >= 1.13.3 libgsf-1-dev
+ libglade >= 2.3.6 libglade2-dev
+ gnome-xml >= 2.4.12 libxml2-dev
+ NOTE: gnome-xml is also known as libxml
+ libart >= 2.3.11 libart-2.0-dev
+-->
+ <branch revision="goffice-0-6"/>
+ <dependencies>
+ <dep package="glib"/>
+ <dep package="libgsf"/>
+ <dep package="libxml2"/>
+ <dep package="pango"/>
+ <dep package="libglade"/>
+ <dep package="libart_lgpl"/>
+<!-- <dep package="gtk-doc"/> -->
+ <dep package="libxml2"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libgsf">
+ <branch/>
+ <dependencies>
+ <dep package="glib"/>
+ <dep package="gnome-vfs"/>
+ <dep package="libbonobo"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libart_lgpl">
+ <branch/>
+ <after>
+ <dep package="meta-gtk-osx-bootstrap"/>
+ <dep package="meta-gtk-osx-core"/>
+ </after>
+ </autotools>
+
+
+
+</moduleset>
diff --git a/gtkhtml.modules b/gtkhtml.modules
new file mode 100644
index 0000000..1a6451b
--- /dev/null
+++ b/gtkhtml.modules
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Modules required to build gtkhtml required by GnuCash -->
+
+<moduleset>
+
+ <repository type="svn" name="svn.gnome.org" default="yes"
+ href="http://svn.gnome.org/svn/"/>
+ <repository type='tarball' name='rpm5.org'
+ href="http://rpm5.org/files/"/>
+ <repository type="tarball" name="abisource/enchant"
+ href="http://www.abisource.com/downloads/enchant/" />
+ <repository type='tarball' name='michael.68k.org'
+ href="http://www.68k.org/~michael/"/>
+ <repository type="tarball" name="ftp.gnu.org"
+ href="ftp://ftp.gnu.org/gnu/"/>
+
+ <metamodule id="meta-gtkhtml">
+ <dependencies>
+ <dep package="gtkhtml"/>
+ <dep package="libgnomeui"/>
+ <dep package="libbonoboui"/>
+ <dep package="libgnome"/>
+ <dep package="libgnomeprint"/>
+ <dep package="libgnomeprintui"/>
+ <dep package="libgnomecups"/>
+ <dep package="libgnomecanvas"/>
+ <dep package="gnome-vfs"/>
+ <dep package="libbonobo"/>
+<!-- <dep package="esound"/> -->
+ <dep package="enchant"/>
+<!-- <dep package="audiofile"/> -->
+ <dep package="dbus"/>
+ <dep package="dbus-glib"/>
+ <dep package="gnome-keyring"/>
+ <dep package="libtasn1"/>
+ </dependencies>
+ </metamodule>
+
+ <autotools id="gtkhtml" >
+ <!--
+In order to compile GtkHTML, you need libgnome[ui] 1.112.1 (or later),
+Bonobo 1.112.1 (or later), gnome-print 2.2.0 (or later) and GAL 2.1.0 (or
+later).
+
+Optionally you may want to install GConf 1.0.7 (or later).
+-->
+ <branch/>
+ <dependencies>
+ <dep package="gtk+"/>
+ <dep package="libgnomeui"/>
+ <dep package="libbonoboui"/>
+ <dep package="libglade"/>
+ <dep package="libgnomeprint"/>
+ <dep package="libgnomeprintui"/>
+ <dep package="iso-codes"/>
+ <dep package="enchant"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libgnomecups">
+ <branch/>
+ <dependencies>
+ <dep package="glib"/>
+ <dep package="gnome-common"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libgnomeprint">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="libart_lgpl"/>
+ <dep package="glib"/>
+ <dep package="gnome-common"/>
+ <dep package="pango"/>
+ <dep package="libgnomecups"/>
+ <dep package="freetype"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libgnomeprintui">
+ <branch/>
+ <dependencies>
+ <dep package="libgnomeprint"/>
+ <dep package="gtk+"/>
+ <dep package="libgnomecanvas"/>
+ <dep package="gnome-icon-theme"/>
+ </dependencies>
+ </autotools>
+
+
+<!-- Audiofile hasn't been actively developed since 2004 -->
+<!--
+ <autotools id='audiofile' autogen-sh="configure">
+ <branch module='audiofile/audiofile-0.2.6.tar.gz'
+ repo='michael.68k.org' version='0.2.6'
+ size="374688" md5sum="9c1049876cd51c0f1b12c2886cce4d42"/>
+ </autotools>
+
+ <autotools id="esound">
+ <branch/>
+ <dependencies>
+ <dep package="audiofile"/>
+ </dependencies>
+ </autotools>
+-->
+ <autotools id="popt">
+ <branch module="popt/popt-1.14.tar.gz" version="1.14"
+ repo="rpm5.org"/>
+ </autotools>
+
+ <!--gnome-vfs in gnome-suites-2.24.modules includes the following
+ <dep package="desktop-file-utils"/>
+ <dep package="avahi"/>
+ <dep package="hal"/>
+ <dep package="gamin"/>
+ but building them on OS-X proved problematic and gnome-vfs builds well
+ without them -->
+ <autotools id="gnome-vfs">
+ <branch/>
+ <dependencies>
+ <dep package="gconf"/>
+ <dep package="shared-mime-info"/>
+ <dep package="gnome-mime-data"/>
+ <dep package="dbus-glib"/>
+ </dependencies>
+ </autotools>
+
+
+ <autotools id="enchant" autogen-sh="configure" >
+ <branch module="1.4.2/enchant-1.4.2.tar.gz" version="1.4.2"
+ repo="abisource/enchant" size='595192'
+ md5sum="fe4558269ff59f569ab9581c907d58cb" />
+ <dependencies>
+ <dep package="glib"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libgnomeui">
+ <branch/>
+ <dependencies>
+ <dep package="libbonoboui"/>
+ <dep package="libglade"/>
+ <dep package="gnome-icon-theme"/>
+ <dep package="gnome-keyring"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="gnome-keyring">
+ <branch/>
+ <dependencies>
+ <dep package="gtk+"/>
+ <dep package="libgcrypt"/>
+ <dep package="libtasn1"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libbonobo">
+<!-- DEPENDS says "ORBit" -->
+ <branch/>
+ <dependencies>
+ <dep package="popt"/>
+ <dep package="ORBit2"/>
+ <dep package="intltool"/>
+ <dep package="gnome-common"/>
+ <dep package="libxml2"/>
+ <dep package="dbus-glib"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libbonoboui">
+ <branch/>
+ <dependencies>
+ <dep package="libgnome"/>
+ <dep package="libbonobo"/>
+ <dep package="libgnomecanvas"/>
+ <dep package="libglade"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libgnome" autogenargs="--disable-esd" >
+ <branch/>
+ <dependencies>
+ <dep package="libxml2"/>
+ <dep package="libxslt"/>
+ <dep package="libbonobo"/>
+ <dep package="gnome-vfs"/>
+ <dep package="gconf"/>
+<!-- <dep package="esound"/> -->
+ </dependencies>
+ </autotools>
+
+ <tarball id="dbus" version="1.2.12"
+ autogenargs="--disable-selinux --without-x">
+ <source href="http://dbus.freedesktop.org/releases/dbus/dbus-1.2.12.tar.gz"/>
+ <after>
+ <dep package="gtk+"/>
+ </after>
+ </tarball>
+
+ <tarball id="dbus-glib" version="0.80" autogenargs="--disable-selinux">
+ <source href="http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.80.tar.gz"/>
+ <dependencies>
+ <dep package="libxml2"/>
+ <dep package="dbus"/>
+ </dependencies>
+ <after>
+ <dep package="meta-gtk-osx-bootstrap"/>
+ <dep package="meta-gtk-osx-core"/>
+ </after>
+ </tarball>
+
+ <autotools id="libgnomecanvas">
+ <branch/>
+ <after>
+ <dep package="meta-gtk-osx-bootstrap"/>
+ <dep package="meta-gtk-osx-core"/>
+ </after>
+ </autotools>
+
+ <autotools id="libtasn1" supports-non-srcdir-builds="no">
+ <branch module="gnutls/libtasn1-1.8.tar.gz" version="1.8"
+ repo="ftp.gnu.org"/>
+ </autotools>
+
+
+
+</moduleset>
\ No newline at end of file
commit 6891d5ea0b60bba67df7c07d7675eb0b596438e0
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Mar 3 09:17:29 2009 -0800
Initial creation of BuildGnuCash; Provides for GnuCash 2.2.8 and the Imendio Oct 2008 version of gtk-osx
diff --git a/.jhbuildrc b/.jhbuildrc
new file mode 100644
index 0000000..e7a5ea1
--- /dev/null
+++ b/.jhbuildrc
@@ -0,0 +1,301 @@
+# -*- mode: python -*-
+#
+# Copyright (C) 2006, 2007, 2008 Imendio AB
+#
+# Default setup for building GTK+ on Mac OS X. Note that you should
+# normally never need to edit this file. Any custom settings should be
+# done in ~/.jhbuildrc-custom.
+#
+# Specific builds can be set up by creating files named
+# ~/.jhbuildrc-<build>. When setting the environment variable JHB to
+# such a name, the corresponding rc file will be read (e.g.:
+# JHB=mybuild jhbuild shell).
+#
+# Use .jhbuildrc-custom to override the moduleset, modules to build,
+# the source checkout location, installation prefix, or svn usernames
+# etc.
+#
+# Please email richard at imendio.com if you have suggestions for
+# improving this setup, or have any patches that you would like to get
+# included.
+
+import sys
+import errno
+
+# Some utitily functions used here and in custom files:
+#
+def environ_append(key, value, separator=' '):
+ old_value = os.environ.get(key)
+ if old_value is not None:
+ value = old_value + separator + value
+ os.environ[key] = value
+
+def environ_prepend(key, value, separator=' '):
+ old_value = os.environ.get(key)
+ if old_value is not None:
+ value = value + separator + old_value
+ os.environ[key] = value
+
+def parse_custom_argument(key):
+ for i, arg in enumerate(sys.argv[:-1]):
+ if arg == key:
+ return sys.argv[i+1]
+ return None
+
+def set_branch(module, branch):
+ # Keep any overriden repo name here to keep custom usernames set
+ # up in a custom setup.
+ #
+ repo = repos.get("svn.gnome.org", "http://svn.gnome.org/svn")
+ if repo.endswith("/"):
+ repo = repo[:-1]
+
+ branches[module] = repo + "/" + module + "/" + branch
+
+def append_autogenargs(module, args):
+ old_value = module_autogenargs.get(module, autogenargs)
+ module_autogenargs[module] = old_value + " " + args
+
+# Set up the environment for building against 10.4 SDK.
+#
+sdkdir = None
+def setup_sdk_10_4():
+ target = "10.4"
+ sdk = "MacOSX10.4u.sdk"
+ sdkdir = os.path.join("/Developer/SDKs", sdk)
+
+ # To pick up cups-config from the right place. NOTE: Change this as
+ # soon as GTK+ is fixed, and only set CUPS_CONFIG instead (GTK+ 2.13
+ # is fixed).
+ #
+ prependpath("PATH", os.path.join(sdkdir, "usr/bin"))
+
+ os.environ["MACOSX_DEPLOYMENT_TARGET"] = target
+
+ # Seems like we need this since many libraries otherwise only look for
+ # various dependencies (e.g. libiconv) in /usr/lib, hence pulling in
+ # the wrong -L that doesn't have fat binaries on pre-10.5.
+ #
+ environ_prepend("LDFLAGS", "-L" + sdkdir + "/usr/lib")
+ environ_prepend("CPPFLAGS", "-I" + sdkdir + "/usr/include")
+
+ # It looks like -isysroot is broken on 10.4, causing link
+ # problems. But we don't really need to set it for 10.4 so just
+ # skip that.
+ #
+ if not osx_version.startswith("8."):
+ environ_append("CFLAGS", "-isysroot " + sdkdir)
+ environ_append("CXXFLAGS", "-isysroot " + sdkdir)
+ environ_append("LDFLAGS", "-isysroot " + sdkdir)
+
+ environ_append("CFLAGS", "-mmacosx-version-min=" + target)
+ environ_append("LDFLAGS", "-mmacosx-version-min=" + target)
+
+ return sdkdir
+
+def autogenargs_for_arch(root, arch, original_cflags, original_cxxflags, original_ldflags):
+ if root is not None and not osx_version.startswith("8."):
+ rootstr = " -isysroot " + root
+ else:
+ rootstr = ""
+ archstr = " -arch " + arch
+ return \
+ 'CFLAGS="' + original_cflags + rootstr + archstr + '" ' + \
+ 'CXXFLAGS="' + original_cxxflags + rootstr + archstr + '" ' + \
+ 'LDFLAGS="' + original_ldflags + archstr + '"'
+
+osx_version = os.popen("uname -r").read().strip()
+
+# Moduleset to use.
+#
+moduleset = 'http://people.imendio.com/richard/gtk-osx-build/modulesets/gtk-osx.modules'
+
+# A list of the modules to build.
+#
+modules = [ 'meta-gtk-osx-core' ]
+
+# A list of modules to skip.
+#
+skip.append('gmp')
+skip.append('guile')
+
+# Source and installation locations.
+#
+root = os.path.expanduser("~/gtk")
+checkoutroot = os.path.join(root, "source")
+prefix = os.path.join(root, "inst")
+
+# Extra arguments to pass to all autogen.sh scripts.
+#
+autogenargs='--disable-static --disable-gtk-doc --disable-docs --disable-scrollkeeper'
+alwaysautogen = True
+
+# Set debugging format to the old one from Tiger and earlier since the new
+# default in Leopard breaks many things. Also set gnu89 as the new default
+# gnu99 changes how extern inline works, breaking, glib's inline setup,
+# until glib is fixed.
+#
+os.environ['CFLAGS'] = '-O -gstabs+3 -std=gnu89'
+os.environ['CXXFLAGS'] = '-O -gstabs+3'
+
+# Use the included install-check program if available. It won't update
+# timestamps if the header hasn't changed, which speeds up builds.
+#
+path = os.path.expanduser('~/bin/install-check')
+if os.path.exists(path):
+ os.environ['INSTALL'] = path
+
+# When building on intel, force build to be 486, since glib won't
+# enable asm atomic operations otherwise.
+#
+try:
+ f = os.popen("uname -p")
+ if f.read().startswith("i386"):
+ append_autogenargs("glib", "--build=i486-apple-darwin")
+except:
+ pass
+
+# Prefix to use in the shell, can be overridden in the custom rc file
+# or in specific setups. Can be set to None to be removed.
+#
+prompt_prefix = "JH"
+
+default_build = ""
+
+if osx_version.startswith("7."):
+ print "Error: Mac OS X 10.4 or newer is required, exiting."
+ raise SystemExit
+elif osx_version.startswith("8."):
+ # Tiger, we want to use the python version from jhbuild.
+ want_jhbuild_python = True
+else:
+ # Leopard or newer.
+ want_jhbuild_python = False
+
+# Import optional user RC for further customization. You can override
+# the prefix or default build setup for example, or CFLAGS or
+# module_autogenargs, etc.
+#
+userrc = os.path.join(os.environ['HOME'], '.jhbuildrc-custom')
+if os.path.exists(userrc):
+ execfile(userrc)
+
+# Allow including different variants depending on the environment
+# variable JHB. This can be used to have different setups for SDK
+# builds, for example.
+#
+build = os.environ.get('JHB', default_build)
+
+# Check and warn if jhbuild is started from within jhbuild, since that
+# will mess up environment variables, especially if different build
+# setups are used.
+#
+old_prefix = os.environ.get('JHBUILD_PREFIX', "")
+old_build = os.environ.get('JHBUILD_CONFIG', "")
+ran_recursively = old_prefix != ""
+if ran_recursively:
+ if old_build != build:
+ print "Error: jhbuild is already running with a different build setup, exiting."
+ raise SystemExit
+
+ print "Warning: jhbuild is started from within a jhbuild session."
+
+if build != "":
+ try:
+ execfile(os.path.join(os.environ['HOME'], '.jhbuildrc-' + build))
+ except EnvironmentError, e:
+ print "Couldn't find the file '.jhbuildrc-" + build + "', exiting."
+ raise SystemExit
+
+tarballdir = os.path.join(checkoutroot, 'pkgs')
+
+os.environ['PREFIX'] = prefix # Deprecated, please move to JHBUILD_PREFIX.
+os.environ['JHBUILD_PREFIX'] = prefix
+os.environ['JHBUILD_SOURCE'] = checkoutroot
+
+os.environ['LIBTOOLIZE'] = prefix + '/bin/libtoolize'
+
+# By default, we want the system perl and python, not from macports or
+# so.
+#
+os.environ["PERL"] = "/usr/bin/perl"
+os.environ["INTLTOOL_PERL"] = "/usr/bin/perl"
+if not want_jhbuild_python:
+ skip.append('python')
+ os.environ["PYTHON"] = "/usr/bin/python"
+
+# Use libxml/libxslt from the system. Append to the pkg-config path to
+# get the system versions picked up.
+#
+skip.append("libxml2")
+skip.append("libxslt")
+addpath("PKG_CONFIG_PATH", "/usr/lib/pkgconfig")
+
+# The option "headerpad_max_install_names" is there to leave some room for
+# changing the library locations with install_name_tool. Note that GNU
+# libtool seems to drop the option if we don't use -W here.
+#
+environ_append('LDFLAGS', '-Wl,-headerpad_max_install_names')
+
+# Make sure we find our installed modules, and before other versions.
+environ_prepend('LDFLAGS', '-L' + prefix + '/lib')
+environ_prepend('CPPFLAGS', '-I' + prefix + '/include')
+
+# Add additional Python/Perl paths so that our modules can be found.
+#
+version = 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1])
+environ_append('PYTHONPATH', prefix + '/lib/' + version + '/site-packages/gtk-2.0', ':')
+environ_append('PERL5LIB', prefix + '/lib/perl5/vendor_perl', ':')
+environ_append('PERL5LIB', prefix + '/lib/perl5/site_perl', ':')
+
+# Point gtk-doc and other xlstproc users to our XML catalog.
+#
+os.environ['XML_CATALOG_FILES'] = prefix + '/etc/xml/catalog'
+
+# Speed up gettext build by disabling unneeded stuff.
+#
+append_autogenargs("gettext", "--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp")
+
+# Support prepending frameworks to the PKG_CONFIG_PATH, CFLAGS,
+# LDFLAGS and ACLOCAL_FLAGS variables.
+#
+frameworks = os.environ.get("JHB_PREPEND_FRAMEWORKS", "")
+for framework in frameworks.split(":"):
+ if framework != "" and os.path.exists(framework):
+ # Use prependpath where possible to ensure our paths are added
+ # in front of the ones jhbuild sets up.
+ if os.path.exists(framework + "/Headers"):
+ environ_prepend("CPPFLAGS", "-I" + framework + "/Headers", " ")
+ if os.path.exists(framework + "/Resources/dev/bin"):
+ prependpath("PATH", framework + "/Resources/dev/bin")
+ if os.path.exists(framework + "/Resources/dev/lib/pkgconfig"):
+ prependpath("PKG_CONFIG_PATH", framework + "/Resources/dev/lib/pkgconfig")
+ if os.path.exists(framework + "/Resources/dev/lib"):
+ environ_prepend("LDFLAGS", "-L" + framework + "/Resources/dev/lib", " ")
+ if os.path.exists(framework + "/Resources/dev/share/aclocal"):
+ prependpath("ACLOCAL_FLAGS", framework + "/Resources/dev/share/aclocal")
+
+# We do some crude extra argument parsing just to add support for
+# getting environment variables. Used in framework creation to pick up
+# the jhbuild prefix.
+#
+value = parse_custom_argument("getenv")
+if value:
+ print os.environ.get(value, "")
+ raise SystemExit
+
+if build:
+ print "Build setup: %s, prefix: %s" % (build, prefix)
+ os.environ["JHBUILD_CONFIG"] = build
+else:
+ print "Prefix: %s" % (prefix)
+
+if not ran_recursively and prompt_prefix:
+ os.environ["JHBUILD_PROMPT"] = "[" + prompt_prefix + "] "
+
+# Unset this se we don't mess with the check for not starting
+# recursively.
+os.unsetenv("JHB")
+
+if "shell" in sys.argv:
+ print "Entered jhbuild shell, type 'exit' to return."
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
new file mode 100644
index 0000000..043e295
--- /dev/null
+++ b/.jhbuildrc-custom
@@ -0,0 +1,50 @@
+# -*- mode: python -*-
+
+checkoutroot = '/usr/local/src/gnome2'
+prefix = '/usr/local/gtk2'
+
+#This somehow fell out of jhbuildrc:
+environ_prepend("PATH", prefix + "/bin")
+
+autogenargs='--disable-static --enable-shared --disable-gtk-doc --disable-docs --disable-scrollkeeper --disable-xlib'
+
+#environ_append("LDFLAGS", "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib")
+
+
+module_autogenargs={}
+module_autogenargs["gconf"]="--enable-static --enable-shared --disable-scrollkeeper --disable-xlib"
+module_autogenargs["libofx"]="--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib"
+module_autogenargs["libgnomeui"]="--disable-static --enable-shared --disable-scrollkeeper --disable-xlib --without-x"
+module_autogenargs["guile"]="ABI=32"
+#module_autogenargs["dbus"]="--localstatedir=/var"
+module_autogenargs["libxslt"]="--with-libxml-prefix=${prefix}"
+
+#NB: to compile libgnomeprint, one must repair a defect in
+#/usr/share/aclocal/libtool.m4, because libgnomeprint abuses it a bit:
+#Find the defun for AC_CHECK_LIBM, and for the $host case for darwin,
+#add
+#LIBM=" "
+#before the ";;"
+
+module_makeargs = {}
+module_makeargs["perl-xml-parser"]="EXPATLIBPATH=" + prefix + "/lib EXPATINCPATH=${prefix}/include "
+
+
+path = prefix + '/bin/install-check'
+if os.path.exists(path):
+ os.environ['INSTALL'] = path
+#Comment this out if you want to build with your default sdk; make a
+#similar function (it's in .jhbuildrc) if you want to set a different
+#sdk altogether.
+#setup_sdk_10_4()
+
+
+moduleset = os.path.expanduser("~/gnucash.modules")
+
+modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
+
+build_policy = "updated-deps"
+
+
+
+
diff --git a/.jhbuildrc-fw-10.4 b/.jhbuildrc-fw-10.4
new file mode 100644
index 0000000..c98961f
--- /dev/null
+++ b/.jhbuildrc-fw-10.4
@@ -0,0 +1,62 @@
+# -*- mode: python -*-
+#
+# Copyright (C) 2006 - 2008 Imendio AB
+#
+# Build setup for using the frameworks for GLib, Cairo, GTK+ etc.
+#
+
+prompt_prefix = "FW"
+
+# Source and installation locations.
+#
+root = os.path.expanduser("~/Source/gtk-fw")
+checkoutroot = os.path.join(root, "source")
+prefix = os.path.join(root, "inst")
+
+sdkdir = setup_sdk_10_4()
+
+# Skip those for now.
+#
+skip.append("gst-plugins-ugly")
+skip.append("gst-plugins-bad")
+skip.append("gst-ffmpeg")
+skip.append("faad")
+
+# Skip everything that is included in our frameworks.
+#
+skip.append("glib")
+skip.append("pango")
+skip.append("atk")
+skip.append("cairo")
+skip.append("gtk+")
+skip.append("ige-mac-integration")
+skip.append("gtk-engines")
+skip.append("hicolor-icon-theme")
+skip.append("gnome-icon-theme")
+skip.append("gettext")
+skip.append("intltool")
+skip.append("libpng")
+skip.append("libtiff")
+skip.append("libjpeg")
+skip.append("libglade")
+skip.append("loudmouth")
+skip.append("WebKit")
+
+# Not needed.
+#
+skip.append("waf")
+skip.append("pyxml")
+skip.append("automake-1.4")
+skip.append("automake-1.7")
+skip.append("automake-1.8")
+skip.append("tango-icon-theme")
+skip.append("tango-icon-theme-extras")
+
+# Setup jhbuild to point to frameworks.
+#
+environ_prepend("JHB_PREPEND_FRAMEWORKS", "/Library/Frameworks/GLib.framework", ":")
+environ_prepend("JHB_PREPEND_FRAMEWORKS", "/Library/Frameworks/Cairo.framework", ":")
+environ_prepend("JHB_PREPEND_FRAMEWORKS", "/Library/Frameworks/Gtk.framework", ":")
+environ_prepend("JHB_PREPEND_FRAMEWORKS", "/Library/Frameworks/Libglade.framework", ":")
+environ_prepend("JHB_PREPEND_FRAMEWORKS", "/Library/Frameworks/Loudmouth.framework", ":")
+environ_prepend("JHB_PREPEND_FRAMEWORKS", "/Library/Frameworks/WebKitGtk.framework", ":")
diff --git a/.jhbuildrc-gnucash b/.jhbuildrc-gnucash
new file mode 100644
index 0000000..d589510
--- /dev/null
+++ b/.jhbuildrc-gnucash
@@ -0,0 +1,116 @@
+checkoutroot = os.path.expanduser('/usr/local/src/gnome')
+prefix = '/usr/local/gtk'
+autogenargs='--disable-static --disable-gtk-doc --disable-docs --disable-scrollkeeper ABI=32'
+path = os.path.expanduser('usr/local/gtk/bin/install-check')
+if os.path.exists(path):
+ os.environ['INSTALL'] = path
+#NOTE: Installed by meta-gtk-osx-bootstrap & meta-gtk-osx-core:
+# libpng, gtk-doc, libjpeg, libtiff, libxml2, libxslt, docbook-setup,
+# gnome-doc-utils-fake, expat, perl-xml-parser, hicolor-icon-theme,
+# libcurl, bison, gnome-common, intltool
+# glib, cairo, freetype, fontconfig, meta-gtk-bootstrap,atk, pango,
+# pixman, ige-mac-integration
+
+modules=[meta-gtk-osx-bootstrap, meta-gtk-osx-core, libglade, libIDL, ORBit2, gconf, libgnomecanvas, dbus, dbus-glib, popt, icon-naming-utils, gome-icon-theme]
+
+moduleset=gnome-external-deps-2.22.modules
+
+modules=[libgpg-error, libgcrypt, libgsf, libtasn1]
+
+moduleset=gnome-suites-2.22.modules
+modules=[libgnomecups, gnome-mime-data, gnome-vfs, audiofile, esound,libart_lgpl, libbonobo, libbonoboui, libgnome, libgnomecanvas, libgnomeui, gnome-keyring, gtkhtml, libgnomeprint]
+
+Dependency Tree:
+
+libglade
+ gtk+
+ atk
+ pango
+ glib
+ cairo
+ pixman
+ fontconfig
+ freetype
+ expat
+ libpng
+ gtk-doc
+ docbook-setup
+ libxslt
+ libxml2
+ gnome-doc-utils-fake
+ libjpeg
+ libtiff
+ gnome-common
+ intltool
+ perl-xml-parser
+ expat
+ hicolor-icon-theme
+ libcurl
+ bison
+libgnomecanvas
+ gtk+ (see libglade)
+ libart_lgpl
+popt
+gnome-icon-theme
+ icon-naming-utils
+ gtk+
+
+
+{gnome-suites-2.22.modules}
+goffice X
+ libgsf {gnome-external-deps} X
+ gnome-vfs X
+ gconf (from gtk-osx-random.modules)
+ gtk+ (see libglade)
+ ORBit2
+ libIDL
+ desktop-file-utils
+ shared-mime-info
+ gnome-mime-data
+ avahi {gnome-external-deps} x
+ dbus-python {gnome-external-deps} x
+ dbus-glib(from gtk-osx-random.modules)
+ pygtk (from gtk-osx-python.modules)
+ pygobject
+ pycairo
+ libglade (q.v.)
+ hal {gnome-external-deps} x
+ dbus-glib (from gtk-osx-random.modules)
+ dbus
+ gtk+ (see libglade)
+ libvolume_id {gnome-external-deps} x
+ gamin {gnome-external-deps} x
+
+ libbonobo x
+ ORBit2 (see gconf)
+ intltool (see pango)
+ libxml2 (see pango)
+ libgnomecanvas (gtk-osx-random.modules)
+ libglade (q.v.)
+ gnome-vfs (see libgsf)
+
+libgnomeprint x
+ libgnomecups x
+ pango (see libglade)
+
+gtkhtml X
+ libgnomeui X
+ gnome-keyring
+ libgcrypt {gnome-external-deps} X
+ libgpg-error {gnome-external-deps} X
+ libtasn1 {gnome-external-deps} X
+ libbonoboui (see libgnome)
+ libgnome
+ gnome-vfs (see libgsf)
+ esound
+ audifile
+ libbonobo (see libgsf)
+ esound
+ audiofile
+
+ libglade (q.v.)
+ gnome-icon-theme (gtk-osx-themes.modules)
+ gail X
+ libsoup x
+ gnutls {gnome-external-deps} X
+ opencdk {gnome-external-deps} X
diff --git a/Gnucash Build Instructions b/Gnucash Build Instructions
new file mode 100644
index 0000000..b49ac9e
--- /dev/null
+++ b/Gnucash Build Instructions
@@ -0,0 +1,589 @@
+
+==Overview==
+GnuCash can be built to run more or less natively on OSX -- meaning without X11. Better yet, the build is almost automatic.
+
+To pull this off, you'll need Developer Tools installed. The instructions which follow assume that you're comfortable building programs from the command line and editing text files.
+
+I've succeeded in building this under various incarnations of Leopard while perfecting the modulesets, always on a Mac Pro... but it ought to work on any Mac running Tiger or Leopard.
+
+The default configuration builds in your home folder. On my system, I build in /usr/local/src/gnome and install to /usr/local/gtk. If you want to do that, uncomment the checkoutroot and prefix lines in .jhbuildrc-custom, then create the folders up front and give yourself ownership. If you don't know how to do that, then you should probably leave it the way it is.
+
+==Preliminaries==
+
+Go to http://developer.imendio.com/projects/gtk-macosx/build-instructions and follow the instructions. '''''Don't run jhbuild build yet!'''''
+
+If you have set <tt>$MACOSX_DEPLOYMENT_TARGET</tt> to something other than your running version of OSX, you may get an error during jhbuld bootstrap.
+
+You may get an error about <tt>$PREFIX/inst/man/man1/cjpeg.1</tt> not existing. What this really means is that install wasn't set to make the directory, so select '[4] start shell" and mkdir -p $PREFIX/inst/man/man1, quit the shell, and select '[1] rerun stage install'.
+
+Paste the code from [[#Customize jhbuildrc]] into a file named ".jhbuildrc-custom" in your home folder.
+Do likewise for [[#Gnucash Moduleset]], with a filename "gnucash.modules".
+
+==Building==
+
+Once all of the preliminaries are complete, do:
+<tt>
+$> jhbuild build
+</tt>
+
+You'll get a few errors:
+
+'''libgnomeprint''' has a defective configure.ac which fails when libm isn't found. I've filed a bug report (Bug 540837) with a patch, but a similar bug report (Bug 471730) has been sitting for a year, so there's no telling when the developers will get around to fixing this (and libgnomeprint is deprecated anyway). Here's the patch:
+
+<pre>
+--- configure.in 2008-07-03 14:18:44.000000000 -0700
++++ configure.in.mod 2008-07-03 14:17:11.000000000 -0700
+@@ -148,9 +148,17 @@
+ dnl Checking for libm
+ dnl =================================
+ AC_CHECK_LIBM
+-if test "x$LIBM" = "x"; then
+- AC_MSG_ERROR(You need -lm(mathematic library) for this version of libgnomeprint.)
+-fi
++case $host in
++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++ # These system don't have libm, or don't need it
++ ;;
++*)
++ if test "x$LIBM" = "x"; then
++ AC_MSG_ERROR(You need -lm(mathematic library) for this version of
++libgnomeprint.)
++ fi
++ ;;
++esac
+ LDFLAGS="$LDFLAGS $LIBM"
+
+ dnl =================================
+</pre>
+
+Select '[4] start shell', apply the patch (you probably will need to use <tt>patch -l</tt>) , quit the shell, and select "[6] go to stage configure"
+
+'''goffice''' will complain about a misconfiguration of gtk-doc. It doesn't matter, so select "[2] ignore error".
+
+'''libgnomeui''' Another configure.in bug (Bug 535958). The patch:
+<pre>
+Index: configure.in
+===================================================================
+--- configure.in (revision 5608)
++++ configure.in (working copy)
+@@ -116,7 +116,7 @@
+ gnome_keyring_requirement="gnome-keyring-1 >= gnome_keyring_required_version"
+ GNOME_KEYRING="gnome-keyring-1"
+
+- if test x$GNOME_HAVE_X11 != xyes ; then
++ if test x$have_x != xdisabled && test x$GNOME_HAVE_X11 != xyes ; then
+ AC_MSG_ERROR([libX11 not found])
+ fi
+ ;;
+
+
+</pre>
+
+Select "[4] start shell", apply the patch, quit the shell, and select "[1] rerun configure"
+
+'''slib''' will fail because it wants to install to /usr/local, and you'd have to be building with root authority for that to work. We don't want to install there anyway, so select "[4] start shell" and:
+<tt>
+$> mkdir $PREFIX/lib/slib
+$> cp *.scm $PREFIX/lib/slib/
+$> cp guile.init $PREFIX/lib/slib
+$> cd $PREFIX/share/guile/1.6/
+$> ln -s ../../../lib/slib .
+$> $PREFIX/bin/guile
+guile> (use-modules (ice-9 slib))
+guile> (require 'new-catalog)
+guile> (quit)
+</tt>
+Quit the shell and select "[2] ignore error and continue to done".
+
+You'll have to stop the build (control-c will do it) after the gnucash tarball unpacks to apply the following patch. '''''Make sure to do it before configure finishes!'''''
+Select "[4] start shell", apply the patch, exit the shell, and select "[1]" rerun configure'''.
+
+Here's the patch:
+<pre>
+--- configure 2008-05-31 16:07:04.000000000 -0700
++++ configure 2008-04-27 03:21:24.000000000 -0700
+@@ -23798,7 +23798,7 @@
+ # These are unavailable on windows/mingw32
+
+
+-for ac_header in X11/Xlib.h glob.h
++for ac_header in glob.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+</pre>
+
+
+==Running from the commandline==
+There's a few more things to fix before we can run GnuCash. GnuCash uses dbus to find its configuration data. First we need to fix up dbus's config file. Open $PREFIX/etc/dbus-1/session.conf in your editor. Quite near the top you'll see a line that looks something like
+<pre>
+ <listen>unix:tmpdir=/var/folders/8Z/8ZMrxptP2RW3+U+8ZNMZY++++TI/-Tmp-/</listen>
+</pre>
+That's a perfectly valid temp directory... but dbus itself can't handle those +s, so change the spec to <code>unix:tmpdir=$PREFIX/tmp</code> and save the file.
+
+:Run <tt>$PREFIX/bin/dbus-uuidgen --ensure=$PREFIX/var/lib/dbus/machine-id</tt>
+
+:Rename <code>$PREFIX/lib/libjpeg.dylib, $PREFIX/lib/libtiff.dylib</code>, and <code>$PREFIX/lib/libpng.dylib</code> to something else (I use names like <code>$PREFIX/lib/libjpeg.dylib.hidden</code>).
+
+:Replace <code>$PREFIX/bin/gnucash</code> with the code from [[#GnuCash Start Script (commandline)]].
+
+Now you're ready to try it out:
+<tt>
+$> $PREFIX/bin/gnucash
+</tt>
+
+==Making a Bundle==
+So far so good, but you don't really want to have to open a Terminal window every time you want to use GnuCash, now do you? Of course not. You want a nice icon in your Applications folder (and maybe in the Dock) to click on when you run GnuCash. Here's how to do this:
+
+:Install the bundler from http://developer.imendio.com/projects/gtk-macosx/creating-app-bundles.
+:I like to create a subfolder called gnucash-bundler and keep everything in there, but you don't have to.
+:Paste the contents of [[#GnuCash Bundle Description]] into a file called "gnucash.bundle", [[#Gnucash Info.Plist]] into "Info.Plist", and [[#Gnucash Start Script (Bundler)]] into "gnucash-launcher", all in the same folder.
+:Look through both files and adjust the paths to match your installation.
+:make gnucash-launcher executable (<tt>chmod +x gnucash-launcher</tt>)
+:execute <tt>jhbuild shell</tt> to set up the environment for the bundler
+:while in the shell, execute <tt> ige-mac-bundler gnucash.bundle</tt>.
+
+And your bundle should be ready to go.
+Try <tt>GnuCash.app/Contents/MacOSX/GnuCash</tt> from the command-line so that you can see any error messages. If that works, try <tt>open GnuCash.app</tt>. If that works, then you can move GnuCash.app to your Applications folder and it's ready to use. '''''Don't move or remove the installation directory (~/gtk/inst by default): Both dbus and GnuCash have links pointing into it which can't at present be changed.'''''
+
+==Files==
+===Customize jhbuildrc===
+Paste this into .jhbuildrc-custom in your home folder:
+<pre>
+# -*- mode: python -*-
+
+#You can override the build and install directories by uncommenting
+#and editing the next two lines. Be sure to create these directories
+#and change their ownership to you before you try to build!
+#checkoutroot = '/usr/local/src/gnome'
+#prefix = '/usr/local/gtk'
+
+autogenargs='--disable-static --enable-shared --disable-gtk-doc --disable-docs --disable-scrollkeeper --disable-xlib'
+
+module_autogenargs={}
+module_autogenargs["gconf"]="--enable-static --enable-shared --disable-scrollkeeper --disable-xlib"
+module_autogenargs["libofx"]="--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib"
+module_autogenargs["libgnomeui"]="--disable-static --enable-shared --disable-scrollkeeper --disable-xlib --without-x"
+
+module_makeargs = {}
+module_makeargs["perl-xml-parser"]="EXPATLIBPATH=" + prefix + "/lib EXPATINCPATH=${prefix}/include "
+
+
+path = prefix + '/bin/install-check'
+if os.path.exists(path):
+ os.environ['INSTALL'] = path
+#Comment this out if you want to build with your default sdk; make a
+#similar function (it's in .jhbuildrc) if you want to set a different
+#sdk altogether.
+#setup_sdk_10_4()
+
+
+moduleset = os.path.expanduser("~/gnucash.modules")
+
+modules = ['meta-gtk-osx-bootstrap', 'meta-gtk-osx-core', 'meta-gtk-osx-freetype', 'gnucash']
+
+build_policy = "updated-deps"
+</pre>
+
+===Gnucash Moduleset===
+Paste the following into a file named gnucash.modules in your home folder:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+ <repository type="svn" name="svn.gnome.org" default="yes"
+ href="http://svn.gnome.org/svn/"/>
+ <repository type="tarball" name="kernel.org"
+ href="http://www.kernel.org/pub/linux/"/>
+ <repository type='tarball' name='ftp.gnu.org'
+ href="ftp://ftp.gnu.org/gnu/"/>
+ <repository type='tarball' name='sourceforge'
+ href="http://downloads.sourceforge.net/"/>
+ <repository type="cvs" name="slib.savannah.gnu.org"
+ cvsroot=":pserver:anonymous at cvs.savannah.gnu.org:/sources/slib"
+ password=""/>
+ <repository type="tarball" name="gnucash.org"
+ href="http://www.gnucash.org/pub/gnucash/sources/stable/"/>
+
+
+
+ <include
+ href="http://people.imendio.com/richard/gtk-osx-build/modulesets/gtk-osx.modules"/>
+
+
+ <tarball id='readline' autogen-sh='configure'>
+ <source href='ftp://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz'/>
+ <patches>
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-001' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-002' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-003' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-004' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-005' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-006' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-007' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-008' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-009' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-010' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-011' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-012' strip='2' />
+ </patches>
+ </tarball>
+
+ <autotools id="OpenSP" autogen-sh='configure'
+ autogenargs="--disable-static --enable-shared --disable-doc-build">
+ <branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
+ version='1.5.2'/>>
+ </autotools>
+
+ <autotools id="libofx" autogen-sh='configure'>
+ <branch repo="sourceforge" module="libofx/libofx-0.9.0.tar.gz"
+ version='0.9.0'/>
+ <dependencies>
+ <dep package='guile-1.6'/>
+ <dep package="OpenSP"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="guile-1.6" autogen-sh="configure"
+ autogenargs="--disable-static --enable-shared
+ --disable-scrollkeeper --disable-xlib">
+ <branch repo="ftp.gnu.org" module="guile/guile-1.6.8.tar.gz"
+ version="1.6.7" size="3114052" />
+ <dependencies>
+ <dep package='readline'/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="Slib" skip-autogen="true">
+ <branch repo="slib.savannah.gnu.org"
+ module="slib"/>
+ <dependencies>
+ <dep package="guile-1.6"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="gnucash" autogen-sh="configure"
+ autogenargs="--enable-ofx">
+ <branch module="gnucash-2.2.5.tar.gz" version="2.2.5"
+ repo="gnucash.org"/>
+
+ <dependencies>
+ <dep package="goffice"/>
+ <dep package="libofx"/>
+ <dep package="gtkhtml"/>
+ <dep package="Slib"/>
+ </dependencies>
+
+ </autotools>
+
+</moduleset>
+</pre>
+
+===GnuCash Start Script (commandline)===
+Replace $PREFIX/bin/gnucash with this:
+<pre>
+PREFIX="~/gtk/inst/" #You'll have to fix this up if you changed it
+export PREFIX
+PATH="$PREFIX/bin:${PATH}"
+export PATH
+
+GUILE_WARN_DEPRECATED="no"
+export GUILE_WARN_DEPRECATED
+
+if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+ eval `dbus-launch --sh-syntax --exit-with-session --config-file=$PREFIX/etc/dbus-1/session.conf`
+fi
+
+GNC_MODULE_PATH="$PREFIX/lib/gnucash:${GNC_MODULE_PATH}"
+
+EXTRA_PATH="${EXTRA_PATH}:$PREFIX/share/gnucash/guile-modules"
+EXTRA_PATH="${EXTRA_PATH}:$PREFIX/share/gnucash/scm"
+GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
+
+EXTRA_LIBS="${GNC_MODULE_PATH}"
+EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
+EXTRA_LIBS="${EXTRA_LIBS}:$PREFIX/lib"
+EXTRA_LIBS="${EXTRA_LIBS}:$PREFIX/lib/gnucash"
+
+LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
+DYLD_LIBRARY_PATH="${EXTRA_LIBS}:${DYLD_LIBRARY_PATH}"
+
+export GNC_MODULE_PATH
+export GUILE_LOAD_PATH
+export LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
+
+exec gnucash-bin "$@"
+</pre>
+===Gnucash Start Script (Bundler)===
+If you're going to use the bundler, paste this file into your bundle directory named gnucash-launcher; to run from the command line, put this in $PREFIX/bin/gnucash.
+<pre>
+#!/bin/sh
+
+if test "x$IGE_DEBUG_LAUNCHER" != x; then
+ set -x
+fi
+
+if test "x$IGE_DEBUG_GDB" != x; then
+ EXEC="gdb --args"
+else
+ EXEC=exec
+fi
+
+name="`basename $0`"
+tmp="`pwd`/$0"
+tmp=`dirname "$tmp"`
+tmp=`dirname "$tmp"`
+bundle=`dirname "$tmp"`
+bundle_contents="$bundle"/Contents
+bundle_res="$bundle_contents"/Resources
+bundle_lib="$bundle_res"/lib
+bundle_bin="$bundle_res"/bin
+bundle_data="$bundle_res"/share
+bundle_etc="$bundle_res"/etc
+
+export DYLD_LIBRARY_PATH="$bundle_lib"
+export XDG_CONFIG_DIRS="$bundle_etc"/xdg
+export XDG_DATA_DIRS="$bundle_data"
+export GTK_DATA_PREFIX="$bundle_data"
+export GTK_EXE_PREFIX="$bundle_res"
+export GTK_PATH="$bundle_res"
+
+export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
+export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
+export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
+export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
+
+# We need a UTF-8 locale.
+export LANG="`grep \`defaults read .GlobalPreferences AppleCollationOrder 2>&1\`_ /usr/share/locale/locale.alias | tail -n1 | sed 's/\./ /' | awk '{print $2}'`.UTF-8"
+
+if test -f "$bundle_lib/charset.alias"; then
+ export CHARSETALIASDIR="$bundle_lib"
+fi
+
+# Extra arguments can be added in environment.sh.
+EXTRA_ARGS="--config-path $bundle_etc/gnucash --share-path $bundle_data/gnucash --debug"
+
+if test -f "$bundle_res/environment.sh"; then
+ source "$bundle_res/environment.sh"
+fi
+
+# Strip out the argument added by the OS.
+if [ x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ]; then
+ shift 1
+fi
+
+PFX=${bundle_res}
+export PFX
+PATH="${PFX}/bin:${PATH}"
+export PATH
+
+GUILE_WARN_DEPRECATED="no"
+export GUILE_WARN_DEPRECATED
+
+if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+ eval `dbus-launch --sh-syntax --exit-with-session --config-file=$bundle_res/etc/dbus-1/session.conf`
+fi
+
+GNC_MODULE_PATH="${PFX}/lib/gnucash:${GNC_MODULE_PATH}"
+
+EXTRA_PATH="${EXTRA_PATH}:${PFX}/share/gnucash/guile-modules"
+EXTRA_PATH="${EXTRA_PATH}:${PFX}/share/gnucash/scm"
+GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
+
+EXTRA_LIBS="${GNC_MODULE_PATH}"
+EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
+EXTRA_LIBS="${EXTRA_LIBS}:${PFX}/lib"
+EXTRA_LIBS="${EXTRA_LIBS}:${PFX}/lib/gnucash"
+
+LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
+DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
+
+export GNC_MODULE_PATH
+export GUILE_LOAD_PATH
+export LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
+
+$EXEC "$bundle_contents/MacOS/$name-bin" $* $EXTRA_ARGS
+</pre>
+
+===GnuCash Info.Plist===
+This is the Info.Plist required of all App Bundles. Paste into "Info.Plist" in the bundle directory.
+<pre>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>GnuCash</string>
+ <key>CFBundleGetInfoString</key>
+ <string>GnuCash version 2.2.5 © 2007 Free Software Foundation</string>
+ <key>CFBundleIconFile</key>
+ <string>gnucash.icns</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.gnucash.GnuCash</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleLongVersionString</key>
+ <string>2.2.5 © 2007 Free Software Foundation</string>
+ <key>CFBundleName</key>
+ <string>GnuCash</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>2.2.5</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>2.2.5</string>
+ <key>CSResourcesFileMapped</key>
+ <true/>
+ <key>LSRequiresCarbon</key>
+ <true/>
+ <key>NSHumanReadableCopyright</key>
+ <string>Copyright 2007 Free Software Foundation</string>
+</dict>
+</plist>
+
+</pre>
+
+===GnuCash Bundle Description===
+This one configures the bundler to create the app bundle. Paste it into the bundler directory and name it 'gnucash.bundle':
+<pre>
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<app-bundle>
+
+ <meta>
+ <!-- Where to pick up the GTK+ installation, icon themes,
+ etc. Note that "${env:PREFIX}" is evaluated to the value of
+ the environment variable PREFIX, and likewise with HOME. You
+ can define additional prefixes and refer to them in paths
+ throughout this file on the form "${prefix:name}". This is
+ useful for installing certain libraries or even the
+ application itself separately.
+ -->
+ <prefix name="default">${env:PREFIX}</prefix>
+
+ <!-- The project directory is the default location of the created
+ app. If you leave out the path, the current directory is
+ used.
+ -->
+ <destination overwrite="yes">${env:HOME}/gnucash-bundler</destination>
+
+ <image>
+ <!-- Not implemented yet (DMG image). -->
+ </image>
+ <run-install-name-tool/>
+
+ <!-- Optionally specify a launcher script to use. If the
+ application sets up everything needed itself, like
+ environment variable, linker paths, etc, a launcher script is
+ not needed. If the source path is left out, the default
+ script will be used.
+ -->
+ <launcher-script>${project}/gnucash-launcher</launcher-script>
+
+ <!-- Not implemented: Optional runtime, could be python or mono
+ for example.
+ -->
+ <!--runtime copy="yes">/usr/bin/python</runtime-->
+ </meta>
+
+ <!-- The special macro "${project}" refers to the directory where
+ this bundle file is located. The application name and bundle
+ identifier are taken from the plist file.
+ -->
+ <plist>${project}/Info.plist</plist>
+
+ <main-binary>${prefix}/bin/gnucash-bin</main-binary>
+
+ <!-- Copy in GTK+ and Pango modules. Note the use of the
+ "${pkg:module:variable}" macro, which evaluates to a pkg-config
+ variable in the specified module. Note that any libraries that
+ binaries link to are also copied in automatically.
+ -->
+ <binary>
+ ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/loaders/*.so
+ </binary>
+ <binary>
+ ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-fc.so
+ </binary>
+
+ <binary>
+ ${prefix}/lib/GConf/2/*.so
+ </binary>
+
+ <binary>
+ ${prefix}/lib/gnucash
+ </binary>
+ <binary>
+ ${prefix}/libexec
+ </binary>
+
+ <binary>
+ ${prefix}/bin/dbus-launch
+ </binary>
+
+ <binary>
+ ${prefix}/bin/dbus-daemon
+ </binary>
+
+ <!-- Data to copy in, usually Glade/UI files, images, sounds files
+ etc. The destination inside the bundle can be specified if the
+ files should end up at a different location, by using the
+ "dest" property. The destination must then start with the macro
+ "${bundle}", which refers to the bundle root directory.
+ -->
+ <data>
+ ${prefix}/share/gnucash
+ </data>
+
+ <data>
+ ${prefix}/share/guile
+ </data>
+
+ <data>
+ ${prefix}/share/gnome
+ </data>
+
+ <!--data dest="${bundle}/Contents/Resources/slib"-->
+ <data>
+ ${prefix}/lib/slib
+ </data>
+
+ <data dest="${bundle}/Contents/Resources">
+ ${prefix}/share/gnucash/pixmaps/gnucash.icns
+ </data>
+
+ <data dest='${bundle}/Contents/Resources/lib/'>
+ ${prefix}/lib/*.la
+ </data>
+
+ <data dest='${bundle}/Contents/Resources/var/lib/dbus/machine-id'>
+ ${prefix}/var/lib/dbus/machine-id
+ </data>
+
+ <data dest='${bundle}/Contents/Resources/etc/dbus-1/'>
+ ${prefix}/etc/dbus-1/
+ </data>
+
+
+ <!-- Icon themes to copy. The "icons" property can be either of
+ "auto", "all", or "none". All or none should be
+ self-explanatory, while auto means that the script will try to
+ figure out which icons are needed. This is done by getting all
+ the strings from all copied binaries, and matching them against
+ icon names. To be safe, you should use "all". "none" is useful
+ if you want just the index.theme file but no icons, mostly
+ needed for the "hicolor" base theme.
+ -->
+ <!-- icon-theme icons="auto"/>
+ Tango
+ </icon-theme -->
+
+</app-bundle>
+</pre>
+
diff --git a/gnucash-bundler/.rsync-rules b/gnucash-bundler/.rsync-rules
new file mode 100644
index 0000000..8cb4246
--- /dev/null
+++ b/gnucash-bundler/.rsync-rules
@@ -0,0 +1 @@
++ */
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
new file mode 100644
index 0000000..c8fb922
--- /dev/null
+++ b/gnucash-bundler/Info.plist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>GnuCash</string>
+ <key>CFBundleGetInfoString</key>
+ <string>GnuCash version 2.2.8 © 2008 Free Software Foundation</string>
+ <key>CFBundleIconFile</key>
+ <string>gnucash.icns</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.gnucash.GnuCash</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleLongVersionString</key>
+ <string>2.2.8 © 2008 Free Software Foundation</string>
+ <key>CFBundleName</key>
+ <string>GnuCash</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>2.2.8</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>2.2.8</string>
+ <key>CSResourcesFileMapped</key>
+ <true/>
+ <key>LSRequiresCarbon</key>
+ <true/>
+ <key>NSHumanReadableCopyright</key>
+ <string>Copyright 2008 Free Software Foundation</string>
+</dict>
+</plist>
diff --git a/gnucash-bundler/gnucash-launcher b/gnucash-bundler/gnucash-launcher
new file mode 100755
index 0000000..813572d
--- /dev/null
+++ b/gnucash-bundler/gnucash-launcher
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+if test "x$IGE_DEBUG_LAUNCHER" != x; then
+ set -x
+fi
+
+if test "x$IGE_DEBUG_GDB" != x; then
+ EXEC="gdb --args"
+else
+ EXEC=exec
+fi
+
+export PREFIX=/usr/local/gtk
+
+name="`basename $0`"
+tmp="`pwd`/$0"
+tmp=`dirname "$tmp"`
+tmp=`dirname "$tmp"`
+bundle=`dirname "$tmp"`
+bundle_contents="$bundle"/Contents
+bundle_res="$bundle_contents"/Resources
+bundle_lib="$bundle_res"/lib
+bundle_bin="$bundle_res"/bin
+bundle_data="$bundle_res"/share
+bundle_etc="$bundle_res"/etc
+
+export DYLD_LIBRARY_PATH="$bundle_lib"
+export XDG_CONFIG_DIRS="$bundle_etc"/xdg
+export XDG_DATA_DIRS=$PREFIX/share
+export GTK_DATA_PREFIX="$bundle_data"
+export GTK_EXE_PREFIX="$bundle_res"
+export GTK_PATH="$bundle_res"
+
+export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
+export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
+export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
+export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
+
+# We need a UTF-8 locale.
+export LANG="`grep \`defaults read .GlobalPreferences AppleCollationOrder 2>&1\`_ /usr/share/locale/locale.alias | tail -n1 | sed 's/\./ /' | awk '{print $2}'`.UTF-8"
+
+if test -f "$bundle_lib/charset.alias"; then
+ export CHARSETALIASDIR="$bundle_lib"
+fi
+
+# Extra arguments can be added in environment.sh.
+EXTRA_ARGS="--config-path $bundle_etc/gnucash --share-path $bundle_data/gnucash --debug"
+
+if test -f "$bundle_res/environment.sh"; then
+ source "$bundle_res/environment.sh"
+fi
+
+# Strip out the argument added by the OS.
+if [ x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ]; then
+ shift 1
+fi
+
+PFX=${bundle_res}
+export PFX
+PATH="${PFX}/bin:${PATH}"
+export PATH
+
+GUILE_WARN_DEPRECATED="no"
+export GUILE_WARN_DEPRECATED
+#if test !(-f "${PFX}/var/run/dbus/pid"); then
+# dbus-daemon --system
+#fi
+
+if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+ eval `dbus-launch --sh-syntax --exit-with-session --config-file=$bundle_res/etc/dbus-1/session.conf`
+fi
+
+GNC_MODULE_PATH="${PFX}/lib/gnucash:${GNC_MODULE_PATH}"
+
+EXTRA_PATH="${EXTRA_PATH}:${PFX}/share/gnucash/guile-modules"
+EXTRA_PATH="${EXTRA_PATH}:${PFX}/share/gnucash/scm"
+GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
+
+EXTRA_LIBS="${GNC_MODULE_PATH}"
+EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
+EXTRA_LIBS="${EXTRA_LIBS}:${PFX}/lib"
+EXTRA_LIBS="${EXTRA_LIBS}:${PFX}/lib/gnucash"
+
+LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
+DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
+
+export GNC_MODULE_PATH
+export GUILE_LOAD_PATH
+export LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
+
+$EXEC "$bundle_contents/MacOS/$name-bin" $* $EXTRA_ARGS
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
new file mode 100644
index 0000000..659c9cc
--- /dev/null
+++ b/gnucash-bundler/gnucash.bundle
@@ -0,0 +1,140 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<app-bundle>
+
+ <meta>
+ <!-- Where to pick up the GTK+ installation, icon themes,
+ etc. Note that "${env:PREFIX}" is evaluated to the value of
+ the environment variable PREFIX, and likewise with HOME. You
+ can define additional prefixes and refer to them in paths
+ throughout this file on the form "${prefix:name}". This is
+ useful for installing certain libraries or even the
+ application itself separately.
+ -->
+ <prefix name="default">${env:PREFIX}</prefix>
+
+ <!-- The project directory is the default location of the created
+ app. If you leave out the path, the current directory is
+ used.
+ -->
+ <destination overwrite="yes">${env:HOME}/gnucash-bundler</destination>
+
+ <image>
+ <!-- Not implemented yet (DMG image). -->
+ </image>
+ <run-install-name-tool/>
+
+ <!-- Optionally specify a launcher script to use. If the
+ application sets up everything needed itself, like
+ environment variable, linker paths, etc, a launcher script is
+ not needed. If the source path is left out, the default
+ script will be used.
+ -->
+ <launcher-script>${project}/gnucash-launcher</launcher-script>
+
+ <!-- Not implemented: Optional runtime, could be python or mono
+ for example.
+ -->
+ <!--runtime copy="yes">/usr/bin/python</runtime-->
+ </meta>
+
+ <!-- The special macro "${project}" refers to the directory where
+ this bundle file is located. The application name and bundle
+ identifier are taken from the plist file.
+ -->
+ <plist>${project}/Info.plist</plist>
+
+ <main-binary>${prefix}/bin/gnucash-bin</main-binary>
+
+ <!-- Copy in GTK+ and Pango modules. Note the use of the
+ "${pkg:module:variable}" macro, which evaluates to a pkg-config
+ variable in the specified module. Note that any libraries that
+ binaries link to are also copied in automatically.
+ -->
+ <binary>
+ ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/loaders/*.so
+ </binary>
+ <binary>
+ ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-fc.so
+ </binary>
+
+ <binary>
+ ${prefix}/lib/GConf/2/*.so
+ </binary>
+
+ <binary>
+ ${prefix}/lib/gnucash
+ </binary>
+ <binary>
+ ${prefix}/libexec
+ </binary>
+
+ <binary>
+ ${prefix}/bin/dbus-launch
+ </binary>
+
+ <binary>
+ ${prefix}/bin/dbus-daemon
+ </binary>
+
+ <binary>
+ ${prefix}/bin/gnc-*
+ </binary>
+
+ <!-- Data to copy in, usually Glade/UI files, images, sounds files
+ etc. The destination inside the bundle can be specified if the
+ files should end up at a different location, by using the
+ "dest" property. The destination must then start with the macro
+ "${bundle}", which refers to the bundle root directory.
+ -->
+ <data>
+ ${prefix}/share/gnucash
+ </data>
+
+ <data>
+ ${prefix}/share/guile
+ </data>
+
+ <data>
+ ${prefix}/share/gnome
+ </data>
+
+ <data>
+ ${prefix}/share/mime
+ </data>
+
+ <!--data dest="${bundle}/Contents/Resources/slib"-->
+ <data>
+ ${prefix}/lib/slib
+ </data>
+
+ <data dest="${bundle}/Contents/Resources">
+ ${prefix}/share/gnucash/pixmaps/gnucash.icns
+ </data>
+
+ <data dest='${bundle}/Contents/Resources/lib/'>
+ ${prefix}/lib/*.la
+ </data>
+
+ <data dest='${bundle}/Contents/Resources/var/lib/dbus/machine-id'>
+ ${prefix}/var/lib/dbus/machine-id
+ </data>
+
+ <data dest='${bundle}/Contents/Resources/etc/dbus-1/'>
+ ${prefix}/etc/dbus-1/
+ </data>
+
+
+ <!-- Icon themes to copy. The "icons" property can be either of
+ "auto", "all", or "none". All or none should be
+ self-explanatory, while auto means that the script will try to
+ figure out which icons are needed. This is done by getting all
+ the strings from all copied binaries, and matching them against
+ icon names. To be safe, you should use "all". "none" is useful
+ if you want just the index.theme file but no icons, mostly
+ needed for the "hicolor" base theme.
+ -->
+ <!-- icon-theme icons="auto"/>
+ Tango
+ </icon-theme -->
+
+</app-bundle>
diff --git a/gnucash-icon-48x48.icns b/gnucash-icon-48x48.icns
new file mode 100644
index 0000000..28737f5
Binary files /dev/null and b/gnucash-icon-48x48.icns differ
diff --git a/gnucash-xlib.patch b/gnucash-xlib.patch
new file mode 100644
index 0000000..e09c11d
--- /dev/null
+++ b/gnucash-xlib.patch
@@ -0,0 +1,11 @@
+--- configure.in 2008-07-06 17:16:42.000000000 -0700
++++ configure.in.new 2008-07-06 17:17:06.000000000 -0700
+@@ -213,7 +213,7 @@
+ AM_CONDITIONAL(GNUCASH_SEPARATE_BUILDDIR, test "x${srcdir}" != "x.")
+
+ # These are unavailable on windows/mingw32
+-AC_CHECK_HEADERS(X11/Xlib.h glob.h)
++AC_CHECK_HEADERS(glob.h)
+ AC_CHECK_FUNCS(chown gethostname getppid getuid gettimeofday gmtime_r)
+ AC_CHECK_FUNCS(gethostid link)
+
diff --git a/gnucash.modules b/gnucash.modules
new file mode 100644
index 0000000..2c24c6b
--- /dev/null
+++ b/gnucash.modules
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+ <repository type="svn" name="svn.gnome.org" default="yes"
+ href="http://svn.gnome.org/svn/"/>
+ <repository type="tarball" name="kernel.org"
+ href="http://www.kernel.org/pub/linux/"/>
+ <repository type='tarball' name='ftp.gnu.org'
+ href="ftp://ftp.gnu.org/gnu/"/>
+ <!--repository type='tarball' name='www.freedesktop.org'
+ href="http://www.freedesktop.org/software/" /-->
+ <repository type='tarball' name='sourceforge'
+ href="http://downloads.sourceforge.net/"/>
+ <repository type="cvs" name="slib.savannah.gnu.org"
+ cvsroot=":pserver:anonymous at cvs.savannah.gnu.org:/sources/slib"
+ password=""/>
+ <repository type="tarball" name="gnucash.org"
+ href="http://www.gnucash.org/pub/gnucash/sources/stable/"/>
+
+
+
+ <include
+ href="http://people.imendio.com/richard/gtk-osx-build/modulesets/gtk-osx.modules"/>
+
+
+ <tarball id='readline' autogen-sh='configure'>
+ <source href='ftp://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz'/>
+ <patches>
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-001' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-002' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-003' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-004' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-005' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-006' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-007' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-008' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-009' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-010' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-011' strip='2' />
+ <patch file='ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-012' strip='2' />
+ </patches>
+ </tarball>
+
+<!--
+ <autotools id="desktop-file-utils">
+ <branch repo="www.freedesktop.org"
+ module="desktop-file-utils/releases/desktop-file-utils-0.10.tar.gz"
+ md5sum="8b930e9ad08ac6b8205dd00a1d694b0c" size="341508"/>
+ <dependencies>
+ <dep package="glib"/>
+ <dep package="intltool"/>
+ </dependencies>
+ </autotools>
+-->
+
+
+ <autotools id="OpenSP" autogen-sh='configure'
+ autogenargs="--disable-static --enable-shared --disable-doc-build">
+ <branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
+ version='1.5.2'/>>
+ </autotools>
+
+ <autotools id="libofx" autogen-sh='configure'>
+ <branch repo="sourceforge" module="libofx/libofx-0.9.0.tar.gz"
+ version='0.9.0'/>
+ <dependencies>
+ <dep package='guile-1.6'/>
+ <dep package="OpenSP"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="guile-1.6" autogen-sh="configure"
+ autogenargs="--disable-static --enable-shared
+ --disable-scrollkeeper --disable-xlib">
+ <branch repo="ftp.gnu.org" module="guile/guile-1.6.8.tar.gz"
+ version="1.6.7" size="3114052" />
+ <dependencies>
+ <dep package='readline'/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="Slib" skip-autogen="true">
+ <branch repo="slib.savannah.gnu.org"
+ module="slib"/>
+ <dependencies>
+ <dep package="guile-1.6"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="gnucash" autogen-sh="configure"
+ autogenargs="--enable-ofx">
+ <branch module="gnucash-2.2.8.tar.gz" version="2.2.8"
+ repo="gnucash.org"/>
+
+ <dependencies>
+ <dep package="goffice"/>
+ <dep package="libofx"/>
+<!-- <dep package="libgnomeprint"/> -->
+ <dep package="gtkhtml"/>
+ <dep package="Slib"/>
+ </dependencies>
+
+ </autotools>
+
+</moduleset>
diff --git a/gnucash.start b/gnucash.start
new file mode 100644
index 0000000..eef42de
--- /dev/null
+++ b/gnucash.start
@@ -0,0 +1,34 @@
+export PREFIX="/usr/local/gtk2/" #You'll have to fix this up if you changed it
+export PATH="$PREFIX/bin:${PATH}"
+export XDG_CONFIG_DIRS=$PREFIX/etc/xdg
+export XDG_DATA_DIRS=$PREFIX/share
+
+
+GUILE_WARN_DEPRECATED="no"
+export GUILE_WARN_DEPRECATED
+
+if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+ eval `dbus-launch --sh-syntax --exit-with-session --config-file=$PREFIX/etc/dbus-1/session.conf`
+fi
+
+GNC_MODULE_PATH="$PREFIX/lib/gnucash:${GNC_MODULE_PATH}"
+
+EXTRA_PATH="${EXTRA_PATH}:$PREFIX/share/gnucash/guile-modules"
+EXTRA_PATH="${EXTRA_PATH}:$PREFIX/share/gnucash/scm"
+GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
+
+EXTRA_LIBS="${GNC_MODULE_PATH}"
+EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
+EXTRA_LIBS="${EXTRA_LIBS}:$PREFIX/lib"
+EXTRA_LIBS="${EXTRA_LIBS}:$PREFIX/lib/gnucash"
+
+LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
+DYLD_LIBRARY_PATH="${EXTRA_LIBS}:${DYLD_LIBRARY_PATH}"
+
+export GNC_MODULE_PATH
+export GUILE_LOAD_PATH
+export LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
+
+exec gnucash-bin "$@"
+
diff --git a/gtk-osx-build-setup.sh b/gtk-osx-build-setup.sh
new file mode 100644
index 0000000..ab5017d
--- /dev/null
+++ b/gtk-osx-build-setup.sh
@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# Script that sets up jhbuild for GTK+ OS X building. Run this to
+# checkout jhbuild and the required configuration.
+#
+# Copyright 2007, 2008 Imendio AB
+#
+# Run this whenever you want to update jhbuild or the jhbuild setup;
+# it is safe to run it repeatedly. Note that it overwrites
+# ~/.jhbuildrc however. Custom settings should be kept in
+# ~/.jhbuildrc-custom.
+#
+# You need Mac OS X 10.4 or newer and Xcode 2.5 or newer. Make sure
+# you have subversion (svn) installed, 10.5 has it by default.
+#
+# Quick HOWTO:
+#
+# sh gtk-osx-build-setup.sh
+#
+# jhbuild bootstrap
+# jhbuild build meta-gtk-osx-bootstrap
+# jhbuild build
+#
+# See http://developer.imendio.com/projects/gtk-macosx for more information.
+#
+
+SOURCE=/usr/local/src
+BASEURL=http://people.imendio.com/richard
+
+do_exit()
+{
+ echo $1
+ exit 1
+}
+
+if test x`which svn` == x; then
+ do_exit "Svn (subversion) is not available, please install it and try again."
+fi
+
+mkdir -p $SOURCE 2>/dev/null || do_exit "The directory $SOURCE could not be created. Check permissions and try again."
+
+if ! test -d $SOURCE/jhbuild; then
+ echo "Checking out jhbuild from subversion..."
+ svn co http://svn.gnome.org/svn/jhbuild/trunk $SOURCE/jhbuild >/dev/null
+else
+ echo "Updating jhbuild from subversion..."
+ (cd $SOURCE/jhbuild && svn up >/dev/null)
+fi
+
+echo "Installing jhbuild..."
+(cd $SOURCE/jhbuild && sudo make -f Makefile.plain DISABLE_GETTEXT=1 install >/dev/null)
+
+echo "Installing jhbuild configuration..."
+curl -s $BASEURL/gtk-osx-build/jhbuildrc-gtk-osx -o $HOME/.jhbuildrc
+curl -s $BASEURL/gtk-osx-build/jhbuildrc-gtk-osx-fw-10.4 -o $HOME/.jhbuildrc-fw-10.4
+if [ ! -f $HOME/.jhbuildrc-custom ]; then
+ curl -s $BASEURL/gtk-osx-build/jhbuildrc-gtk-osx-custom-example -o $HOME/.jhbuildrc-custom
+fi
+
+#if test "x`echo $PATH | grep $HOME/bin`" == x; then
+# echo "PATH does not contain $HOME/bin, it is recommended that you add that."
+# echo
+#fi
+
+echo "Done."
diff --git a/gtk-osx-random.modules b/gtk-osx-random.modules
new file mode 100644
index 0000000..3c815c0
--- /dev/null
+++ b/gtk-osx-random.modules
@@ -0,0 +1,239 @@
+<?xml version="1.0"?><!--*- mode: xml; indent-tabs-mode: nil -*-->
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+ <repository type="svn" name="svn.gnome.org" default="yes" href="http://svn.gnome.org/svn/"/>
+ <repository type="git" name="git.imendio.com" href="git://git.imendio.com/projects/"/>
+ <repository type="svn" name="inkscape.svn.sourceforge.net" href="https://inkscape.svn.sourceforge.net/svnroot/inkscape/"/>
+ <repository type="svn" name="ardour" href="http://subversion.ardour.org/svn/"/>
+ <repository type="git" name="github.com" href="git://github.com/"/>
+
+ <autotools id="loudmouth" autogenargs="--with-ssl=openssl">
+ <branch repo="github.com" module="hallski/loudmouth.git" checkoutdir="loudmouth" />
+ <after>
+ <dep package="meta-gtk-osx-bootstrap"/>
+ <dep package="glib"/>
+ </after>
+ </autotools>
+
+ <autotools id="gossip">
+ <branch/>
+ <after>
+ <dep package="meta-gtk-osx-bootstrap"/>
+ <dep package="meta-gtk-osx-themes"/>
+ <dep package="meta-gtk-osx-core"/>
+ </after>
+ <dependencies>
+ <dep package="loudmouth"/>
+ <dep package="libglade"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="gtksourceview" autogenargs="--disable-gnome-print">
+ <branch revision="gnome-2-18"/> <!-- module="ardour2" checkoutdir="ardour"/-->
+ <after>
+ <dep package="meta-gtk-osx-core"/>
+ </after>
+ </autotools>
+
+ <autotools id="libIDL">
+ <branch/>
+ <after>
+ <dep package="meta-gtk-osx-core"/>
+ </after>
+ </autotools>
+ <autotools id="ORBit2">
+ <branch/>
+ <after>
+ <dep package="meta-gtk-osx-bootstrap"/>
+ </after>
+ <dependencies>
+ <dep package="libIDL"/>
+ </dependencies>
+ </autotools>
+ <autotools id="gconf">
+ <branch/>
+ <dependencies>
+ <dep package="ORBit2"/>
+ <dep package="libxml2"/>
+ <dep package="dbus-glib"/>
+ </dependencies>
+ </autotools>
+
+ <tarball id="lcms" version="1.17">
+ <source href="http://www.littlecms.com/lcms-1.17.tar.gz"
+ md5sum="07bdbb4cfb05d21caa58fe3d1c84ddc1" size="898816"/>
+ </tarball>
+
+ <tarball id="shared-mime-info" supports-non-srcdir-builds="no" version="0.19">
+ <source href="http://freedesktop.org/~hadess/shared-mime-info-0.19.tar.gz"
+ md5sum="056a86a8245aecfd9c80740380c5265a" size="595168"/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="libxml2"/>
+ <dep package="glib"/>
+ </dependencies>
+ </tarball>
+
+ <autotools id="gimp" autogenargs="--disable-python --disable-print --without-x">
+ <branch/>
+ <dependencies>
+ <dep package="gtk+"/>
+ <dep package="lcms"/>
+ <dep package="libart_lgpl"/>
+ <dep package="fontconfig"/>
+ <dep package="gegl"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="babl">
+ <branch/>
+ </autotools>
+
+ <autotools id="gegl">
+ <branch/>
+ <dependencies>
+ <dep package="babl"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libart_lgpl">
+ <branch/>
+ <dependencies>
+ <dep package="glib"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libgnomecanvas">
+ <branch/>
+ <dependencies>
+ <dep package="gtk+"/>
+ <dep package="libart_lgpl"/>
+ </dependencies>
+ </autotools>
+
+ <tarball autogenargs="--disable-selinux --disable-static --enable-shared" id="dbus" version="1.2.1">
+ <source href="http://dbus.freedesktop.org/releases/dbus/dbus-1.2.1.tar.gz" />
+ <dependencies>
+ <dep package="glib"/>
+ </dependencies>
+ <after>
+ <dep package="gtk+"/>
+ </after>
+ </tarball>
+
+ <tarball id="dbus-glib" autogenargs="--disable-selinux --disable-static --enable-shared" version="0.74">
+ <source href="http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.74.tar.gz"/>
+ <dependencies>
+ <dep package="libxml2"/>
+ <dep package="dbus"/>
+ <dep package="glib"/>
+ </dependencies>
+ </tarball>
+
+ <tarball id="poppler" version="0.5.9"
+ autogenargs="--disable-qt --disable-qt4 --without-x --disable-gtk-test --enable-xpdf-headers">
+ <source href="http://poppler.freedesktop.org/poppler-0.5.9.tar.gz"
+ md5sum="8d1ac008614c0e413bcac95b8102fa07" size="1169002"/>
+ <dependencies>
+ <dep package="cairo"/>
+ </dependencies>
+ <after>
+ <dep package="gtk+"/>
+ </after>
+ </tarball>
+
+ <!-- Inkscape doesn't work with 0.6.x yet
+ href="http://poppler.freedesktop.org/poppler-0.6.1.tar.gz"
+ md5sum="78a5f8ff1a3464eddb127577eea7a191" size="1286501"/
+ -->
+
+ <!-- This is just the upstream tarball but had to be retarred
+ instead of patched since the tarball is broken.
+ -->
+ <tarball id="popt" version="1.7">
+ <source href="http://people.imendio.com/richard/gtk-osx/files/popt-1.7.tar.gz"
+ md5sum="a13a3c7ec893200db3e0287dfd40487d" size="575089"/>
+ </tarball>
+
+ <tarball id="gc" version="6.7" checkoutdir="gc6.7">
+ <source href="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc.tar.gz"
+ md5sum="be780413a0360306ad3b701e45fa8871" size="755999"/>
+ </tarball>
+
+ <tarball id="libsamplerate" version="0.1.2">
+ <source href="http://www.mega-nerd.com/SRC/libsamplerate-0.1.2.tar.gz"
+ md5sum="06861c2c6b8e5273c9b80cf736b9fd0e" size="707867"/>
+ </tarball>
+ <tarball id="raptor" version="1.4.15" autogenargs="--disable-www">
+ <source href="http://download.librdf.org/source/raptor-1.4.15.tar.gz"
+ md5sum="658fac0c25d50274c879f6cc49c3364b" size="1445553"/>
+ <dependencies>
+ <dep package="libxslt"/>
+ </dependencies>
+ </tarball>
+
+ <!-- this doesn't build, needs:
+ make -k install
+ -->
+ <tarball id="liblrdf" version="0.4.0">
+ <source href="http://switch.dl.sourceforge.net/sourceforge/lrdf/liblrdf-0.4.0.tar.gz"
+ md5sum="327a5674f671c4b360c6353800226877" size="336959"/>
+ <dependencies>
+ <dep package="raptor"/>
+ </dependencies>
+ </tarball>
+ <tarball id="jack" version="0.103.0">
+ <source href="http://mesh.dl.sourceforge.net/sourceforge/jackit/jack-audio-connection-kit-0.103.0.tar.gz"
+ md5sum="03a0f63b997ce7b83a1eeaa6b80f4388" size="763244"/>
+ </tarball>
+ <tarball id="liblo" version="0.24">
+ <source href="http://users.ecs.soton.ac.uk/~njh/liblo/liblo-0.24.tar.gz"
+ md5sum="a9b5e7c6fcc835cd468e26cc95aba91a" size="432285"/>
+ </tarball>
+
+ <!-- - This needs to be configured manually, and libtool might need
+ renaming temporarily while building so it doesn't conflict with
+ /usr/bin/libtool.
+
+ - Also $prefix/include/boost_*/boost needs to be symlinked to
+ $prefix/include/boost
+
+ - And SConstructs might need symlinking /usr/local -> $prefix.
+ -->
+ <tarball id="boost" version="1.34.1">
+ <source href="http://dfn.dl.sourceforge.net/sourceforge/boost/boost_1_34_1.tar.bz2"
+ md5sum="2d938467e8a448a2c9763e0a9f8ca7e5" size="12986931"/>
+ </tarball>
+
+ <!-- this is not an autotools module, uses scons:
+ scons PREFIX=/opt/gtk GTKOSX=yes install
+ -->
+ <autotools id="ardour">
+ <branch repo="ardour" revision="2.0-ongoing" module="ardour2" checkoutdir="ardour"/>
+ <dependencies>
+ <dep package="gtk+"/>
+ <dep package="libgnomecanvas"/>
+ <dep package="gconf"/>
+ <dep package="libsamplerate"/>
+ <dep package="raptor"/>
+ <dep package="liblrdf"/>
+ <dep package="liblo"/>
+ <dep package="jack"/>
+ <dep package="boost"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="inkscape">
+ <branch repo="inkscape.svn.sourceforge.net"/>
+ <dependencies>
+ <dep package="poppler"/>
+ <dep package="gtkmm"/>
+ <dep package="popt"/>
+ <dep package="gc"/>
+ <dep package="boost"/>
+ <dep package="lcms"/>
+ </dependencies>
+ </autotools>
+
+</moduleset>
More information about the gnucash-changes
mailing list