IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Win32 build: Can we get along without libgsf-gnome?

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22869 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2013-04-03 13:21:21 +00:00
parent bb04aaa8ca
commit 9d4a8b40d6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/win32/defaults.sh
View File

@ -284,7 +284,7 @@ set_default PCRE_BIN_URL "$SF_MIRROR/gnuwin32/pcre-7.0-bin.zip"
set_default PCRE_LIB_URL "$SF_MIRROR/gnuwin32/pcre-7.0-lib.zip"
set_default PCRE_DIR $GLOBAL_DIR\\pcre
LIBGSF_VERSION="1.14.17"
LIBGSF_VERSION="1.14.26"
set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-${LIBGSF_VERSION}.tar.bz2"
set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf

5
packaging/win32/install-impl.sh
View File

@ -995,7 +995,7 @@ function inst_libgsf() {
_LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
add_to_env $_LIBGSF_UDIR/bin PATH
add_to_env $_LIBGSF_UDIR/lib/pkgconfig PKG_CONFIG_PATH
if quiet ${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1 &&
if quiet ${PKG_CONFIG} --exists libgsf-1 &&
quiet ${PKG_CONFIG} --atleast-version=${LIBGSF_VERSION} libgsf-1
then
echo "libgsf already installed in $_LIBGSF_UDIR. skipping."
@ -1008,7 +1008,6 @@ function inst_libgsf() {
--prefix=$_LIBGSF_UDIR \
--disable-static \
--without-python \
--with-gnome-vfs \
CPPFLAGS="${GNOME_CPPFLAGS}" \
LDFLAGS="${GNOME_LDFLAGS}"
make
@ -1016,7 +1015,7 @@ function inst_libgsf() {
make install
qpopd
${PKG_CONFIG} --exists libgsf-1 || die "libgsf not installed correctly: No libgsf-1"
${PKG_CONFIG} --exists libgsf-gnome-1 || die "libgsf not installed correctly: No libgsf-gnome-1"
#${PKG_CONFIG} --exists libgsf-gnome-1 || die "libgsf not installed correctly: No libgsf-gnome-1"
fi
}