X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c08ebc627546d8f1a3c69c989d21d587c851f9a9..bf6461219dad12e84f5be1806e184afd2e0d6fc1:/configure.in diff --git a/configure.in b/configure.in index fc4a6193a7..0517498b63 100644 --- a/configure.in +++ b/configure.in @@ -513,6 +513,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CHOICE=no DEFAULT_wxUSE_CHOICEBOOK=no DEFAULT_wxUSE_COMBOBOX=no + DEFAULT_wxUSE_DATEPICKCTRL=no DEFAULT_wxUSE_DISPLAY=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no @@ -704,6 +705,7 @@ else DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_CHOICEBOOK=yes DEFAULT_wxUSE_COMBOBOX=yes + DEFAULT_wxUSE_DATEPICKCTRL=yes DEFAULT_wxUSE_DISPLAY=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes @@ -988,13 +990,14 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_ACCEL=yes DEFAULT_wxUSE_BMPBUTTON=yes DEFAULT_wxUSE_BUTTON=yes - DEFAULT_wxUSE_CALCTRL=no + DEFAULT_wxUSE_CALCTRL=yes DEFAULT_wxUSE_CARET=yes DEFAULT_wxUSE_COMBOBOX=yes DEFAULT_wxUSE_CHECKBOX=yes DEFAULT_wxUSE_CHECKLISTBOX=yes DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_CHOICEBOOK=yes + DEFAULT_wxUSE_DATEPICKCTRL=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes DEFAULT_wxUSE_IMAGLIST=yes @@ -1034,6 +1037,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_CHECKLISTBOX=no DEFAULT_wxUSE_CHOICE=no DEFAULT_wxUSE_CHOICEBOOK=no + DEFAULT_wxUSE_DATEPICKCTRL=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no DEFAULT_wxUSE_IMAGLIST=no @@ -1074,6 +1078,7 @@ WX_ARG_ENABLE(checklst, [ --enable-checklst use wxCheckListBox (listbo WX_ARG_ENABLE(choice, [ --enable-choice use wxChoice class], wxUSE_CHOICE) WX_ARG_ENABLE(choicebook, [ --enable-choicebook use wxChoicebook class], wxUSE_CHOICEBOOK) WX_ARG_ENABLE(combobox, [ --enable-combobox use wxComboBox class], wxUSE_COMBOBOX) +WX_ARG_ENABLE(datepick, [ --enable-datepick use wxDatePickerCtrl class], wxUSE_DATEPICKCTRL) WX_ARG_ENABLE(display, [ --enable-display use wxDisplay class], wxUSE_DISPLAY) WX_ARG_ENABLE(gauge, [ --enable-gauge use wxGauge class], wxUSE_GAUGE) WX_ARG_ENABLE(grid, [ --enable-grid use wxGrid class], wxUSE_GRID) @@ -1354,6 +1359,7 @@ dnl default CFLAGS (something like "-g -O2") -- we don't need this as we add dnl -g and -O flags ourselves below CFLAGS=${CFLAGS:=} AC_PROG_CC +AC_BAKEFILE_PROG_MWCC dnl is -traditional needed for correct compilations dnl adds -traditional for gcc if needed @@ -1371,6 +1377,7 @@ dnl dnl see CFLAGS line above CXXFLAGS=${CXXFLAGS:=} AC_PROG_CXX +AC_BAKEFILE_PROG_MWCXX AC_LANG_RESTORE @@ -3415,6 +3422,11 @@ EOF TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1" ;; + *-*-hpux* ) + SAMPLES_RPATH_FLAG="-Wl,+b,\$(top_builddir)lib" + WXCONFIG_RPATH="-Wl,+b,\$libdir" + ;; + esac if test $wxUSE_RPATH = "no"; then @@ -3645,8 +3657,8 @@ if test "$wx_cv_sizeof_wchar_t" != "0"; then AC_DEFINE(HAVE_WCSLEN) fi - dnl HP-UX aCC needs this define to find mbstrtowcs() &c - if test "$USE_HPUX" = 1 -a "x$GCC" != "xyes"; then + dnl on HP-UX aCC and g++ need this define to find mbstrtowcs() &c + if test "$USE_HPUX" = 1; then CPPFLAGS="$CPPFLAGS -D_INCLUDE__STDC_A1_SOURCE " fi @@ -3688,7 +3700,27 @@ if test "$ac_cv_func_vsnprintf" = "yes"; then vsnprintf(buf, 10u, "%s", ap); ], wx_cv_func_vsnprintf_decl=yes, - wx_cv_func_vsnprintf_decl=no + [ + dnl Metrowerks does provide a vsnprintf declaration + dnl but in C++ mode it's always in std namespace. + dnl FIXME: Do we have any UNIX C++ compilers that would + dnl fail this test if using namespace std; was + dnl simply always included? + AC_TRY_COMPILE( + [ + #include + #include + using namespace std; + ], + [ + char *buf; + va_list ap; + vsnprintf(buf, 10u, "%s", ap); + ], + wx_cv_func_vsnprintf_decl=yes, + wx_cv_func_vsnprintf_decl=no + ) + ] ) ] ) @@ -4801,6 +4833,7 @@ if test "$wxUSE_CONFIG" = "yes" ; then AC_MSG_WARN(wxConfig requires wxTextFile... disabled) else AC_DEFINE(wxUSE_CONFIG) + AC_DEFINE(wxUSE_CONFIG_NATIVE) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config" fi fi @@ -4839,11 +4872,6 @@ if test "$wxUSE_GEOMETRY" = "yes"; then AC_DEFINE(wxUSE_GEOMETRY) fi -if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then - AC_DEFINE(wxUSE_DIALUP_MANAGER) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup" -fi - if test "$wxUSE_STREAMS" = "yes" ; then AC_DEFINE(wxUSE_STREAMS) fi @@ -5508,6 +5536,11 @@ if test "$wxUSE_CHECKLST" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst" fi +if test "$wxUSE_DATEPICKCTRL" = "yes"; then + AC_DEFINE(wxUSE_DATEPICKCTRL) + USES_CONTROLS=1 +fi + if test "$wxUSE_DISPLAY" = "yes"; then AC_DEFINE(wxUSE_DISPLAY) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display" @@ -5632,7 +5665,6 @@ fi if test "$wxUSE_TABDIALOG" = "yes"; then AC_DEFINE(wxUSE_TAB_DIALOG) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab" fi if test "$wxUSE_TEXTCTRL" = "yes"; then @@ -5721,6 +5753,15 @@ if test "$wxUSE_POPUPWIN" = "yes"; then fi fi +if test "$wxUSE_DIALUP_MANAGER" = "yes"; then + if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then + AC_MSG_WARN([Dialup manager not yet supported under Mac OS X... disabled]) + else + AC_DEFINE(wxUSE_DIALUP_MANAGER) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup" + fi +fi + if test "$wxUSE_TIPWINDOW" = "yes"; then if test "$wxUSE_PM" = 1; then AC_MSG_WARN([wxTipWindow not yet supported under PM... disabled]) @@ -6025,6 +6066,9 @@ if test "$wxUSE_MAC" = 1 ; then fi if test "$wxUSE_COCOA" = 1 ; then LDFLAGS="$LDFLAGS -framework Cocoa" + if test "$wxUSE_MEDIACTRL" = "yes"; then + LDFLAGS="$LDFLAGS -framework QuickTime" + fi fi dnl FIXME: should this be covered by the conditional above @@ -6118,6 +6162,21 @@ CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS` CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CWARNINGS` CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS` +if test "x$MWCC" = "xyes"; then + dnl Correct MW 8.3 to be more similar to GCC. In particular we + dnl must use from system not our local copy on OS X, + dnl but must use local not system on OS 9. + dnl The following should make all -I paths usable for <> includes + dnl while first checking in real system paths. With 8.3 using + dnl -gccincludes it will actually check local paths before system + dnl even for <> which is totally wrong. + + dnl Note that because this absolutely needs to be before any -I + dnl that we have to tack it on to the end of the compiler commandline. + CC="$CC -cwd source -I-" + CXX="$CXX -cwd source -I-" +fi + LIBS=`echo $LIBS` EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" @@ -6255,7 +6314,7 @@ case "$TOOLKIT" in ;; esac -AC_BAKEFILE +AC_BAKEFILE([m4_include(autoconf_inc.m4)]) if test "$wxUSE_SHARED" = "yes"; then