Makefiles now use CPPFLAGS in the same way as configure does.

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index f6f0c296beb13b50f0d8618a887e612f52103bae..4dcda089b9f9596bab05cf5a9baf323a0c27249f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -431,6 +431,15 @@ if test "$ac_cv_header_linux_joystick_h" = "yes"; then
 fi
 AC_SUBST(GTK_JOYSTICK)
 
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+AC_CHECK_HEADERS(iostream)
+if test "x$HAVE_IOSTREAM" = "x" ; then
+  AC_DEFINE(wxUSE_IOSTREAMH)
+fi
+AC_LANG_RESTORE
+
+dnl   defines HAVE_IOSTREAM
 dnl ###################
 dnl # checks typedefs #
 dnl ###################
@@ -708,6 +717,9 @@ DEFAULT_wxUSE_WXGRAPH=0
 DEFAULT_wxUSE_WXTREE=0
 DEFAULT_wxUSE_HELP=0
 
+DEFAULT_wxUSE_UNICODE=1
+DEFAULT_wxUSE_WCSRTOMBS=0
+
 dnl ----------------------------------------------------------------
 dnl toolkit options
 dnl ----------------------------------------------------------------
@@ -876,6 +888,18 @@ AC_OVERRIDES(postscript, postscript,
 **--with-postscript       use wxPostscriptDC device context,
 wxUSE_POSTSCRIPT)
 
+dnl ----------------------------------------------------------------
+dnl user options for wxString and Unicode
+dnl ----------------------------------------------------------------
+
+AC_OVERRIDES(unicode,unicode,
+**--with-unicode          compile wxString with Unicode support,
+wxUSE_UNICODE)
+
+AC_OVERRIDES(wcsrtombs,wcsrtombs,
+**--with-wcsrtombs        use wcsrtombs instead of (buggy in GNU libc5) wcstombs,
+wxUSE_WCSRTOMBS)
+
 dnl ----------------------------------------------------------------
 dnl user options for Prolog and Resources
 dnl ----------------------------------------------------------------
@@ -1248,6 +1272,18 @@ if test "$wxUSE_PRINTING_ARCHITECTURE" = 1 ; then
   AC_DEFINE_UNQUOTED(wxUSE_PRINTING_ARCHITECTURE,$wxUSE_PRINTING_ARCHITECTURE)
 fi
 
+dnl ----------------------------------------------------------------
+dnl Register wxString options for makefiles and setup.h
+dnl ----------------------------------------------------------------
+
+if test "$wxUSE_UNICODE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_UNICODE)
+fi
+
+if test "$wxUSE_WCSRTOMBS" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_WCSRTOMBS)
+fi
+
 dnl ----------------------------------------------------------------
 dnl Register misc options for makefiles and setup.h
 dnl ----------------------------------------------------------------