Fixed GTK search path

build.sh

@@ -77,6 +77,12 @@ ename=$ver$hw
 desc=$verl
 gui="qt"
 
+if [ $gui == "qt" ]; then
+  export pwre_conf_qt=1
+elif [ $gui == "gtk" ]; then
+  export pwre_conf_gtk=1
+fi
+
 pwre add $ename $root/src \"\" $root/rls $btype $os $hw "$desc"
 pwre init $ename
 
@@ -84,8 +90,9 @@ pwre init $ename
 mkdir -p $pwre_broot
 pwre configure
 pwre create_all_modules
-pwre build_kernel $gui
-pwre method_build $gui
+pwre build_all_modules $gui
+#pwre build_kernel $gui
+#pwre method_build $gui
 
 
 # Create a package version html file

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

@@ -398,7 +398,8 @@ if [ $pwre_hw == "hw_arm" ] && [ $ebuild -eq 1 ]; then
     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"
-  else
+  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
@@ -467,7 +468,8 @@ else
   echo "Mandatory :"
   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"
-  else
+  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"
   fi
 
@@ -488,7 +490,8 @@ else
     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"
-  else
+  fi
+  if [ $pwre_conf_gtk -eq 1 ]; then
     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"

src/tools/pwre/src/os_linux/pwre_function

@@ -155,20 +155,6 @@ set_env()
 	else
 	  export pwre_conf_mysql=0
         fi
-# Gtk
-	if [ -e /usr/lib/libgtk-x11-2.0.so ]; then
-          export pwre_conf_gtk=1
-	else
-	  export pwre_conf_gtk=0
-        fi
-# Qt
-	if [ -e /usr/lib/x86_64-linux-gnu/libQtGui.so ]; then
-          export pwre_conf_qt=1
-	elif [ -e /usr/lib/i386-linux-gnu/libQtGui.so ]; then
-		  export pwre_conf_qt=1
-	else
-	  export pwre_conf_qt=0
-        fi
 	
 # libusb
 	if [ -e /usr/lib/libusb-1.0.so ]; then