Mercurial > hg > toolkit / file diff

--- a/configure	Tue Mar 25 14:04:43 2025 +0100
+++ b/configure	Wed Mar 26 20:23:07 2025 +0100
@@ -245,6 +245,9 @@
 # check languages
 lang_c=
 lang_cpp=
+if detect_cpp_compiler ; then
+    lang_cpp=1
+fi
 if detect_c_compiler ; then
     lang_c=1
 fi
@@ -299,6 +302,45 @@
     dep_checked_gtk2legacy=1
     return 0
 }
+dependency_error_qt5()
+{
+    print_check_msg "$dep_checked_qt5" "checking for qt5... "
+    # dependency qt5
+    while true
+    do
+        if [ -z "$lang_cpp" ] ; then
+            break
+        fi
+        if which qmake-qt5 > /dev/null ; then
+            :
+        else
+            break
+        fi
+        TEMP_CFLAGS="$TEMP_CFLAGS -DUI_QT5"
+        if tmp_flags=`qmake-qt5 -o - /dev/null | grep "DEFINES " | sed "s/DEFINES[ ]*=//g"` ; then
+            TEMP_CFLAGS="$TEMP_CFLAGS $tmp_flags"
+        else
+            break
+        fi
+        if tmp_flags=`qmake-qt5 -o - /dev/null | grep "INCPATH " | sed "s/INCPATH[ ]*=//g"` ; then
+            TEMP_CFLAGS="$TEMP_CFLAGS $tmp_flags"
+        else
+            break
+        fi
+        if tmp_flags=`qmake-qt5 -o - /dev/null | grep "LIBS " | sed "s/LIBS[ ]*=//g"` ; then
+            TEMP_LDFLAGS="$TEMP_LDFLAGS $tmp_flags"
+        else
+            break
+        fi
+        print_check_msg "$dep_checked_qt5" "yes\n"
+        dep_checked_qt5=1
+        return 1
+    done
+
+    print_check_msg "$dep_checked_qt5" "no\n"
+    dep_checked_qt5=1
+    return 0
+}
 dependency_error_gtk2()
 {
     print_check_msg "$dep_checked_gtk2" "checking for gtk2... "
@@ -580,6 +622,9 @@
             break
         fi
 
+        cat >> "$TEMP_DIR/make.mk" << __EOF__
+LD = \$(CC)
+__EOF__
         break
     done
     break
@@ -748,7 +793,7 @@
     fi
     cat >> "$TEMP_DIR/make.mk" << __EOF__
 TOOLKIT = qt
-LD = $(CXX)
+LD = \$(CXX)
 __EOF__
     return 0
 }
@@ -763,7 +808,7 @@
     fi
     cat >> "$TEMP_DIR/make.mk" << __EOF__
 TOOLKIT = qt
-LD = $(CXX)
+LD = \$(CXX)
 __EOF__
     return 0
 }