WXUNIV
MONOLITHIC
USE_PLUGINS
+CXXWARNINGS
EXTRALIBS
EXTRALIBS_XML
EXTRALIBS_HTML
--enable-mimetype use wxMimeTypesManager
--enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only)
--enable-utf8 use UTF-8 representation for strings (Unix only)
+ --enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only)
--enable-snglinst use wxSingleInstanceChecker class
--enable-std_iostreams use standard C++ stream classes
--enable-std_string use standard C++ string classes
--enable-dirpicker use wxDirPickerCtrl class
--enable-display use wxDisplay class
--enable-detect_sm use code to detect X11 session manager
+ --enable-editablebox use wxEditableListBox class
--enable-filepicker use wxFilePickerCtrl class
--enable-fontpicker use wxFontPickerCtrl class
--enable-gauge use wxGauge class
DEFAULT_wxUSE_DISPLAY=no
DEFAULT_wxUSE_DETECT_SM=no
DEFAULT_wxUSE_DIRPICKERCTRL=no
+ DEFAULT_wxUSE_EDITABLELISTBOX=no
DEFAULT_wxUSE_FILEPICKERCTRL=no
DEFAULT_wxUSE_FONTPICKERCTRL=no
DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_UNICODE=no
DEFAULT_wxUSE_UNICODE_MSLU=no
- DEFAULT_wxUSE_UNICODE_UTF8=no
+ DEFAULT_wxUSE_UNICODE_UTF8=auto
+ DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
DEFAULT_wxUSE_WCSRTOMBS=no
DEFAULT_wxUSE_PALETTE=no
DEFAULT_wxUSE_DISPLAY=yes
DEFAULT_wxUSE_DETECT_SM=yes
DEFAULT_wxUSE_DIRPICKERCTRL=yes
+ DEFAULT_wxUSE_EDITABLELISTBOX=yes
DEFAULT_wxUSE_FILEPICKERCTRL=yes
DEFAULT_wxUSE_FONTPICKERCTRL=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_UNICODE=no
DEFAULT_wxUSE_UNICODE_MSLU=yes
- DEFAULT_wxUSE_UNICODE_UTF8=no
+ DEFAULT_wxUSE_UNICODE_UTF8=auto
+ DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
DEFAULT_wxUSE_WCSRTOMBS=no
DEFAULT_wxUSE_PALETTE=yes
LINE=`grep "wxUSE_UNIVERSAL_BINARY" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
- wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
else
no_cache=1
- wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY=no"
fi
+ wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
+
fi
# Check whether --enable-utf8 was given.
if test "${enable_utf8+set}" = set; then
enableval=$enable_utf8;
+ wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'"
+
+else
+
+ LINE=`grep "wxUSE_UNICODE_UTF8" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
+
+fi
+
+
+ eval "$wx_cv_use_utf8"
+ if test "$no_cache" != 1; then
+ echo $wx_cv_use_utf8 >> ${wx_arg_cache_file}.tmp
+ fi
+
+ { echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5
+echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; }
+
+
+ enablestring=
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8only" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-utf8only... $ECHO_C" >&6; }
+ no_cache=0
+ # Check whether --enable-utf8only was given.
+if test "${enable_utf8only+set}" = set; then
+ enableval=$enable_utf8only;
if test "$enableval" = yes; then
- ac_cv_use_utf8='wxUSE_UNICODE_UTF8=yes'
+ ac_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=yes'
else
- ac_cv_use_utf8='wxUSE_UNICODE_UTF8=no'
+ ac_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no'
fi
else
- LINE=`grep "wxUSE_UNICODE_UTF8" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_UNICODE_UTF8_LOCALE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
+ ac_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE='$DEFAULT_wxUSE_UNICODE_UTF8_LOCALE
fi
- eval "$ac_cv_use_utf8"
+ eval "$ac_cv_use_utf8only"
if test "$no_cache" != 1; then
- echo $ac_cv_use_utf8 >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_utf8only >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_UNICODE_UTF8" = yes; then
+ if test "$wxUSE_UNICODE_UTF8_LOCALE" = yes; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
fi
+ enablestring=
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-editablebox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-editablebox... $ECHO_C" >&6; }
+ no_cache=0
+ # Check whether --enable-editablebox was given.
+if test "${enable_editablebox+set}" = set; then
+ enableval=$enable_editablebox;
+ if test "$enableval" = yes; then
+ ac_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes'
+ else
+ ac_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_EDITABLELISTBOX" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_editablebox='wxUSE_EDITABLELISTBOX='$DEFAULT_wxUSE_EDITABLELISTBOX
+
+fi
+
+
+ eval "$ac_cv_use_editablebox"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_editablebox >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_EDITABLELISTBOX" = 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
+
+
enablestring=
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; }
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+ #include <stdio.h>
int
main ()
{
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+ return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
;
return 0;
}
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#define _LARGEFILE_SOURCE 1
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+ #include <stdio.h>
int
main ()
{
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+ return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
;
return 0;
}
fi
+
+if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then
+ if test "$TOOLKIT" = "DFB" ; then
+ wxUSE_UNICODE_UTF8=yes
+ elif test "$TOOLKIT" = "GTK" -a "$WXGTK20" = "1" ; then
+ wxUSE_UNICODE_UTF8=yes
+ else
+ wxUSE_UNICODE_UTF8=no
+ fi
+fi
+
+
if test "$wxUSE_GUI" = "yes"; then
if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
{ echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
else
+################################################################
ac_cv_func_which_gethostbyname_r=unknown
fi
+################################################################
fi
fi
fi
- { echo "$as_me:$LINENO: checking for getservbyname_r" >&5
-echo $ECHO_N "checking for getservbyname_r... $ECHO_C" >&6; }
-if test "${ac_cv_func_which_getservbyname_r+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-{ echo "$as_me:$LINENO: checking for getservbyname_r" >&5
-echo $ECHO_N "checking for getservbyname_r... $ECHO_C" >&6; }
-if test "${ac_cv_func_getservbyname_r+set}" = set; then
+{ echo "$as_me:$LINENO: checking how many arguments getservbyname_r() takes" >&5
+echo $ECHO_N "checking how many arguments getservbyname_r() takes... $ECHO_C" >&6; }
+if test "${ac_cv_func_which_getservbyname_r+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define getservbyname_r to an innocuous variant, in case <limits.h> declares getservbyname_r.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define getservbyname_r innocuous_getservbyname_r
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char getservbyname_r (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef getservbyname_r
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getservbyname_r ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_getservbyname_r || defined __stub___getservbyname_r
-choke me
-#endif
-
-int
-main ()
-{
-return getservbyname_r ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func_getservbyname_r=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_func_getservbyname_r=no
-fi
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_getservbyname_r" >&5
-echo "${ECHO_T}$ac_cv_func_getservbyname_r" >&6; }
-if test $ac_cv_func_getservbyname_r = yes; then
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
-# include <netdb.h>
-
+#include <netdb.h>
int
main ()
{
-
- char *name;
- char *proto;
- struct servent *se;
- struct servent_data data;
- (void) getservbyname_r(name, proto, se, &data);
-
+ char *name;
+ char *proto;
+ struct servent *se, *res;
+ char buffer[2048];
+ int buflen = 2048;
+ (void) getservbyname_r(name, proto, se, buffer, buflen, &res)
;
return 0;
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_func_which_getservbyname_r=four
+ ac_cv_func_which_getservbyname_r=six
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
-# include <netdb.h>
-
+#include <netdb.h>
int
main ()
{
- char *name;
- char *proto;
- struct servent *se, *res;
- char buffer[2048];
- int buflen = 2048;
- (void) getservbyname_r(name, proto, se, buffer, buflen, &res)
+ char *name;
+ char *proto;
+ struct servent *se;
+ char buffer[2048];
+ int buflen = 2048;
+ (void) getservbyname_r(name, proto, se, buffer, buflen)
;
return 0;
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_func_which_getservbyname_r=six
+ ac_cv_func_which_getservbyname_r=five
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
-# include <netdb.h>
-
+#include <netdb.h>
int
main ()
{
- char *name;
- char *proto;
- struct servent *se;
- char buffer[2048];
- int buflen = 2048;
- (void) getservbyname_r(name, proto, se, buffer, buflen)
+ char *name;
+ char *proto;
+ struct servent *se;
+ struct servent_data data;
+ (void) getservbyname_r(name, proto, se, &data);
;
return 0;
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_func_which_getservbyname_r=five
+ ac_cv_func_which_getservbyname_r=four
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_which_getservbyname_r=no
+
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
-else
- ac_cv_func_which_getservbyname_r=no
-fi
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_which_getservbyname_r" >&5
#define HAVE_FUNC_GETSERVBYNAME_R_4 1
_ACEOF
-
fi
#define wxUSE_UNICODE_UTF8 1
_ACEOF
+
+ if test "$wxUSE_UNICODE_UTF8_LOCALE" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_UTF8_LOCALE_ONLY 1
+_ACEOF
+
+ fi
fi
if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
fi
fi
+if test "$wxUSE_EDITABLELISTBOX" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_EDITABLELISTBOX 1
+_ACEOF
+
+ USES_CONTROLS=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS editlbox"
+fi
+
if test "$wxUSE_NOTEBOOK" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_NOTEBOOK 1
C_AND_CXX_FLAGS="$DEBUG_CFLAGS $PROFILE_FLAGS $OPTIMISE_CFLAGS"
CFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $CFLAGS `
-CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $CXXWARNINGS $C_AND_CXX_FLAGS $CXXFLAGS `
+CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $CXXFLAGS `
WXCONFIG_CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $WXCONFIG_ONLY_CPPFLAGS`
+
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"`
PLATFORM_BEOS=1
;;
* )
- { { echo "$as_me:$LINENO: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&5
-echo "$as_me: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&2;}
- { (exit 1); exit 1; }; }
- ;;
+ ;;
esac
fi
cppunit_major_min=`echo $cppunit_version_min | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
- if test "x${cppunit_major_min}" = "x" ; then
- cppunit_major_min=0
- fi
-
cppunit_minor_min=`echo $cppunit_version_min | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
- if test "x${cppunit_minor_min}" = "x" ; then
- cppunit_minor_min=0
- fi
-
cppunit_micro_min=`echo $cppunit_version_min | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
- if test "x${cppunit_micro_min}" = "x" ; then
- cppunit_micro_min=0
- fi
cppunit_version_proper=`expr \
$cppunit_major_version \> $cppunit_major_min \| \
WXUNIV!$WXUNIV$ac_delim
MONOLITHIC!$MONOLITHIC$ac_delim
USE_PLUGINS!$USE_PLUGINS$ac_delim
+CXXWARNINGS!$CXXWARNINGS$ac_delim
EXTRALIBS!$EXTRALIBS$ac_delim
EXTRALIBS_XML!$EXTRALIBS_XML$ac_delim
EXTRALIBS_HTML!$EXTRALIBS_HTML$ac_delim
COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim
COND_BUILD_RELEASE!$COND_BUILD_RELEASE$ac_delim
-COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT!$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT!$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT$ac_delim
COND_BUILD_RELEASE_UNICODE_0!$COND_BUILD_RELEASE_UNICODE_0$ac_delim
COND_BUILD_RELEASE_UNICODE_1!$COND_BUILD_RELEASE_UNICODE_1$ac_delim
COND_DEBUG_FLAG_1!$COND_DEBUG_FLAG_1$ac_delim
COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
-COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
LDFLAGS_GL!$LDFLAGS_GL$ac_delim
OPENGL_LIBS!$OPENGL_LIBS$ac_delim
DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
-WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim
RESCOMP!$RESCOMP$ac_delim
RESFLAGS!$RESFLAGS$ac_delim
RESPROGRAMOBJ!$RESPROGRAMOBJ$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}"
echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}"
-echo " Should wxWidgets be compiled in Unicode mode? ${wxUSE_UNICODE:-no}"
+echo -n " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}"
+if test "$wxUSE_UNICODE" = "yes"; then
+ if test "$wxUSE_UNICODE_UTF8" = "yes"; then
+ echo " (using UTF-8)"
+ else
+ echo " (using wchar_t)"
+ fi
+else
+ echo
+fi
echo " What level of wxWidgets compatibility should be enabled?"
echo " wxWidgets 2.6 ${WXWIN_COMPATIBILITY_2_6:-no}"
projects / wxWidgets.git / blobdiff