Mercurial > hg > toolkit / file diff

--- a/configure	Thu Jan 21 20:40:14 2016 +0100
+++ b/configure	Sat Jan 23 18:37:30 2016 +0100
@@ -29,7 +29,7 @@
 
 OS=`uname -s`
 OS_VERSION=`uname -r`
-PREFIX=/opt/mk12
+PREFIX=/opt/toolkit
 
 #
 # parse arguments
@@ -87,6 +87,11 @@
     echo "gcc"
 fi
 
+if [ $OS = FreeBSD ]; then
+    BUILD_CONFIG=clang
+    echo "clang"
+fi
+
 if [ $OS = Darwin ]; then
     BUILD_CONFIG=osx
     echo "gcc"
@@ -98,6 +103,11 @@
 	echo "mingw"
 fi
 
+if [ -z "BUILD_CONFIG" ]; then
+    BUILD_CONFIG=gcc
+    echo "gcc"
+fi
+
 
 #if [ $OS != Darwin ]; then
 #    check_pkgconfig_lib "libxml2" "libxml-2.0"
@@ -125,11 +135,18 @@
             pkg-config gtk+-2.0
             RESULT=$?
             if [ $RESULT -eq 0 ]; then
-                TOOLKIT=gtk2legacy
+                TOOLKIT=gtk2
                 echo "gtk2"
             else
-                echo "not found"
-                exit 1
+                which qmake-qt4 > /dev/null
+                RESULT=$?
+                if [ $RESULT -eq 0 ]; then
+                    TOOLKIT=qt4
+                    echo "qt4"
+                else
+                    echo "not found"
+                    exit 1
+                fi
             fi
         fi
     fi