r16183 - gnucash/trunk/packaging/win32 - Install.sh: Fix cross-compiling of gwenhywfar and ktoblzcheck.

[Andreas Köhler]

Author: andi5
Date: 2007-06-18 16:42:36 -0400 (Mon, 18 Jun 2007)
New Revision: 16183
Trac: http://svn.gnucash.org/trac/changeset/16183

Modified:
   gnucash/trunk/packaging/win32/install.sh
Log:
Install.sh: Fix cross-compiling of gwenhywfar and ktoblzcheck.

For real cross-compiling, this change currently depends on unreleased
gwenhywfar changes and a windows openssl installation (cannot be
cross-compiled yet).


Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2007-06-18 20:42:30 UTC (rev 16182)
+++ gnucash/trunk/packaging/win32/install.sh	2007-06-18 20:42:36 UTC (rev 16183)
@@ -808,15 +808,17 @@
         wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR
         assert_one_dir $TMP_UDIR/gwenhywfar-*
         qpushd $TMP_UDIR/gwenhywfar-*
-            ./configure \
+            # circumvent binreloc bug, http://trac.autopackage.org/ticket/28
+            ./configure ${HOST_XCOMPILE} \
                 --with-openssl-includes=$_OPENSSL_UDIR/include \
+                --disable-binreloc \
                 ssl_libraries="-L${_OPENSSL_UDIR}/lib" \
                 ssl_lib="-leay32 -lssl32" \
                 --prefix=$_GWENHYWFAR_UDIR \
-                CPPFLAGS="${REGEX_CPPFLAGS}" \
-                LDFLAGS="${REGEX_LDFLAGS}"
+                CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS}" \
+                LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} -lintl"
             make
-            make check
+            [ "$CROSS_COMPILE" != "yes" ] && make check
             make install
         qpopd
         ${PKG_CONFIG} --exists gwenhywfar || die "Gwenhywfar not installed correctly"
@@ -836,10 +838,12 @@
         wget_unpacked $KTOBLZCHECK_URL $DOWNLOAD_DIR $TMP_DIR
         assert_one_dir $TMP_UDIR/ktoblzcheck-*
         qpushd $TMP_UDIR/ktoblzcheck-*
-            ./configure \
-                --prefix=${_GWENHYWFAR_UDIR}
+            # circumvent binreloc bug, http://trac.autopackage.org/ticket/28
+            ./configure ${HOST_XCOMPILE} \
+                --prefix=${_GWENHYWFAR_UDIR} \
+                --disable-binreloc
             make
-            make check
+            [ "$CROSS_COMPILE" != "yes" ] && make check
             make install
         qpopd
         ${PKG_CONFIG} --exists ktoblzcheck || die "Ktoblzcheck not installed correctly"