diff --git a/src/configure b/src/configure
index 433168bfc5..12f80fbdec 100755
--- a/src/configure
+++ b/src/configure
@@ -766,7 +766,7 @@ if test "${with_includes+set}" = set; then
 fi
 
 
-if test "$INCLUDE_DIRS"; then
+if test "$INCLUDE_DIRS" -o "$SRCH_INC"; then
 	for dir in $INCLUDE_DIRS $SRCH_INC; do
 		if test -d "$dir"; then
 			PGSQL_CPPFLAGS="$PGSQL_CPPFLAGS -I$dir"
@@ -804,7 +804,7 @@ if test "${with_libraries+set}" = set; then
 fi
 
 
-if test "$LIBRARY_DIRS"; then
+if test "$LIBRARY_DIRS" -o "$SRCH_LIB"; then
 	for dir in $LIBRARY_DIRS $SRCH_LIB; do
 		if test -d "$dir"; then
 			PGSQL_LDFLAGS="$PGSQL_LDFLAGS -L$dir"
diff --git a/src/configure.in b/src/configure.in
index 1b95fd1343..4db172b82d 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -163,7 +163,7 @@ AC_ARG_WITH(includes,
 	INCLUDE_DIRS="$withval"
     ])
 
-if test "$INCLUDE_DIRS"; then
+if test "$INCLUDE_DIRS" -o "$SRCH_INC"; then
 	for dir in $INCLUDE_DIRS $SRCH_INC; do
 		if test -d "$dir"; then
 			PGSQL_CPPFLAGS="$PGSQL_CPPFLAGS -I$dir"
@@ -195,7 +195,7 @@ AC_ARG_WITH(libraries,
 	LIBRARY_DIRS="$withval"
     ])
 
-if test "$LIBRARY_DIRS"; then
+if test "$LIBRARY_DIRS" -o "$SRCH_LIB"; then
 	for dir in $LIBRARY_DIRS $SRCH_LIB; do
 		if test -d "$dir"; then
 			PGSQL_LDFLAGS="$PGSQL_LDFLAGS -L$dir"