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

Revert libgoffice pkgconfig filename change. Add CFLAGS at gnucash configure.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14729 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2006-08-26 19:03:11 +00:00
parent 6c25a4c73f
commit 9f1d69b417
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packaging/win32/install.sh
View File

@ -531,7 +531,7 @@ function inst_goffice() {
_GOFFICE_UDIR=`unix_path $GOFFICE_DIR` _GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH
set +e set +e
quiet pkg-config --exists libgoffice-0.3 quiet pkg-config --exists libgoffice-1
if [ $? = 0 ] ; then if [ $? = 0 ] ; then
set -e set -e
echo "goffice already installed. skipping." echo "goffice already installed. skipping."
@ -557,7 +557,8 @@ function inst_goffice() {
make install make install
qpopd qpopd
fi fi
pkg-config --exists libgoffice-0.3 || die "goffice not installed correctly" pkg-config --exists libgoffice-0.3 && die "Sorry, for goffice gnucash expects a pkgconfig file with the name libgoffice-1.pc, but you have an installed file libgoffice-0.3.pc. You should probably rename that file."
pkg-config --exists libgoffice-1 || die "goffice not installed correctly"
} }
function inst_svn() { function inst_svn() {
@ -600,8 +601,9 @@ function inst_gnucash() {
./configure \ ./configure \
--prefix=$_GNUCASH_WFSDIR \ --prefix=$_GNUCASH_WFSDIR \
--enable-debug \ --enable-debug \
CPPFLAGS="${AUTOTOOLS_CPPFLAGS}" \ CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS}" \
LDFLAGS="${AUTOTOOLS_LDFLAGS}" CFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS}" \
LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS}"
# make # make
qpopd qpopd
} }