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

Bug #596248: Disable pgsql in libdbi build because the available pgsql binaries depend on Visual Studio C runtime.

Browse Source 
This can be enabled again as soon as we pgsql binaries available
which do not depend on MSVCR71.DLL anymore.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18366 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2009-10-03 14:06:28 +00:00
parent 06f89503cc
commit 664ae299b9
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/win32/dist.sh
View File

@ -200,8 +200,8 @@ function dist_libdbi() {
cp -a ${_SQLITE3_UDIR}/lib/* ${DIST_UDIR}/lib cp -a ${_SQLITE3_UDIR}/lib/* ${DIST_UDIR}/lib
cp -a ${_MYSQL_LIB_UDIR}/bin/* ${DIST_UDIR}/bin cp -a ${_MYSQL_LIB_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_MYSQL_LIB_UDIR}/lib/* ${DIST_UDIR}/lib cp -a ${_MYSQL_LIB_UDIR}/lib/* ${DIST_UDIR}/lib
cp -a ${_PGSQL_UDIR}/bin/* ${DIST_UDIR}/bin # cp -a ${_PGSQL_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_PGSQL_UDIR}/lib/* ${DIST_UDIR}/lib # cp -a ${_PGSQL_UDIR}/lib/* ${DIST_UDIR}/lib
cp -a ${_LIBDBI_UDIR}/bin/* ${DIST_UDIR}/bin cp -a ${_LIBDBI_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_LIBDBI_UDIR}/lib/* ${DIST_UDIR}/lib cp -a ${_LIBDBI_UDIR}/lib/* ${DIST_UDIR}/lib
mkdir ${DIST_UDIR}/lib/dbd mkdir ${DIST_UDIR}/lib/dbd

26
packaging/win32/install.sh
View File

@ -1079,14 +1079,14 @@ function inst_libdbi() {
test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly - libmysql.dll" test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly - libmysql.dll"
test -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a || die "mysql not installed correctly - libmysqlclient.a" test -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a || die "mysql not installed correctly - libmysqlclient.a"
fi fi
if test -f ${_PGSQL_UDIR}/lib/libpq.dll # if test -f ${_PGSQL_UDIR}/lib/libpq.dll
then # then
echo "PGSQL library already installed. skipping." # echo "PGSQL library already installed. skipping."
else # else
wget_unpacked $PGSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR # wget_unpacked $PGSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
mv $TMP_UDIR/pgsql* $PGSQL_DIR # mv $TMP_UDIR/pgsql* $PGSQL_DIR
test -f ${_PGSQL_UDIR}/lib/libpq.dll || die "libpq not installed correctly" # test -f ${_PGSQL_UDIR}/lib/libpq.dll || die "libpq not installed correctly"
fi # fi
if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll
then then
echo "libdbi already installed. skipping." echo "libdbi already installed. skipping."
@ -1110,8 +1110,8 @@ function inst_libdbi() {
test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly" test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
fi fi
if test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll -a \ if test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll -a \
-f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll -a \ -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll
-f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll #-a -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll
then then
echo "libdbi drivers already installed. skipping." echo "libdbi drivers already installed. skipping."
else else
@ -1134,15 +1134,15 @@ function inst_libdbi() {
--with-sqlite3-dir=${_SQLITE3_UDIR} \ --with-sqlite3-dir=${_SQLITE3_UDIR} \
--with-mysql \ --with-mysql \
--with-mysql-dir=${_MYSQL_LIB_UDIR} \ --with-mysql-dir=${_MYSQL_LIB_UDIR} \
--with-pgsql \
--with-pgsql-dir=${_PGSQL_UDIR} \
--prefix=${_LIBDBI_DRIVERS_UDIR} --prefix=${_LIBDBI_DRIVERS_UDIR}
#--with-pgsql \
#--with-pgsql-dir=${_PGSQL_UDIR}
make make
make install make install
qpopd qpopd
test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll || die "libdbi sqlite3 driver not installed correctly" test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll || die "libdbi sqlite3 driver not installed correctly"
test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll || die "libdbi mysql driver not installed correctly" test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll || die "libdbi mysql driver not installed correctly"
test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll || die "libdbi pgsql driver not installed correctly" #test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll || die "libdbi pgsql driver not installed correctly"
fi fi
} }