added wxUSE_TASKBARICON; corrected condition for generating the taskbar sample makefile in configure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
70
configure
vendored
70
configure
vendored
@@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 47513 2007-07-16 21:20:54Z VZ .
|
||||
# From configure.in Id: configure.in 47544 2007-07-18 12:58:28Z VZ .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||
#
|
||||
@@ -1800,6 +1800,7 @@ Optional Features:
|
||||
--enable-stattext use wxStaticText class
|
||||
--enable-statusbar use wxStatusBar class
|
||||
--enable-tabdialog use wxTabControl class
|
||||
--enable-taskbaricon use wxTaskBarIcon class
|
||||
--enable-textctrl use wxTextCtrl class
|
||||
--enable-togglebtn use wxToggleButton class
|
||||
--enable-toolbar use wxToolBar class
|
||||
@@ -13152,6 +13153,61 @@ fi
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
enablestring=
|
||||
defaultval=$wxUSE_ALL_FEATURES
|
||||
if test -z "$defaultval"; then
|
||||
if test x"$enablestring" = xdisable; then
|
||||
defaultval=yes
|
||||
else
|
||||
defaultval=no
|
||||
fi
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-taskbaricon" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-taskbaricon... $ECHO_C" >&6; }
|
||||
no_cache=0
|
||||
# Check whether --enable-taskbaricon was given.
|
||||
if test "${enable_taskbaricon+set}" = set; then
|
||||
enableval=$enable_taskbaricon;
|
||||
if test "$enableval" = yes; then
|
||||
wx_cv_use_taskbaricon='wxUSE_TASKBARICON=yes'
|
||||
else
|
||||
wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}`
|
||||
if test "x$LINE" != x ; then
|
||||
eval "DEFAULT_$LINE"
|
||||
else
|
||||
no_cache=1
|
||||
fi
|
||||
|
||||
wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
eval "$wx_cv_use_taskbaricon"
|
||||
if test "$no_cache" != 1; then
|
||||
echo $wx_cv_use_taskbaricon >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
if test x"$enablestring" = xdisable; then
|
||||
if test $wxUSE_TASKBARICON = yes; then
|
||||
result=no
|
||||
else
|
||||
result=yes
|
||||
fi
|
||||
else
|
||||
result=$wxUSE_TASKBARICON
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
enablestring=
|
||||
defaultval=$wxUSE_ALL_FEATURES
|
||||
if test -z "$defaultval"; then
|
||||
@@ -48477,10 +48533,14 @@ if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
|
||||
#define wxUSE_SYSTEM_OPTIONS 1
|
||||
_ACEOF
|
||||
|
||||
if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
|
||||
"$TOOLKIT" = "MOTIF" -o "$TOOLKIT" = "COCOA"; then
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_TASKBARICON" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_TASKBARICON 1
|
||||
_ACEOF
|
||||
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
|
||||
fi
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user