Menu
▾
▴
[ShareDaemon-CVS] ui-wx Changelog,1.106,1.107 configure,1.5,1.6
|
From: <ma...@us...> - 2003-12-19 03:01:17
|
Update of /cvsroot/sharedaemon/ui-wx
In directory sc8-pr-cvs1:/tmp/cvs-serv11041
Modified Files:
Changelog configure
Log Message:
Hetfields systray (Patch #845694)
Index: Changelog
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/Changelog,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- Changelog 17 Dec 2003 09:47:35 -0000 1.106
+++ Changelog 19 Dec 2003 03:01:12 -0000 1.107
@@ -21,13 +21,17 @@
# ALL ChangeLog entries end with a dot. #
###############################################################################
+2003/19/12 Alo Sarv
+ * Imported Hetfield's GTK systray.
+
+2003/18/12 Alo Sarv
+ * Dialog pages can now be detached from main frame and displayed as
+ separate frame. Not supported on wxMac.
+
2003/17/12 Alo Sarv
* Serverpage look enhancements
- * Toolbar right-click popup menu (right-click on empty space in tbar)
+ * Toolbar right-click popup menu (right-click on empty space in tbar).
* Fullscreen mode switch
- * Initial support for detaching dialog pages and displaying them as
- separate frame (disabled by default due to its experimental
- nature).
2003/13/12 Alo Sarv
* Configure script
Index: configure
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure 17 Dec 2003 03:56:19 -0000 1.5
+++ configure 19 Dec 2003 03:01:14 -0000 1.6
@@ -1,3 +1,4 @@
+#!/bin/sh
################################################################################
# This file is part of wxInterface. #
# Copyright (C) 2003 Alo Sarv <ma...@us...> #
@@ -17,8 +18,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
################################################################################
-#!/bin/sh
-
##
# Checks for ccache (compiler cache) availability
#
@@ -63,7 +62,14 @@
wxconfig=/wx/dynamic/2.5.0/bin/wx-config;
else
echo "${colour_no}no${colour_default}";
- not_found;
+ cat <<EOF
+wx-config was not found in standard locations. This means that either you do not
+have wxWindows library installed for your platform (wxGTK for Linux, wxMac for
+Mac OS, wxMSW for MS Windows), you are missing wxWindows developer package or
+you have installed wxWindows into non-standard location. In the latter case,
+rerun configure with --with-wx-config=/path/to/wx-config.
+EOF
+ exit 1;
fi;
echo -e "${colour_yes}yes${colour_default}";
}
@@ -125,20 +131,6 @@
}
##
-# Outputs error message about wx-config not being found, and prints suggestions.
-#
-function not_found() {
- cat <<EOF
-wx-config was not found in standard locations. This means that either you do not
-have wxWindows library installed for your platform (wxGTK for Linux, wxMac for
-Mac OS, wxMSW for MS Windows), you are missing wxWindows developer package or
-you have installed wxWindows into non-standard location. In the latter case,
-rerun configure with --with-wx-config=/path/to/wx-config.
-EOF
- exit 1;
-}
-
-##
# Outputs error message about too old wxWindows library and exits with false.
#
function wrong_version() {
@@ -155,11 +147,6 @@
# Generates Makefile from Makefile.am
#
gen_makefile() {
- if test $show_flags = 1; then
- print_cpp_flags=" with flags: `$wxconfig --cxxflags` $cppflags $include";
- print_link_flags=" with flags: `$wxconfig --libs`";
- fi;
-
echo "creating Makefile";
cp -f Makefile.am Makefile;
echo "creating src/Makefile";
@@ -182,14 +169,31 @@
cppflags="$cppflags -D__HAVE_REMOVE_GROWABLE_COL__"
fi;
+ linkflags=`$wxconfig --libs`;
+
+ if test $has_gtk = 1; then
+ cppflags="$cppflags -D__HAS_GTK_CONFIG__";
+ tray_objs="TrayCoreEngine.o";
+ cflags="`$gtkconfig --cflags`";
+ cppflags="$cppflags `$gtkconfig --cflags`";
+ linkflags="$linkflags `$gtkconfig --libs`";
+ fi;
+
+ if test $show_flags = 1; then
+ print_cpp_flags=" with flags: `$wxconfig --cxxflags` $cppflags $include";
+ print_link_flags=" with flags: $linkflags";
+ fi;
+
sed -e "\
s#@CXX@#$ccache `$wxconfig --cxx`#; \
s#@CXX_FLAGS@#`$wxconfig --cxxflags`#; \
- s#@LIBS@#`$wxconfig --libs`#; \
- s#@CPP_FLAGS@#$cppflags#; \
+ s#@CFLAGS@#$cflags#; \
+ s#@LIBS@#$linkflags#; \
+ s#@CPP_FLAGS@#$cppflags#; \
s#@INCLUDE@#$include#; \
- s#@PRINT_CPP_FLAGS@#$print_cpp_flags#;\
- s#@PRINT_LINK_FLAGS@#$print_link_flags#;\
+ s#@PRINT_CPP_FLAGS@#$print_cpp_flags#; \
+ s#@PRINT_LINK_FLAGS@#$print_link_flags#; \
+ s#@TRAY_OBJECTS@#$tray_objs#; \
" src/Makefile.am >> src/Makefile;
}
@@ -199,6 +203,7 @@
parse_cmdline() {
# defaults
wxconfig=wx-config;
+ gtkconfig=gtk-config;
prefix=/usr/local/bin;
include=-I/local/include;
include_dir=/local/include;
@@ -222,6 +227,9 @@
--with-wx-config=*)
wxconfig=$optarg;
;;
+ --with-gtk-config=*)
+ gtkconfig=$optarg;
+ ;;
--prefix=*)
prefix=$optarg;
;;
@@ -296,7 +304,7 @@
echo -e -n "checking for --enable-debug\t\t\t";
if test $debug = 1; then
echo -e "${colour_yes}yes${colour_default}";
- cppflags="$cppflags -g -ggdb -fno-inline"
+ cppflags="$cppflags -g -ggdb -fno-inline -Wall"
else
echo -e "${colour_no}no${colour_default}";
fi;
@@ -332,6 +340,7 @@
Usage:
--help Print this message and return to shell
--with-wx-config=DIR Specify the location of wx-config script
+ --with-gtk-config=DIR Specify the location of gtk-config
--enable-optimise Optimize code ( recommended for users)
--enable-debug Enable debugging ( recommended for devs)
--enable-profile Enable profiling ( recommended for devs)
@@ -345,6 +354,45 @@
exit 0;
}
+###
+# Checks for availability of GTK headers (needed for GTK systray)
+#
+function check_gtkconfig() {
+if $wxconfig --cppflags | grep -q 'gtk'; then
+ echo -e -n "checking for gtk-config...";
+ if test -x $gtkconfig; then
+ gtkconfig=$gtkconfig;
+ has_gtk=1;
+ elif test -x /usr/local/bin/gtk-config; then
+ gtkconfig=/usr/local/bin/gtk-config;
+ has_gtk=1;
+ elif test -x /usr/bin/gtk-config; then
+ gtkconfig=/usr/bin/gtk-config;
+ has_gtk=1;
+ elif test -x /bin/gtk-config; then
+ gtkconfig=/bin/gtk-config;
+ has_gtk=1;
+ elif test -x /local/bin/gtk-config; then
+ gtkconfig=/local/bin/gtk-config;
+ has_gtk=1;
+ else
+ echo -e "${colour_no}no${colour_warning}";
+ cat << EOF
+gtk-config was not found in standard locations. This means that either
+you do not have GTK installed, you are missing GTK developer packages,
+or you have installed GTK into custom location. In the latter case,
+please rerun configure with --with-gtk-config=PREFIX.
+GTK systray will be disabled.
+EOF
+ echo -e "$(colour_default)";
+ has_gtk=0;
+ fi;
+ if test $has_gtk = 1; then
+ echo -e "${colour_yes}\t\t\tyes${colour_default}";
+ fi;
+fi;
+}
+
##
# Main script execution part.
#
@@ -352,6 +400,7 @@
check_wxconfig;
check_wxversion;
check_wxgtk2;
+check_gtkconfig;
check_ccache;
gen_makefile;
|
