diff --git a/packages/prosqlite/configure.in b/packages/prosqlite/configure.in
index 6be334805..290c876a9 100644
--- a/packages/prosqlite/configure.in
+++ b/packages/prosqlite/configure.in
@@ -21,16 +21,14 @@ m4_include([../ac_swi_c.m4])
 
 yap_cv_prosqlite=yes
 
-yap_cv_prosqlite=yes
 AC_ARG_WITH(prosqlite,
 	[ --with-prosqlite(=location)              interface to sqlite],
 	if test "$withval" = yes; then
 	    PROSQLITE_DIR=/usr
 	elif test "$withval" = no; then
 	    yap_cv_prosqlite=no
-
-else
-	    PROSQLITE_DIR=$withval
+	else
+	    PROSQLITE_DIR="$withval"
 	fi,
 	[PROSQLITE_DIR=/usr ])
 
@@ -46,7 +44,6 @@ if test $yap_cv_prosqlite = yes; then
     PROSQLITE_CPPFLAGS="-I${PROSQLITE_DIR}/include"
     PROSQLITE_LDFLAGS="-L${PROSQLITE_DIR}/lib"
     CPPFLAGS="-I${PROSQLITE_DIR}/include ${CPPFLAGS}"
-    CPPFLAGS="-I${PROSQLITE_DIR}/include ${CPPFLAGS}"
     CIFLAGS="-I${PROSQLITE_DIR}/include ${CIFLAGS}"
     LDFLAGS="-L${PROSQLITE_DIR}/lib ${LDFLAGS}"
   fi
@@ -64,13 +61,13 @@ if test $yap_cv_prosqlite = yes; then
 
 fi
 
-
-if test "$havelib" = yes &&
-    test "$ac_cv_header_sqlite3_h" = yes; then
+if test "$yap_cv_prosqlite" != no &&
+   test	"$havelib" = yes &&
+   test	"$ac_cv_header_sqlite3_h" = yes; then
   PROSQLITE_TARGETS="prosqlite.$SO"
   PROSQLITE_PLTARGETS="prolog/prosqlite.pl"
 else
-  echo "ERROR:   Cannot find odbc library or the header sql.h"
+  echo "ERROR:   Cannot find sqlite3 library and/or the header sqlite3.h"
   echo "WARNING: PROSQLITE interface will not be built"
   PROSQLITE_TARGETS=""
 fi