Mercurial > hg > uwproj / file diff

--- a/test/configure	Sat Aug 03 09:45:30 2019 +0200
+++ b/test/configure	Sat Aug 03 10:22:14 2019 +0200
@@ -238,10 +238,7 @@
         if [ $? -ne 0 ]; then
         	break
         fi
-		cat >> $TEMP_DIR/make.mk << __EOF__
-$sub.make
-__EOF__
-        echo yes
+		echo yes
         return 0
     done
 	
@@ -259,10 +256,7 @@
         fi
         CFLAGS+="-I/mingw/include"    
         LDFLAGS+="-lcurl"    
-		cat >> $TEMP_DIR/make.mk << __EOF__
-$sub.make
-__EOF__
-        echo yes
+		echo yes
         return 0
     done
 	
@@ -284,10 +278,7 @@
         else
             break
         fi
-		cat >> $TEMP_DIR/make.mk << __EOF__
-$sub.make
-__EOF__
-        echo yes
+		echo yes
         return 0
     done
 	
@@ -302,10 +293,35 @@
         fi
         CFLAGS+=" `pkg-config --cflags libcurl`"
         LDFLAGS+=" `pkg-config --libs libcurl`"
-		cat >> $TEMP_DIR/make.mk << __EOF__
-$sub.make
-__EOF__
-        echo yes
+		echo yes
+        return 0
+    done
+	
+	echo no
+	return 1
+}
+dependency_test()
+{
+    printf "checking for test... "
+    # dependency test platform="bsd"
+    while true
+    do
+    	if ! isplatform "bsd"; then
+            break
+        fi
+		if isplatform "macos"; then
+            break
+        fi
+        CFLAGS+="-DBSD"    
+		echo yes
+        return 0
+    done
+	
+    # dependency test 
+    while true
+    do
+        CFLAGS+="-DTEST"    
+		echo yes
         return 0
     done
 	
@@ -326,27 +342,7 @@
         fi
         CFLAGS+=" `pkg-config --cflags sqlite3`"
         LDFLAGS+=" `pkg-config --libs sqlite3`"
-		cat >> $TEMP_DIR/make.mk << __EOF__
-$sub.make
-__EOF__
-        echo yes
-        return 0
-    done
-	
-	echo no
-	return 1
-}
-dependency_test()
-{
-    printf "checking for test... "
-    # dependency test 
-    while true
-    do
-        CFLAGS+="-DTEST"    
-		cat >> $TEMP_DIR/make.mk << __EOF__
-$sub.make
-__EOF__
-        echo yes
+		echo yes
         return 0
     done
 	
@@ -367,10 +363,7 @@
         fi
         CFLAGS+=" `pkg-config --cflags gtk+-2.0`"
         LDFLAGS+=" `pkg-config --libs gtk+-2.0`"
-		cat >> $TEMP_DIR/make.mk << __EOF__
-$sub.make
-__EOF__
-        echo yes
+		echo yes
         return 0
     done
 	
@@ -391,10 +384,7 @@
         fi
         CFLAGS+=" `pkg-config --cflags gtk+-5.0`"
         LDFLAGS+=" `pkg-config --libs gtk+-5.0`"
-		cat >> $TEMP_DIR/make.mk << __EOF__
-$sub.make
-__EOF__
-        echo yes
+		echo yes
         return 0
     done
 	
@@ -416,9 +406,11 @@
         CFLAGS+=" `pkg-config --cflags libxml-2.0`"
         LDFLAGS+=" `pkg-config --libs libxml-2.0`"
 		cat >> $TEMP_DIR/make.mk << __EOF__
-$sub.make
+# Dependency: libxml2		
+xml = libxml2
+
 __EOF__
-        echo yes
+		echo yes
         return 0
     done
 	
@@ -436,9 +428,6 @@
     while true
     do
         
-		cat >> $TEMP_DIR/make.mk << __EOF__
-$dependency.make
-__EOF__
         
         break
     done