using wxURL now enforces linking http.o, ftp.o and sckfile.o

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index da40f4be734c012049a5a6536e7776b4f196922d..6fb515424e0f5aa6b493de30814460e6fe14a977 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -61,8 +61,11 @@
 /* Define this if your version of GTK+ is greater than 1.2 */
 #undef __WXGTK12__
 
+/* Define this if your version of GTK+ is greater than 1.2.7 */
+#undef __WXGTK127__
+
 /* Define this if your version of GTK+ is greater than 1.3 */
-#undef __WXGTK13__
+#undef __WXGTK20__
 
 /*
  * Define to 1 for Unix[-like] system
@@ -83,6 +86,7 @@
 #undef __OSF__
 #undef __BSD__
 #undef __FREEBSD__
+#undef __NETBSD__
 #undef __VMS__
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
@@ -138,6 +142,11 @@
  */
 #define wxUSE_ODBC 0
 #define wxODBC_FWD_ONLY_CURSORS 1
+#define wxODBC_BACKWARD_COMPATABILITY 0
+/*
+ * Use freetype
+ */
+#define wxUSE_FREETYPE 0
 /*
  * Use Threads
  */
@@ -154,6 +163,7 @@
  * Use OpenGL
  */
 #define wxUSE_OPENGL 0
+#define wxUSE_GLCANVAS 0
 
 /*
  * Use GUI
@@ -164,6 +174,11 @@
  */
 #define wxUSE_NOGUI 0
 
+/*
+ * Catch fatal program exceptions
+ */
+#define wxUSE_ON_FATAL_EXCEPTION 0
+
 /*
  * Use constraints mechanism
  */
@@ -257,10 +272,6 @@
  * Use this control
  */
 #define wxUSE_NOTEBOOK 0
-/*
- * Use wxPlot class
- */
-#define wxUSE_PLOT 0
 /*
  * Use this control
  */
@@ -309,6 +320,10 @@
  * Use this control
  */
 #define wxUSE_STATUSBAR 0
+/*
+ * Use this control
+ */
+#define wxUSE_TOGGLEBTN 0
 /*
  * Use Tab dialog class - obsolete, use wxNotebook instead
  */
@@ -333,7 +348,7 @@
 #define wxUSE_TOOLBAR_SIMPLE 0
 
 #if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)
-#define wxUSE_OWNER_DRAWN 1 
+#define wxUSE_OWNER_DRAWN 1
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif
@@ -349,14 +364,21 @@
  */
 #define wxUSE_LONGLONG 0
 
+/*
+ * Use geometry classes
+ */
+#define wxUSE_GEOMETRY 0
+
 /*
  * Use wxFile class
  */
 #define wxUSE_FILE 0
+
 /*
  * Use wxTextFile class
  */
 #define wxUSE_TEXTFILE 0
+
 /*
  * Use log classes and logging functions
  */
@@ -419,20 +441,15 @@
 #define wxUSE_POSTSCRIPT 0
 
 /*
- * Compile wxString with some Unicode support?
+ * Compile wxString with some Unicode (wide character) support?
  */
 #define wxUSE_WCHAR_T 0
 
 /*
- * Compile wxString in wide character (Unicode) mode?
+ * Compile wxWindows in Unicode mode (Win32 only for now)?
  */
 #define wxUSE_UNICODE 0
 
-/*
- * Compile wxString with (limited) multibyte char support?
- */
-#define wxUSE_MULTIBYTE 0
-
 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *
@@ -561,6 +578,7 @@
  * Support for metafiles
  */
 #define wxUSE_METAFILE 0
+#define wxUSE_ENH_METAFILE 0
 
 /*
  * wxMiniFrame
@@ -575,6 +593,7 @@
 /*
  * (virtual) filesystems code
  */
+#define wxUSE_FILESYSTEM 0
 #define wxUSE_FS_INET 0
 #define wxUSE_FS_ZIP 0
 
@@ -582,7 +601,7 @@
  * A class that shows info window when app is busy
  * (works exactly like wxBusyCursor)
  */
-#define wxUSE_BUSYINFO 0 
+#define wxUSE_BUSYINFO 0
 
 /*
  * Zip stream for accessing files stored inside .zip archives
@@ -603,7 +622,7 @@
  * PNM image format support
  */
 #define wxUSE_PNM 0
- 
+
 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.
@@ -626,6 +645,9 @@
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #undef SOCKLEN_T
 
+/* The signal handler prototype */
+#undef wxTYPE_SA_HANDLER
+
 /* gettimeofday() usually takes 2 arguments, but some really old systems might
  * have only one, in which case define WX_GETTIMEOFDAY_NO_TZ */
 #undef WX_GETTIMEOFDAY_NO_TZ
@@ -633,6 +655,9 @@
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #undef WX_GMTOFF_IN_TM
 
+/* Define if you have pw_gecos field in struct passwd */
+#undef HAVE_PW_GECOS
+
 /* Define if you have dlopen() */
 #undef HAVE_DLOPEN
 
@@ -654,6 +679,12 @@
 /* Define if you have pthread_cancel */
 #undef HAVE_PTHREAD_CANCEL
 
+/* Define if you have sigaction() */
+#undef HAVE_SIGACTION
+
+/* Define if you have sigemptyset() */
+#undef HAVE_SIGEMPTYSET
+
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 
@@ -684,6 +715,9 @@
 /* The number of bytes in a char.  */
 #undef SIZEOF_CHAR
 
+/* The number of bytes in a wchar_t.  */
+#undef SIZEOF_WCHAR_T
+
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
 
@@ -702,6 +736,9 @@
 /* Define if you have the dlopen function.  */
 #undef HAVE_DLOPEN
 
+/* Define if you have the dlerror function.  */
+#undef HAVE_DLERROR
+
 /* Define if you have the gethostname function.  */
 #undef HAVE_GETHOSTNAME
 
@@ -714,6 +751,12 @@
 /* Define if you have the nanosleep function.  */
 #undef HAVE_NANOSLEEP
 
+/* Define if you have the putenv function.  */
+#undef HAVE_PUTENV
+
+/* Define if you have the setenv function.  */
+#undef HAVE_SETENV
+
 /* Define if you have the shl_load function.  */
 #undef HAVE_SHL_LOAD
 
@@ -721,7 +764,7 @@
 #undef HAVE_STRTOK_R
 
 /* Define if you have thr_setconcurrency function */
-#undef HaVE_THR_SETCONCURRENCY
+#undef HAVE_THR_SETCONCURRENCY
 
 /* Define if you have the uname function.  */
 #undef HAVE_UNAME
@@ -753,12 +796,21 @@
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 
+/* Define if you have the <fcntl.h> header file.  */
+#undef HAVE_FCNTL_H
+
 /* Define if you have the <wchar.h> header file.  */
 #undef HAVE_WCHAR_H
 
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
+/* Define if you have the <iconv.h> header file.  */
+#undef HAVE_ICONV_H
+
+/* Define if you have the <langinfo.h> header file.  */
+#undef HAVE_LANGINFO_H
+
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM