pwre configure qt/gtk fix

src/tools/pwre/src/os_linux/pwre_configure.sh

@@ -411,17 +411,17 @@ echo "export PWRE_CONF_PARALLEL=$parallel" >> $cfile
 if [ $pwre_hw == "hw_arm" ] && [ $ebuild -eq 1 ]; then
     echo "Arm ebuild"
 
-    if [ $pwre_conf_qt -eq 1 ]; then
+#    if [ $pwre_conf_qt -eq 1 ]; then
         pwre_config_check_lib qt        QT      qt qt 0 "/usr/lib/libQtGui.so:/usr/lib/$hwpl-linux-$gnu/libQtGui.so"
         pwre_config_check_include qt    QT   1 "/usr/include/qt4/QtGui"
         pwre_config_check_include qt    QT   1 "/usr/include/qt4/QtCore/QtCore"
         pwre_config_check_include qt    QT   1 "/usr/include/qt4/QtGui/QtGui"
         pwre_config_check_include qt    QT   1 "/usr/include/qt4/QtNetwork/QtNetwork"
-    fi
-    if [ $pwre_conf_gtk -eq 1 ]; then
+#    fi
+#    if [ $pwre_conf_gtk -eq 1 ]; then
         pwre_config_check_lib gtk       GTK      gtk gtk 0 "/usr/lib/libgtk-x11-2.0.so:/usr/lib/$hwpl-linux-$gnu/libgtk-x11-2.0.so"
         pwre_config_check_include gtk   GTK   1 "/usr/local/include/gtk-2.0/gtk.h:/usr/local/include/gtk-2.0/gtk/gtk.h:/usr/include/gtk-2.0/gtk/gtk.h"
-    fi
+#    fi
 
     pwre_config_check_include jni   JNI   1 $jdk/include/jni.h
     pwre_config_check_include jni   JNI   0 $jdk/include/linux/jni_md.h
@@ -485,11 +485,6 @@ else
 
     #Gtk
     echo "Mandatory :"
-    if [ ! -z $pwre_conf_qt ]; then
-        pwre_config_check_lib qt        QT      qt qt 0 "/usr/lib/libQtGui.so:/usr/lib/$hwpl-linux-$gnu/libQtGui.so"
-        elif [ ! -z $pwre_conf_gtk ]; then
-        pwre_config_check_lib gtk       GTK      gtk gtk 0 "/usr/lib/libgtk-x11-2.0.so:/usr/lib/$hwpl-linux-$gnu/libgtk-x11-2.0.so"
-    fi
 
     pwre_config_check_lib librpcsvc LIBRPCSVC lib lib 0 "/usr/lib/librpcsvc.so:/usr/lib/librpcsvc.a:/usr/lib/$hwpl-linux-$gnu/librpcsvc.a"
     pwre_config_check_lib libasound LIBASOUND lib lib 0 "/usr/lib/libasound.so:/usr/lib/libasound.a:/usr/lib/$hwpl-linux-$gnu/libasound.so"
@@ -502,16 +497,17 @@ else
     pwre_config_check_lib librt     LIBRT    lib lib 0 "/usr/lib/librt.so:/usr/lib/librt.a:/usr/lib/$hwpl-linux-$gnu/librt.so"
     pwre_config_check_lib libfl     LIBFL    lib lib 0 "/usr/lib/libfl.so:/usr/lib/libfl.a:/usr/lib/$hwpl-linux-$gnu/libfl.so"
     pwre_config_check_lib libX11    LIBX11   lib lib 0 "/usr/lib/libX11.so:/usr/lib/$hwpl-linux-$gnu/libX11.so"
+    pwre_config_check_include alsa  ALSA  1 "/usr/include/alsa/asoundlib.h"
 
-    if [ ! -z $pwre_conf_qt ]; then
+    echo ""
+    echo "Gui Qt/Gtk:"
+        pwre_config_check_lib qt        QT      qt qt 0 "/usr/lib/libQtGui.so:/usr/lib/$hwpl-linux-$gnu/libQtGui.so"
         pwre_config_check_include qt    QT   1 "/usr/include/qt4/QtGui"
         pwre_config_check_include qt    QT   1 "/usr/include/qt4/QtCore/QtCore"
         pwre_config_check_include qt    QT   1 "/usr/include/qt4/QtGui/QtGui"
         pwre_config_check_include qt    QT   1 "/usr/include/qt4/QtNetwork/QtNetwork"
-        elif [ ! -z $pwre_conf_gtk ]; then
+        pwre_config_check_lib gtk       GTK      gtk gtk 0 "/usr/lib/libgtk-x11-2.0.so:/usr/lib/$hwpl-linux-$gnu/libgtk-x11-2.0.so"
         pwre_config_check_include gtk   GTK   1 "/usr/local/include/gtk-2.0/gtk.h:/usr/local/include/gtk-2.0/gtk/gtk.h:/usr/include/gtk-2.0/gtk/gtk.h"
-    fi
-    pwre_config_check_include alsa  ALSA  1 "/usr/include/alsa/asoundlib.h"
 
     echo ""
     echo "Optional :"