Fix more bugs

flintlib · Oct 21, 2024 · bec9543 · bec9543
1 parent 4438414
commit bec9543
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/acinclude.m4 b/acinclude.m4
@@ -173,8 +173,15 @@ then
     tmp=`$PKG_CONFIG --cflags-only-other $withpath $1 | sed 's/\(-D\w\+\)\(\|=\w\+\)//g' | sed 's/  / /g'` dnl ' Fix Vim syntax
     eval ${tmpalias}_CFLAGS="\${tmp}"
 else
-    eval ${tmpalias}_LDFLAGS="-L\${2}"
-    eval ${tmpalias}_CPPFLAGS="-I\${3}"
+    if test "x${2}" != "x";
+    then
+        eval ${tmpalias}_LDFLAGS="-L\${2}"
+    fi
+
+    if test "x${3}" != "x";
+    then
+        eval ${tmpalias}_CPPFLAGS="-I\${3}"
+    fi
 fi
 ])
 

diff --git a/configure.ac b/configure.ac
@@ -568,12 +568,26 @@ fi
 for lib in $library_dependencies;
 do
     eval "tmp=\"\${${lib}_CPPFLAGS}\""
-    eval "tmp2=\"\${${lib}_includedir}\""
-    CPPFLAGS="$CPPFLAGS $tmp -I$tmp2"
+    if test "x$tmp" != "x";
+    then
+        CPPFLAGS="$CPPFLAGS $tmp"
+    fi
+    eval "tmp=\"\${${lib}_includedir}\""
+    if test "x$tmp" != "x";
+    then
+        CPPFLAGS="$CPPFLAGS -I$tmp"
+    fi
 
     eval "tmp=\"\${${lib}_LDFLAGS}\""
-    eval "tmp2=\"\${${lib}_libdir}\""
-    LDFLAGS="$LDFLAGS $tmp -L$tmp2"
+    if test "x$tmp" != "x";
+    then
+        LDFLAGS="$LDFLAGS -L$tmp"
+    fi
+    eval "tmp=\"\${${lib}_libdir}\""
+    if test "x$tmp" != "x";
+    then
+        LDFLAGS="$LDFLAGS -L$tmp"
+    fi
 done
 
 ################################################################################