DEFAULT_STD_FLAG=no
;;
- powerpc-*-darwin* )
- dnl PowerPC Darwin based distributions (including Mac OS X)
+ *-*-darwin* )
+ dnl Darwin based distributions (including Mac OS X)
USE_BSD=1
USE_DARWIN=1
SO_SUFFIX=dylib
dnl The other BSD's should probably go in here too, since this is
dnl to workaround a strange static lib BSDism.
dnl Mac OS X install seems to ignore -p option...
- powerpc-*-darwin* )
+ *-*-darwin* )
INSTALL_PROGRAM="cp -fp"
INSTALL_DATA="cp -fp"
;;
fi
-dnl This case is for OS X vs. everything else
+dnl This case is for PowerPC OS X vs. everything else
case "${host}" in
powerpc-*-darwin* )
AC_MSG_CHECKING([if __POWERPC__ is already defined])
[AC_MSG_RESULT([no])
AC_DEFINE(__POWERPC__)
])
+ ;;
+esac
+
+dnl This case is for OS X vs. everything else
+case "${host}" in
+ *-*-darwin* )
AC_MSG_CHECKING([if CoreFoundation/CFBase.h is usable])
AC_TRY_COMPILE([#include <CoreFoundation/CFBase.h>
],[],
if test "x$wx_largefile" = "xyes"; then
if test "x$ac_cv_sys_file_offset_bits" = "x64"; then
WX_LARGEFILE_FLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
+
+ dnl we get "Large Files (ILP32) not supported in strict ANSI mode."
+ dnl #error from HP standard headers when compiling with g++ without this
+ dnl
+ dnl NB: gcc defines __STDC_EXT__=1 for C code, but not for C++, hence
+ dnl we do this only for CXXFLAGS and not CPPFLAGS
+ if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then
+ CXXFLAGS="$CXXFLAGS -D__STDC_EXT__=1"
+ fi
else
WX_LARGEFILE_FLAGS="-D_LARGE_FILES"
fi
fi
;;
- powerpc-*-darwin* )
+ *-*-darwin* )
install_name_tool=`which install_name_tool`
if test "$install_name_tool" -a -x "$install_name_tool"; then
SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
AC_DEFINE(HAVE_WCSLEN)
fi
- dnl on HP-UX aCC and g++ need this define to find mbstrtowcs() &c
- if test "$USE_HPUX" = 1; then
+ dnl On HP-UX aCC need this define to find mbstrtowcs() &c
+ dnl Can't be used for g++ since the mbstate_t in wchar.h can conflict
+ dnl with g++'s in <cwchar> (unless -D_INCLUDE__STDC_A1_SOURCE is in the
+ dnl flags when g++ is configured, it will declare it's own).
+ if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
CPPFLAGS="$CPPFLAGS -D_INCLUDE__STDC_A1_SOURCE "
fi
- dnl try to use wcsrtombs instead of wcstombs which is buggy in old GNU
- dnl libc versions if possible
- AC_CHECK_FUNCS(wcsrtombs)
+ dnl Try to use wcsrtombs instead of wcstombs which is buggy in old GNU
+ dnl libc versions if possible. AC_CHECK_FUNCS only checks it's in the
+ dnl library, not the header, so do a header check for mbstate_t first.
+ AC_CHECK_TYPES([mbstate_t],
+ [AC_CHECK_FUNCS(wcsrtombs)],
+ [],
+ [#include <wchar.h>])
else
AC_MSG_WARN([Wide character support is unavailable])
fi
dnl check for vsnprintf() -- a safe version of vsprintf())
dnl
-dnl the trouble here is that on some systems (notable HP-UX) this function is
+dnl the trouble here is that on some systems (e.g HP-UX 10) this function is
dnl present in libc but not in the system headers and so AC_CHECK_FUNCS (which,
dnl stupidly, provides a dummy function declaration inside its extension)
dnl succeeds, even with C++ compiler, but the compilation of wxWidgets fails
dnl yes it is -- now check if it is in the headers
AC_CACHE_CHECK([for vsnprintf declaration], wx_cv_func_vsnprintf_decl,
[
+ dnl our troubles are not over: HP-UX 11 prototypes vsnprintf() as
+ dnl taking "char *" and not "const char *" while Metrowerks does
+ dnl provide a correct vsnprintf declaration but in C++ mode it's
+ dnl always in std namespace and so we have to bring it in scope
AC_TRY_COMPILE(
[
#include <stdio.h>
#include <stdarg.h>
+ #ifdef __MSL__
+ #if __MSL__ >= 0x6000
+ namespace std {}
+ using namespace std;
+ #endif
+ #endif
],
[
char *buf;
va_list ap;
- vsnprintf(buf, 10u, "%s", ap);
+ const char *fmt = "%s";
+ vsnprintf(buf, 10u, fmt, ap);
],
wx_cv_func_vsnprintf_decl=yes,
- [
- 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 <stdio.h>
- #include <stdarg.h>
- 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
- )
- ]
+ wx_cv_func_vsnprintf_decl=no
)
]
)
THREAD_OPTS="pthreads"
;;
*-hp-hpux* )
- dnl HP-UX aCC only gives a warning, not an error about
- dnl -pthread but it doesn't work and we have to use -lpthread
- dnl there
- if test "x$GCC" != "xyes"; then
+ if test "x$GCC" = "xyes"; then
+ dnl the correct option for gcc is -threads, at least under
+ dnl HP-UX 11.00
+ THREAD_OPTS="-threads"
+ fi
+ dnl HP-UX aCC only gives a warning, not an error about
+ dnl -pthread but it doesn't work and we have to use
+ dnl -lpthread there
THREAD_OPTS=""
fi
;;
AC_MSG_ERROR([wxExpr and old-style resources are now available in contrib only])
fi
+dnl ---------------------------------------------------------------------------
+dnl wxMetafile availability
+dnl ---------------------------------------------------------------------------
+
+if test "$wxUSE_METAFILE" = "yes"; then
+ if test "$wxUSE_MSW" != 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_PM" != 1; then
+ AC_MSG_WARN([wxMetafile is not available on this system... disabled])
+ wxUSE_METAFILE=no
+ fi
+fi
+
dnl ---------------------------------------------------------------------------
dnl IPC: IPC, Drag'n'Drop, Clipboard, ...
dnl ---------------------------------------------------------------------------
AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
case "${host}" in
- powerpc-*-darwin* )
+ *-*-darwin* )
dnl Some Apple's GCC version are broken and can't handle the
dnl pragmas:
GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
projects / wxWidgets.git / blobdiff