Update of /cvsroot/sharedaemon/ui-wx
In directory sc8-pr-cvs1:/tmp/cvs-serv22162
Modified Files:
configure
Log Message:
Now detects pkg-config correctly.
Index: configure
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- configure 20 Dec 2003 09:17:45 -0000 1.9
+++ configure 21 Dec 2003 05:01:09 -0000 1.10
@@ -25,6 +25,7 @@
# defaults
wxconfig=wx-config;
gtkconfig=gtk-config;
+ pkgconfig=pkg-config;
prefix=/usr/local/bin;
include=-I/local/include;
include_dir=/local/include;
@@ -164,7 +165,7 @@
echo -n -e "checking for wx-config... \t\t\t";
if test -x $wxconfig; then
wxconfig=$wxconfig;
- elif test -x `which wx-config 2>/dev/null`; then
+ elif `which wx-config 2>/dev/null`; then
wxconfig=`which wx-config 2>/dev/null`;
elif test -x /usr/local/bin/wx-config; then
wxconfig=/usr/local/bin/wx-config;
@@ -189,7 +190,7 @@
EOF
exit 1;
fi;
- echo -e "${colour_yes}yes${colour_default}";
+ echo -e "${colour_yes}$wxconfig${colour_default}";
}
##
@@ -243,11 +244,12 @@
echo -e "${colour_no}yes${colour_default}";
echo -e "\t${colour_warning}Warning: GTK2 support in wxWindows is only experimental,${colour_default}";
echo -e "\t${colour_warning}thus it is not officially supported in this application${colour_default}";
- echo -e "\t${colour_warning}either. You have been warned, continue on your own risc.${colour_default}";
+ echo -e "\t${colour_warning}either. You have been warned, continue on your own risk.${colour_default}";
cppflags="$cppflags -D__GTK2__"
gtk2=1;
else
echo -e "${colour_yes}no${colour_default}";
+ gtk2=0;
fi;
fi;
}
@@ -306,7 +308,7 @@
if test -x $pkgconfig; then
pkgconfig=$pkgconfig;
has_pkgconfig=1;
- elif test -x `which pkg-config 2>/dev/null`; then
+ elif test `which pkg-config 2>/dev/null`; then
pkgconfig=`which pkg-config 2>/dev/null`;
has_pkgconfig=1;
else
@@ -319,14 +321,13 @@
EOF
echo -e "$(default_color)";
has_gtk=0;
+ has_pkgconfig=0;
fi;
- fi;
- if test $has_gtk = 1; then
- if test $has_pkgconfig = 1; then
- echo -e "$(colour_yes)\t\t\t$pkgconfig$(colour_default)";
+ if test $has_gtk = 1 -a $has_pkgconfig = 1; then
+ echo -e "$colour_yes\t\t\t$pkgconfig$colour_default";
fi;
fi;
-
+
fi;
}
@@ -381,10 +382,14 @@
linkflags=`$wxconfig --libs`;
- if $wxconfig --cppflags | grep -q 'gtk'; then
- if test $has_gtk = 1; then
- cppflags="$cppflags -D__HAS_GTK_CONFIG__";
- tray_objs="TrayCoreEngine.o";
+ 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
+ cflags="`$pkgconfig --cflags gtk+-2.0`";
+ cppflags="$cppflags `$pkgconfig --cflags gtk+-2.0`";
+ linkflags="$linkflags `$pkgconfig --libs gtk+-2.0`";
+ else
cflags="`$gtkconfig --cflags`";
cppflags="$cppflags `$gtkconfig --cflags`";
linkflags="$linkflags `$gtkconfig --libs`";
|
