test/configure

changeset 68
c997c0978665
parent 67
e43d30273f74
child 71
b8d06f7b617c
--- a/test/configure	Tue Sep 19 19:29:19 2023 +0200
+++ b/test/configure	Wed Sep 20 18:41:58 2023 +0200
@@ -322,9 +322,6 @@
     # dependency libxml2
     while true
     do
-        if [ -z "$lang_c" ] ; then
-            break
-        fi
         if [ -z "$PKG_CONFIG" ]; then
             break
         fi
@@ -403,10 +400,6 @@
     DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED openssl "
     ERROR=1
 fi
-if dependency_error_libpq; then
-    DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED libpq "
-    ERROR=1
-fi
 
 # Features
 if [ -n "$FEATURE_PG" ]; then
@@ -414,8 +407,8 @@
     if dependency_error_libpq ; then
         # "auto" features can fail and are just disabled in this case
         if [ "$FEATURE_PG" = "auto" ]; then
-            unset FEATURE_PG
-		else
+            DISABLE_FEATURE_PG=1
+        else
             DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED libpq "
             ERROR=1
         fi
@@ -424,12 +417,15 @@
     if dependency_error_cpp ; then
         # "auto" features can fail and are just disabled in this case
         if [ "$FEATURE_PG" = "auto" ]; then
-            unset FEATURE_PG
-		else
+            DISABLE_FEATURE_PG=1
+        else
             DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED cpp "
             ERROR=1
         fi
     fi
+    if [ -n "$DISABLE_FEATURE_PG" ]; then
+        unset FEATURE_PG
+    fi
 fi
 
 

mercurial