diff --git a/configure.in b/configure.in
index ff22a01c8a3..118d255f602 100644
--- a/configure.in
+++ b/configure.in
@@ -74,7 +74,6 @@ else
 fi
 
 if test x"$PG_CONFIG" != "xno" ; then
-  HAVE_PG=1
   PG_LIB="-L`$PG_CONFIG --libdir` -lpq"
   PG_INC="`$PG_CONFIG --includedir`"
   AC_MSG_CHECKING([for postgreSQL libs])
@@ -84,12 +83,10 @@ else
 	ac_postgresql="no"
 fi
 
-AC_SUBST(HAVE_PG)
 AC_SUBST(PG_INC)
 AC_SUBST(PG_LIB)
 
-AM_CONDITIONAL(POSTGRESDB, test x$HAVE_PG = x1)
-
+AM_CONDITIONAL([HAVE_POSTGRESDB], [test "$ac_postgresql" = "yes"])
 
 
 dnl ---------------------------------------------------------------------------
@@ -112,8 +109,7 @@ else
   AC_MSG_RESULT([no])
 fi
 
-AM_CONDITIONAL(HAVE_SPIT, test x$ac_spit = xyes)
-AC_SUBST(HAVE_SPIT)
+AM_CONDITIONAL([HAVE_SPIT], [test "$ac_spit" = "yes"])
 
 
 dnl ---------------------------------------------------------------------------
@@ -169,7 +165,7 @@ AC_ARG_ENABLE(debug,
 
 AC_MSG_CHECKING([if debug statements should be sent to stdout/stderr])
 if test x"$ac_debug" = "xno" ; then
-	DEBUG_QGIS=
+	DEBUG_QGIS=-DNO_DEBUG
 	AC_MSG_RESULT([no])
 else
 	DEBUG_QGIS=-DDEBUG
@@ -179,9 +175,9 @@ AC_SUBST(DEBUG_QGIS)
 
 
 #echo ${prefix}/lib
-ac_libdir=${prefix}/lib
-AC_MSG_CHECKING([plugin install directory])
-AC_MSG_RESULT([$libdir])
+#ac_libdir=${prefix}/lib/$PACKAGE
+#AC_MSG_CHECKING([plugin install directory])
+#AC_MSG_RESULT([$libdir])
 #echo Plugins will be installed in $libdir
 
 AC_CONFIG_FILES([
@@ -209,7 +205,7 @@ echo "PostgreSQL    : $ac_postgresql"
 echo "SPIT          : $ac_spit"
 echo ""
 echo "Debug         : $ac_debug"
-echo "Plugin dir    : $ac_libdir"
+echo "Plugin dir    : ${prefix}/lib/$PACKAGE"
 echo ""
 echo "The binary will be installed in $prefix/bin"
 echo "------------------------------------------"