diff --git a/packaging/win32/dist.sh b/packaging/win32/dist.sh index 186a1f5bea..2b2b054f9e 100755 --- a/packaging/win32/dist.sh +++ b/packaging/win32/dist.sh @@ -200,8 +200,8 @@ function dist_libdbi() { cp -a ${_SQLITE3_UDIR}/lib/* ${DIST_UDIR}/lib cp -a ${_MYSQL_LIB_UDIR}/bin/* ${DIST_UDIR}/bin cp -a ${_MYSQL_LIB_UDIR}/lib/* ${DIST_UDIR}/lib - cp -a ${_PGSQL_UDIR}/bin/* ${DIST_UDIR}/bin - cp -a ${_PGSQL_UDIR}/lib/* ${DIST_UDIR}/lib +# cp -a ${_PGSQL_UDIR}/bin/* ${DIST_UDIR}/bin +# cp -a ${_PGSQL_UDIR}/lib/* ${DIST_UDIR}/lib cp -a ${_LIBDBI_UDIR}/bin/* ${DIST_UDIR}/bin cp -a ${_LIBDBI_UDIR}/lib/* ${DIST_UDIR}/lib mkdir ${DIST_UDIR}/lib/dbd diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh index 2b4431a96a..25da6d76d4 100755 --- a/packaging/win32/install.sh +++ b/packaging/win32/install.sh @@ -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/libmysqlclient.a || die "mysql not installed correctly - libmysqlclient.a" fi - if test -f ${_PGSQL_UDIR}/lib/libpq.dll - then - echo "PGSQL library already installed. skipping." - else - wget_unpacked $PGSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR - mv $TMP_UDIR/pgsql* $PGSQL_DIR - test -f ${_PGSQL_UDIR}/lib/libpq.dll || die "libpq not installed correctly" - fi +# if test -f ${_PGSQL_UDIR}/lib/libpq.dll +# then +# echo "PGSQL library already installed. skipping." +# else +# wget_unpacked $PGSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR +# mv $TMP_UDIR/pgsql* $PGSQL_DIR +# test -f ${_PGSQL_UDIR}/lib/libpq.dll || die "libpq not installed correctly" +# fi if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll then 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" fi 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/libdbdpgsql.dll + -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll + #-a -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll then echo "libdbi drivers already installed. skipping." else @@ -1134,15 +1134,15 @@ function inst_libdbi() { --with-sqlite3-dir=${_SQLITE3_UDIR} \ --with-mysql \ --with-mysql-dir=${_MYSQL_LIB_UDIR} \ - --with-pgsql \ - --with-pgsql-dir=${_PGSQL_UDIR} \ --prefix=${_LIBDBI_DRIVERS_UDIR} + #--with-pgsql \ + #--with-pgsql-dir=${_PGSQL_UDIR} make make install qpopd 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/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 }