Mercurial > hg > uwproj / file diff

--- a/test/configure	Mon Feb 04 18:40:33 2019 +0100
+++ b/test/configure	Sat Aug 03 09:45:30 2019 +0200
@@ -238,6 +238,9 @@
         if [ $? -ne 0 ]; then
         	break
         fi
+		cat >> $TEMP_DIR/make.mk << __EOF__
+$sub.make
+__EOF__
         echo yes
         return 0
     done
@@ -256,6 +259,9 @@
         fi
         CFLAGS+="-I/mingw/include"    
         LDFLAGS+="-lcurl"    
+		cat >> $TEMP_DIR/make.mk << __EOF__
+$sub.make
+__EOF__
         echo yes
         return 0
     done
@@ -278,6 +284,9 @@
         else
             break
         fi
+		cat >> $TEMP_DIR/make.mk << __EOF__
+$sub.make
+__EOF__
         echo yes
         return 0
     done
@@ -293,6 +302,9 @@
         fi
         CFLAGS+=" `pkg-config --cflags libcurl`"
         LDFLAGS+=" `pkg-config --libs libcurl`"
+		cat >> $TEMP_DIR/make.mk << __EOF__
+$sub.make
+__EOF__
         echo yes
         return 0
     done
@@ -314,6 +326,9 @@
         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
@@ -328,6 +343,9 @@
     while true
     do
         CFLAGS+="-DTEST"    
+		cat >> $TEMP_DIR/make.mk << __EOF__
+$sub.make
+__EOF__
         echo yes
         return 0
     done
@@ -349,6 +367,9 @@
         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
         return 0
     done
@@ -370,6 +391,9 @@
         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
         return 0
     done
@@ -391,6 +415,9 @@
         fi
         CFLAGS+=" `pkg-config --cflags libxml-2.0`"
         LDFLAGS+=" `pkg-config --libs libxml-2.0`"
+		cat >> $TEMP_DIR/make.mk << __EOF__
+$sub.make
+__EOF__
         echo yes
         return 0
     done
@@ -401,6 +428,35 @@
 
 DEPENDENCIES_FAILED=
 ERROR=0
+# general dependencies
+CFLAGS=
+LDFLAGS=
+while true
+do
+    while true
+    do
+        
+		cat >> $TEMP_DIR/make.mk << __EOF__
+$dependency.make
+__EOF__
+        
+        break
+    done
+    
+    break
+done
+
+# add general dependency flags to config.mk
+echo >> $TEMP_DIR/config.mk
+if [[ ! -z ${CFLAGS} ]]; then
+    echo "CFLAGS += $CFLAGS" >> $TEMP_DIR/config.mk
+fi
+if [[ ! -z ${CXXFLAGS} ]]; then
+    echo "CXXFLAGS += $CXXFLAGS" >> $TEMP_DIR/config.mk
+fi
+if [[ ! -z ${LDFLAGS} ]]; then
+    echo "LDFLAGS += $LDFLAGS" >> $TEMP_DIR/config.mk
+fi
 
 #
 # OPTION VALUES