Update of /cvsroot/sharedaemon/ui-wx
In directory sc8-pr-cvs1:/tmp/cvs-serv15509
Modified Files:
configure
Log Message:
fixed gtk2/gtk1 detection
Index: configure
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/configure,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- configure 22 Dec 2003 09:05:30 -0000 1.13
+++ configure 22 Dec 2003 10:51:04 -0000 1.14
@@ -270,6 +270,7 @@
#
function check_gtkconfig() {
has_gtk=0;
+has_pkgconfig=0;
if $wxconfig --cppflags | grep -q 'gtk'; then
echo -e -n "checking for gtk-config...";
if test -x $gtkconfig; then
@@ -311,7 +312,7 @@
if test -x $pkgconfig; then
pkgconfig=$pkgconfig;
has_pkgconfig=1;
- elif test `which pkg-config 2>/dev/null`; then
+ elif test -x `which pkg-config 2>/dev/null`; then
pkgconfig=`which pkg-config 2>/dev/null`;
has_pkgconfig=1;
else
@@ -388,7 +389,7 @@
if test $has_gtk = 1; then
cppflags="$cppflags -D__HAS_GTK_CONFIG__";
tray_objs="TrayCoreEngine.o";
- if test [$gtk2 = 1] -a [$has_pkgconfig = 1]; then
+ if test $gtk2 = 1 -a $has_pkgconfig = 1; then
cflags="`$pkgconfig --cflags gtk+-2.0`";
cppflags="$cppflags `$pkgconfig --cflags gtk+-2.0`";
linkflags="$linkflags `$pkgconfig --libs gtk+-2.0`";
|
