--enable-plugins build parts of wxWidgets as loadable components
--enable-universal use wxWidgets GUI controls instead of native ones
--enable-nanox use NanoX
+ --disable-gtk2 use GTK+ 1.2 instead of 2.0
--enable-gpe use GNOME PDA Environment features if possible
--enable-shared create shared library code
--enable-optimise create optimised code
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-gtk use GTK+ (currently uses 2.0)
- --with-gtk1 use GTK+ 1.2
- --with-gtk2 use GTK+ 2.0
+ --with-gtk[=VERSION] use GTK+, VERSION can be 2 (default), 1 or "any"
--with-motif use Motif/Lesstif
--with-mac use Mac OS X
--with-cocoa use Cocoa
DEFAULT_wxUSE_MONOLITHIC=no
DEFAULT_wxUSE_PLUGINS=no
DEFAULT_wxUSE_OFFICIAL_BUILD=no
-
- DEFAULT_wxUSE_GTK1=no
- DEFAULT_wxUSE_GTK2=no
else
DEFAULT_wxUSE_UNIVERSAL=no
DEFAULT_wxUSE_STL=no
DEFAULT_wxUSE_LIBSDL=no
DEFAULT_wxUSE_LIBGNOMEPRINT=yes
DEFAULT_wxUSE_ODBC=no
- DEFAULT_wxUSE_OPENGL=yes
+ DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
DEFAULT_wxUSE_STACKWALKER=yes
DEFAULT_wxUSE_PLUGINS=no
DEFAULT_wxUSE_OFFICIAL_BUILD=no
- DEFAULT_wxUSE_GTK1=no
- DEFAULT_wxUSE_GTK2=no
+ DEFAULT_wxUSE_GTK2=yes
fi
+
for toolkit in `echo $ALL_TOOLKITS`; do
LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}`
if test "x$LINE" != "x" ; then
has_toolkit_in_cache=1
eval "DEFAULT_$LINE"
eval "CACHE_$toolkit=1"
+
+ LINE=`grep "wx${toolkit}_VERSION=" ${wx_arg_cache_file}`
+ if test "x$LINE" != "x" ; then
+ eval "DEFAULT_$LINE"
+ fi
fi
done
wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1
fi;
- echo "$as_me:$LINENO: checking for --with-gtk1" >&5
-echo $ECHO_N "checking for --with-gtk1... $ECHO_C" >&6
- no_cache=0
-
-# Check whether --with-gtk1 or --without-gtk1 was given.
-if test "${with_gtk1+set}" = set; then
- withval="$with_gtk1"
-
- if test "$withval" = yes; then
- ac_cv_use_gtk1='wxUSE_GTK1=yes'
- else
- ac_cv_use_gtk1='wxUSE_GTK1=no'
- fi
-
-else
-
- LINE=`grep "wxUSE_GTK1" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- else
- no_cache=1
- fi
-
- ac_cv_use_gtk1='wxUSE_GTK1='$DEFAULT_wxUSE_GTK1
-
-fi;
-
- eval "$ac_cv_use_gtk1"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_gtk1 >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$wxUSE_GTK1" = yes; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- fi
-
-
- echo "$as_me:$LINENO: checking for --with-gtk2" >&5
-echo $ECHO_N "checking for --with-gtk2... $ECHO_C" >&6
- no_cache=0
-
-# Check whether --with-gtk2 or --without-gtk2 was given.
-if test "${with_gtk2+set}" = set; then
- withval="$with_gtk2"
-
- if test "$withval" = yes; then
- ac_cv_use_gtk2='wxUSE_GTK2=yes'
- else
- ac_cv_use_gtk2='wxUSE_GTK2=no'
- fi
-
-else
-
- LINE=`grep "wxUSE_GTK2" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- else
- no_cache=1
- fi
-
- ac_cv_use_gtk2='wxUSE_GTK2='$DEFAULT_wxUSE_GTK2
-
-fi;
-
- eval "$ac_cv_use_gtk2"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_gtk2 >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$wxUSE_GTK2" = yes; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- fi
-
-
# Check whether --with-motif or --without-motif was given.
if test "${with_motif+set}" = set; then
withval="$with_motif"
fi
+# Check whether --enable-gtk2 or --disable-gtk2 was given.
+if test "${enable_gtk2+set}" = set; then
+ enableval="$enable_gtk2"
+ wxUSE_GTK2="$enableval"
+fi;
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gpe" >&5
wxUSE_SHARED=no
fi
-if test "$wxUSE_GTK1" = "yes" -o "$wxUSE_GTK2" = "yes"; then
- wxUSE_GTK=yes
- TOOLKIT_GIVEN=1
-fi
if test "$wxUSE_GUI" = "yes"; then
for toolkit in `echo $ALL_TOOLKITS`; do
var=wxUSE_$toolkit
eval "value=\$${var}"
- eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`"
+ if test "x$value" = "xno"; then
+ eval "$var=0"
+ elif test "x$value" != "x"; then
+ eval "$var=1"
+ fi
+
+ if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then
+ eval "wx${toolkit}_VERSION=$value"
+ fi
done
else
for toolkit in `echo $ALL_TOOLKITS`; do
var=DEFAULT_DEFAULT_wxUSE_$toolkit
else
var=DEFAULT_wxUSE_$toolkit
+
+ eval "version=\$DEFAULT_wx${toolkit}_VERSION"
+ if test "x$version" != "x"; then
+ eval "wx${toolkit}_VERSION=$version"
+ fi
fi
eval "wxUSE_$toolkit=\$${var}"
done
{ (exit 1); exit 1; }; }
esac
+ # to be removed when --disable-gtk2 isn't needed
+ if test "x$wxUSE_GTK2" = "xyes"; then
+ wxGTK_VERSION=2
+ elif test "x$wxUSE_GTK2" = "xno"; then
+ wxGTK_VERSION=1
+ fi
+
for toolkit in `echo $ALL_TOOLKITS`; do
var=wxUSE_$toolkit
eval "value=\$${var}"
eval "cache=\$${cache_var}"
if test "$cache" = 1; then
echo "$var=$value" >> ${wx_arg_cache_file}
+ eval "version=\$wx${toolkit}_VERSION"
+ if test "x$version" != "x"; then
+ echo "wx${toolkit}_VERSION=$version" >> ${wx_arg_cache_file}
+ fi
fi
if test "$value" = 1; then
toolkit_echo=`echo $toolkit | tr "[A-Z]" "[a-z]"`
GTK_MODULES=gthread
fi
- if test "x$wxUSE_GTK1" != "xyes" -a "x$wxUSE_GTK2" != "xyes"; then
- wxUSE_GTK2=yes
- fi
-
wx_cv_lib_gtk=
- if test "x$wxUSE_GTK2" = "xyes"; then
+ if test "x$wxGTK_VERSION" != "x1"; then
# Check whether --enable-gtktest or --disable-gtktest was given.
if test "${enable_gtktest+set}" = set; then
enableval="$enable_gtktest"
fi
- if test -z "$wx_cv_lib_gtk" -a "x$wxUSE_GTK1" = "xyes"; then
+ if test -z "$wx_cv_lib_gtk"; then
+ if test "x$wxGTK_VERSION" = "x1" -o "x$wxGTK_VERSION" = "xany" ; then
# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
if test "${with_gtk_prefix+set}" = set; then
rm -f conf.gtktest
- if test -z "$wx_cv_lib_gtk"; then
+ if test -z "$wx_cv_lib_gtk"; then
# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
if test "${with_gtk_prefix+set}" = set; then
rm -f conf.gtktest
+ fi
fi
fi
MACSETFILE="\$(SETFILE)"
if test "$wxUSE_MAC" = 1; then
- MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r ${LIBWXMACRES} -o"
+ MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r -o"
- MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
+ MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r -o"
else
MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o"
MACRESWXCONFIG="echo -n \\\| ${RESCOMP} -d __DARWIN__ -t APPL \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
projects / wxWidgets.git / blobdiff