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

Use the installed PKG_CONFIG instead of what might be available in the PATH

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15215 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2006-12-15 14:51:37 +00:00
parent 989da8757d
commit 5eace5e762
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packaging/win32/install.sh
View File

@ -21,6 +21,7 @@ SEPS_GUILE_LDFLAGS=" "
SEPS_INTLTOOL_PERL=" " SEPS_INTLTOOL_PERL=" "
SEPS_PATH=":" SEPS_PATH=":"
SEPS_PKG_CONFIG=":" SEPS_PKG_CONFIG=":"
PKG_CONFIG=""
SEPS_PKG_CONFIG_PATH=":" SEPS_PKG_CONFIG_PATH=":"
SEPS_READLINE_CPPFLAGS=" " SEPS_READLINE_CPPFLAGS=" "
SEPS_READLINE_LDFLAGS=" " SEPS_READLINE_LDFLAGS=" "
@ -467,7 +468,7 @@ function inst_gnome() {
add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG
add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
if quiet gconftool-2 --version && if quiet gconftool-2 --version &&
pkg-config --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.8 && ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.8 &&
quiet intltoolize --version quiet intltoolize --version
then then
echo "gnome packages installed. skipping." echo "gnome packages installed. skipping."
@ -537,12 +538,12 @@ function inst_gnome() {
# work around a bug in msys bash, adding 0x01 smilies # work around a bug in msys bash, adding 0x01 smilies
cat > bin/pkg-config-msys.sh <<EOF cat > bin/pkg-config-msys.sh <<EOF
#!/bin/sh #!/bin/sh
if pkg-config "\$@" > /dev/null 2>&1 ; then if ${PKG_CONFIG} "\$@" > /dev/null 2>&1 ; then
res=true res=true
else else
res=false res=false
fi fi
pkg-config "\$@" | tr -d \\\\r && \$res ${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res
EOF EOF
_FREETYPE_VERSION=`echo $FREETYPE_DEV_URL | sed 's#.*freetype-\(.*\)-lib.zip#\1#'` _FREETYPE_VERSION=`echo $FREETYPE_DEV_URL | sed 's#.*freetype-\(.*\)-lib.zip#\1#'`
cat > lib/pkgconfig/freetype2.pc <<EOF cat > lib/pkgconfig/freetype2.pc <<EOF
@ -572,7 +573,7 @@ EOF
#qpopd #qpopd
fi fi
quiet gconftool-2 --version && quiet gconftool-2 --version &&
pkg-config --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.8 && ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.8 &&
quiet intltoolize --version || die "gnome not installed correctly" quiet intltoolize --version || die "gnome not installed correctly"
} }
@ -601,7 +602,7 @@ function inst_libgsf() {
_LIBGSF_UDIR=`unix_path $LIBGSF_DIR` _LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
add_to_env $_LIBGSF_UDIR/bin PATH add_to_env $_LIBGSF_UDIR/bin PATH
add_to_env $_LIBGSF_UDIR/lib/pkgconfig PKG_CONFIG_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 libgsf-gnome-1
then then
echo "libgsf already installed. skipping." echo "libgsf already installed. skipping."
else else
@ -616,14 +617,14 @@ function inst_libgsf() {
make install make install
qpopd qpopd
fi fi
pkg-config --exists libgsf-1 libgsf-gnome-1 || die "libgsf not installed correctly" ${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1 || die "libgsf not installed correctly"
} }
function inst_goffice() { function inst_goffice() {
setup GOffice setup 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
if quiet pkg-config --exists libgoffice-0.3 if quiet ${PKG_CONFIG} --exists libgoffice-0.3
then then
echo "goffice already installed. skipping." echo "goffice already installed. skipping."
else else
@ -645,7 +646,7 @@ 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 "goffice not installed correctly"
} }
function inst_glade() { function inst_glade() {