From kde-commits Thu May 06 21:28:34 2004 From: Nicolas Goutte Date: Thu, 06 May 2004 21:28:34 +0000 To: kde-commits Subject: koffice/kexi/kexidb/drivers Message-Id: <20040506212834.2C4751CEE () office ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=108387892224860 CVS commit by goutte: - use less lines when headers or libs are not found - do not ouput anything in case of success (as configure.in.bot files are for warnings.) M +22 -35 configure.in.bot 1.4 --- koffice/kexi/kexidb/drivers/configure.in.bot #1.3:1.4 @@ -1,49 +1,36 @@ -echo "==================================================================" -echo "Kexi PostgreSQL driver status:" - -if test -z "$PG_INCDIR"; then +if test -z "$PG_INCDIR" -o -z "$PG_LIBDIR"; then echo "" - echo " +The PostgreSQL C-API (libpq) headers were not found" - echo " These usually ship with PostgreSQL, but if you've installed from" - echo " a distros package then these files may be part of a package" - echo " called postgresql-devel or libpq-devel" - all_tests=bad -else - echo " +The PostgreSQL C-API (libpq) headers were found" -fi -if test -z "$PG_LIBDIR"; then - echo "" - echo " +The PostgreSQL C-API (libpq) libs were not found" - echo " These usually ship with PostgreSQL, but if you've installed from" - echo " a distros package then these files may be part of a package" + if test -z "$PG_INCDIR"; then + echo " + The PostgreSQL C-API (libpq) headers were not found" + fi + + if test -z "$PG_LIBDIR"; then + echo " + The PostgreSQL C-API (libpq) libs were not found" + fi + + echo " The PostgreSQL C-API usually ship with PostgreSQL, but if you've installed" + echo " from a distros package then these files may be part of a package" echo " called postgresql-devel or libpq-devel" + all_tests=bad -else - echo " +The PostgreSQL C-API (libpq) libs were found" fi -if test -z "$PQXX_INCDIR"; then +if test -z "$PQXX_INCDIR" -o -z "$PQXX_LIBDIR"; then echo "" - echo " +The PostgreSQL C++ API (libpqxx) headers were not found" - echo " The libpqxx library can be downloaded from pqxx.tk or" - echo " http://gborg.postgresql.org/project/libpqxx/projdisplay.php" - echo " Grab the latest version (>=2)" - all_tests=bad -else - echo " +The PostgreSQL C++ API (libpqxx) headers were found" -fi -if test -z "$PQXX_LIBDIR"; then - echo "" - echo " +The PostgreSQL C++ API (libpqxx) libs were not found" - echo " The libpqxx library can be downloaded from pqxx.tk or" + if test -z "$PQXX_INCDIR"; then + echo " + The PostgreSQL C++ API (libpqxx) headers were not found" + fi + + if test -z "$PQXX_LIBDIR"; then + echo " + The PostgreSQL C++ API (libpqxx) libs were not found" + fi + + echo " The PostgreSQL C++ API can be downloaded from pqxx.tk or" echo " http://gborg.postgresql.org/project/libpqxx/projdisplay.php" echo " Grab the latest version (>=2)" all_tests=bad -else - echo " +The PostgreSQL C++ API (libpqxx) libs were found" fi -echo "=================================================================="