New makefile updates.

[wxWidgets.git] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index 8d0f4db1f2c549e2287f5e72c3cf47622abcb8a7..29c6edee8fdaa0295bd408c18ddec5e0760b819f 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -2,8 +2,10 @@
 /*                                                                         */
 /* Version: $Id$                                                           */
 
-#ifndef __GTKSETUPH__
-#define __GTKSETUPH__
+/* This define (__WX_SETUP_H__) is used both to insure setup.h is included 
+ * only once and to indicate that we are building using configure. */
+#ifndef __WX_SETUP_H__
+#define __WX_SETUP_H__
 
 #ifdef __GNUG__
     #pragma interface
@@ -31,7 +33,7 @@
 /*
  * Define to 1 for Unix[-like] system
  */
-#define wxUSE_UNIX 1
+#define wxUSE_UNIX 0
 
 #undef __UNIX__
 #undef __LINUX__
@@ -51,11 +53,13 @@
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
 #undef __EMX__
+#undef _GNU_SOURCE
 
 #undef __WINDOWS__
 #undef __WIN95__
 #undef __WIN32__
 #undef __GNUWIN32__
+#undef WINVER
 
 /* ------------------------------------------------------------------------ */
 /* compiler options                                                         */
@@ -271,7 +275,7 @@
  */
 #define wxUSE_TOOLBAR 0
 
-#ifdef __WXWINE__
+#if defined(__WXWINE__) || defined(__GNUWIN32__)
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif
@@ -339,7 +343,7 @@
 /*
  * wxLibrary class
  */
-#define wxUSE_DYNLIB_CLASS 1
+#define wxUSE_DYNLIB_CLASS 0
 
 /* ------------------------------------------------------------------------ */
 /* PS options                                                               */
@@ -608,6 +612,9 @@
 /* Define if you have wcslen function  */
 #undef HAVE_WCSLEN
 
+/* define if you have vsscanf function */
+#undef HAVE_VSSCANF
+
 @BOTTOM@
 
-#endif /* __GTKSETUPH__ */
+#endif /* __WX_SETUP_H__ */