wxMac (classic & carbon) support added

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 3150c93fba9c7df74e2e90f53d9b73dfb9e32a60..76b1a6ee3a9311823399a2d8c65d45402162e545 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION($Id$)dnl
 
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION($Id$)dnl
 

+AC_PREREQ(2.57)
+

 dnl ---------------------------------------------------------------------------
 dnl
 dnl Top-level configure.in for wxWindows by Robert Roebling, Phil Blecker,
 dnl ---------------------------------------------------------------------------
 dnl
 dnl Top-level configure.in for wxWindows by Robert Roebling, Phil Blecker,


@@ -15,11 +17,16 @@ dnl ---------------------------------------------------------------------------
 dnl initialization
 dnl ---------------------------------------------------------------------------
 
 dnl initialization
 dnl ---------------------------------------------------------------------------
 

-dnl the file passed to AC_INIT should be specific to our package
-AC_INIT([wx-config.in])
+AC_INIT([wxWindows], [2.5.0], [wx-dev@lists.wxwindows.org])
+
+dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
+AC_CONFIG_SRCDIR([wx-config.in])

 
 dnl sets build, host, target variables and the same with _alias
 
 dnl sets build, host, target variables and the same with _alias

-AC_CANONICAL_SYSTEM
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+

 
 dnl When making releases do:
 dnl
 
 dnl When making releases do:
 dnl


@@ -329,7 +336,6 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes

-  DEFAULT_wxUSE_SONAME=no

   DEFAULT_wxUSE_OPTIMISE=no
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
   DEFAULT_wxUSE_OPTIMISE=no
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no


@@ -494,6 +500,8 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_XPM=no
   DEFAULT_wxUSE_ICO_CUR=no
   DEFAULT_wxUSE_ACCESSIBILITY=no
   DEFAULT_wxUSE_XPM=no
   DEFAULT_wxUSE_ICO_CUR=no
   DEFAULT_wxUSE_ACCESSIBILITY=no

+  
+  DEFAULT_wxUSE_MONOLITHIC=yes

 else
   DEFAULT_wxUSE_UNIVERSAL=no
 
 else
   DEFAULT_wxUSE_UNIVERSAL=no
 


@@ -502,7 +510,6 @@ else
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes

-  DEFAULT_wxUSE_SONAME=no

   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no


@@ -666,6 +673,8 @@ else
   DEFAULT_wxUSE_XPM=yes
   DEFAULT_wxUSE_ICO_CUR=yes
   DEFAULT_wxUSE_ACCESSIBILITY=no
   DEFAULT_wxUSE_XPM=yes
   DEFAULT_wxUSE_ICO_CUR=yes
   DEFAULT_wxUSE_ACCESSIBILITY=no

+  
+  DEFAULT_wxUSE_MONOLITHIC=yes

 fi
 
 dnl WX_ARG_WITH should be used to select whether an external package will be
 fi
 
 dnl WX_ARG_WITH should be used to select whether an external package will be


@@ -696,6 +705,7 @@ dnl     doing
 dnl ---------------------------------------------------------------------------
 
 WX_ARG_ENABLE(gui,         [  --enable-gui            use GUI classes], wxUSE_GUI)
 dnl ---------------------------------------------------------------------------
 
 WX_ARG_ENABLE(gui,         [  --enable-gui            use GUI classes], wxUSE_GUI)

+WX_ARG_ENABLE(monolithic,  [  --disable-monolithic    don't build wxWindows as single library], wxUSE_MONOLITHIC)

 
 if test "$wxUSE_GUI" = "yes"; then
 
 
 if test "$wxUSE_GUI" = "yes"; then
 


@@ -732,7 +742,6 @@ dnl compile options
 dnl ---------------------------------------------------------------------------
 
 WX_ARG_ENABLE(shared,      [  --enable-shared         create shared library code], wxUSE_SHARED)
 dnl ---------------------------------------------------------------------------
 
 WX_ARG_ENABLE(shared,      [  --enable-shared         create shared library code], wxUSE_SHARED)

-WX_ARG_ENABLE(soname,      [  --enable-soname         set the DT_SONAME field in ELF shared libraries], wxUSE_SONAME)

 WX_ARG_ENABLE(optimise,    [  --enable-optimise       create optimised code], wxUSE_OPTIMISE)
 WX_ARG_ENABLE(debug,       [  --enable-debug          same as debug_flag and debug_info], wxUSE_DEBUG)
 
 WX_ARG_ENABLE(optimise,    [  --enable-optimise       create optimised code], wxUSE_OPTIMISE)
 WX_ARG_ENABLE(debug,       [  --enable-debug          same as debug_flag and debug_info], wxUSE_DEBUG)
 


@@ -1177,7 +1186,11 @@ if test "$wxUSE_GUI" = "yes"; then
       fi
     done
 else
       fi
     done
 else

-    AC_MSG_RESULT(base ($host_alias hosted) only)
+    if test "x$host_alias" != "x"; then
+        AC_MSG_RESULT(base ($host_alias hosted) only)
+    else
+        AC_MSG_RESULT(base only)
+    fi

 fi
 
 dnl ---------------------------------------------------------------------------
 fi
 
 dnl ---------------------------------------------------------------------------


@@ -1441,10 +1454,24 @@ dnl ------------------------------------------------------------------------
 dnl test for strings.h needed under AIX, but do not check for it wxMac as
 dnl it exists but is only a simple redirection to string.h and it is in
 dnl conflict with Strings.h in FlatCarbon headers
 dnl test for strings.h needed under AIX, but do not check for it wxMac as
 dnl it exists but is only a simple redirection to string.h and it is in
 dnl conflict with Strings.h in FlatCarbon headers

-if test "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
-  dnl defines HAVE_STRINGS_H
-  AC_CHECK_HEADERS(strings.h)
+dnl
+dnl Autoconf 2.5 tends to check for strings.h on its own, so avoiding the 
+dnl test (as the current configure script does) is not possible.  Instead, 
+dnl you must remind autoconf that strings.h is NOT valid.  The autoconf 
+dnl test succeeds because there is a strings.h file that simply includes 
+dnl string.h.  Unfortunately, there is also a strings.h as part of the 
+dnl FlatCarbon headers.                                    -- David Elliott
+if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
+    AC_CACHE_CHECK([for strings.h], ac_cv_header_strings_h, 
+                   [ac_cv_header_strings_h=no])
+    if test "$ac_cv_header_strings_h" = "no"; then
+        AC_MSG_RESULT([forced no into cache])
+    else
+        AC_MSG_WARN([strings.h is not compatible with Mac OS X])
+    fi

 fi
 fi

+dnl defines HAVE_STRINGS_H
+AC_CHECK_HEADERS(strings.h)

 
 dnl defines HAVE_STDLIB_H
 AC_CHECK_HEADERS(stdlib.h)
 
 dnl defines HAVE_STDLIB_H
 AC_CHECK_HEADERS(stdlib.h)


@@ -2075,7 +2102,7 @@ if test "$USE_WIN32" = 1 ; then
 
     dnl --- FIXME: This is still a somewhat random list of libs,
     dnl ---        some of them should probably be included conditionally.
 
     dnl --- FIXME: This is still a somewhat random list of libs,
     dnl ---        some of them should probably be included conditionally.

-    LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
+    LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"

 
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"
 
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"


@@ -2084,7 +2111,7 @@ if test "$USE_WIN32" = 1 ; then
     case "${host}" in
         *-*-cygwin* )
             dnl Cygwin doesn't include these by default
     case "${host}" in
         *-*-cygwin* )
             dnl Cygwin doesn't include these by default

-            LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32"
+            LIBS="$LIBS -lkernel32 -luser32"

             TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
     esac
 
             TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
     esac
 


@@ -2127,10 +2154,6 @@ if test "$wxUSE_GUI" = "yes"; then
     if test "$wxUSE_MSW" = 1 ; then
         TOOLKIT=MSW
         GUIDIST=MSW_DIST
     if test "$wxUSE_MSW" = 1 ; then
         TOOLKIT=MSW
         GUIDIST=MSW_DIST

-
-        dnl -mwindows causes a heap of other default gui libs to be linked in.
-        dnl All platforms need this, except maybe cygwin
-        LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows"

     fi
 
     if test "$wxUSE_GTK" = 1; then
     fi
 
     if test "$wxUSE_GTK" = 1; then


@@ -2819,6 +2842,19 @@ if test "$wxUSE_OPENGL" = "yes"; then
     elif test "$wxUSE_MSW" = 1; then
         OPENGL_LIBS="-lopengl32 -lglu32"
     else
     elif test "$wxUSE_MSW" = 1; then
         OPENGL_LIBS="-lopengl32 -lglu32"
     else

+        dnl David Elliott: Without this snippet AC_CHECK_HEADER fails to find
+        dnl GL/gl.h on Mac OS X where it is located in
+        dnl /usr/X11R6/include/GL/gl.h:
+
+        WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, GL/gl.h)
+        if test "$ac_find_includes" != "" ; then
+            AC_MSG_RESULT(found in $ac_find_includes)
+            set -x
+            WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
+            CPPFLAGS="$CPPFLAGS$ac_path_to_include"
+            set +x
+        fi
+

         AC_CHECK_HEADER(GL/gl.h,
             [
                 found_gl=0
         AC_CHECK_HEADER(GL/gl.h,
             [
                 found_gl=0


@@ -3017,7 +3053,7 @@ if test "$wxUSE_SHARED" = "yes"; then
 
 
     dnl use versioned symbols if available on the platform
 
 
     dnl use versioned symbols if available on the platform

-    WX_VERSIONED_SYMBOLS([\$(top_builddir)/version-script])
+    WX_VERSIONED_SYMBOLS([\$(top_builddir)version-script])

 
     dnl the command to use for creating the shared library
     SHARED_LD="${CXX} -shared -o"
 
     dnl the command to use for creating the shared library
     SHARED_LD="${CXX} -shared -o"


@@ -3064,13 +3100,7 @@ if test "$wxUSE_SHARED" = "yes"; then
             fi
         fi
 
             fi
         fi
 

-        if test "$wxUSE_SONAME" = "yes" ; then
-            SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}"
-            SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
-            dnl substitute this in makelib.env for the contrib libs
-            WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
-        fi
-        SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)/lib"
+        SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"

       ;;
 
       *-*-solaris2* )
       ;;
 
       *-*-solaris2* )


@@ -3088,7 +3118,7 @@ if test "$wxUSE_SHARED" = "yes"; then
                 [],[],
                 [
                     AC_MSG_RESULT([yes])
                 [],[],
                 [
                     AC_MSG_RESULT([yes])

-                    SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)/lib"
+                    SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"

                 ],
                 [
                     AC_MSG_RESULT([no])
                 ],
                 [
                     AC_MSG_RESULT([no])


@@ -3098,7 +3128,7 @@ if test "$wxUSE_SHARED" = "yes"; then
                         [],[],
                         [
                              AC_MSG_RESULT([yes])
                         [],[],
                         [
                              AC_MSG_RESULT([yes])

-                             SAMPLES_RPATH_FLAG="-Wl,-R,\$(top_builddir)/lib"],
+                             SAMPLES_RPATH_FLAG="-Wl,-R,\$(top_builddir)lib"],

                         [
                             AC_MSG_RESULT([no])
                         ])                    
                         [
                             AC_MSG_RESULT([no])
                         ])                    


@@ -3107,9 +3137,7 @@ if test "$wxUSE_SHARED" = "yes"; then
         else
             SHARED_LD="${CXX} -G -o"
             PIC_FLAG="-KPIC"
         else
             SHARED_LD="${CXX} -G -o"
             PIC_FLAG="-KPIC"

-            SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
-            SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED_GL}"
-            SAMPLES_RPATH_FLAG="-R\$(top_builddir)/lib"
+            SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib"

         fi
       ;;
 
         fi
       ;;
 


@@ -3125,11 +3153,6 @@ if test "$wxUSE_SHARED" = "yes"; then
         dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
         SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
         PIC_FLAG="-dynamic -fPIC"
         dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
         SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
         PIC_FLAG="-dynamic -fPIC"

-        dnl library installation base name and wxMac resources file base name
-        dnl must be identical in order for the resource file to be found at
-        dnl run time in src/mac/app.cpp
-        SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}"
-        SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}"

       ;;
 
       *-*-aix* )
       ;;
 
       *-*-aix* )


@@ -3236,7 +3259,7 @@ MACSETFILE="@#"
 MACRESWXCONFIG="#"
 if test "$wxUSE_MAC" = 1; then
     dnl add the resources target for wxMac
 MACRESWXCONFIG="#"
 if test "$wxUSE_MAC" = 1; then
     dnl add the resources target for wxMac

-    LIBWXMACRES="\$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
+    LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}"

     WX_ALL="${WX_ALL} ${LIBWXMACRES}"
     WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
     AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
     WX_ALL="${WX_ALL} ${LIBWXMACRES}"
     WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
     AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)


@@ -3706,6 +3729,20 @@ fi
 fi
 dnl if !MSW
 
 fi
 dnl if !MSW
 

+
+dnl ------------------------------------------
+dnl Checks specific to contrib libs (MMedia)
+dnl ------------------------------------------
+
+dnl Check for ESD:
+ESD_LINK=
+AC_CHECK_HEADER([esd.h], [
+  AC_CHECK_LIB(esd, esd_close, [
+    ESD_LINK="-lesd"
+  ])
+])
+
+

 dnl ===========================================================================
 dnl Now we have all the info we need - use it!
 dnl ===========================================================================
 dnl ===========================================================================
 dnl Now we have all the info we need - use it!
 dnl ===========================================================================


@@ -5420,7 +5457,7 @@ fi
 AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, "$wxPREFIX")
 
 dnl define the variables used in wx-config
 AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, "$wxPREFIX")
 
 dnl define the variables used in wx-config

-top_builddir=`pwd`
+top_builddir_wxconfig=`pwd`

 
 dnl ---------------------------------------------------------------------------
 dnl Output the makefiles and such from the results found above
 
 dnl ---------------------------------------------------------------------------
 dnl Output the makefiles and such from the results found above


@@ -5497,6 +5534,10 @@ if test "$wxUSE_GUI" = "yes"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
                      drawing dynamic erase event exec font image \
                      minimal propsize rotate shaped widgets"
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
                      drawing dynamic erase event exec font image \
                      minimal propsize rotate shaped widgets"

+
+    if test "$wxUSE_MONOLITHIC" != "yes"; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
+    fi

 else
     SAMPLES_SUBDIRS="console"
 fi
 else
     SAMPLES_SUBDIRS="console"
 fi


@@ -5509,11 +5550,29 @@ dnl and other stuff for the built in libraries should come first to avoid
 dnl including the system headers with the same name (it is particularly
 dnl important for zlib because XFree 4.2.0 has its own, horribly old and
 dnl incompatible, zlib.h) and the wxWindows headers should come first anyhow
 dnl including the system headers with the same name (it is particularly
 dnl important for zlib because XFree 4.2.0 has its own, horribly old and
 dnl incompatible, zlib.h) and the wxWindows headers should come first anyhow

-INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} \
+INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_NAME} \

 -I\${top_srcdir}/include \
 $REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
 $TOOLKIT_INCLUDE"
 
 -I\${top_srcdir}/include \
 $REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
 $TOOLKIT_INCLUDE"
 

+dnl C/C++ compiler options used to compile wxWindows
+if test "$GXX" = yes ; then
+    dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
+    CXXWARNINGS="-Wall"
+    dnl should enable this one day...
+    dnl CXXWARNINGS="-Wall -Werror"
+fi
+
+EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
+
+dnl remove the extra white space from the cc/c++/ld options
+CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
+CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
+CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
+LIBS=`echo $LIBS | sed 's/ \+/ /g'`
+
+LDFLAGS="$LDFLAGS $PROFILE"
+

 dnl wxGTK does not need TOOLKIT includes in wx-config
 if test "$wxUSE_GTK" = 1; then
     WXCONFIG_INCLUDE=
 dnl wxGTK does not need TOOLKIT includes in wx-config
 if test "$wxUSE_GTK" = 1; then
     WXCONFIG_INCLUDE=


@@ -5536,8 +5595,17 @@ AC_SUBST(wxUSE_LIBTIFF)
 
 EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
 
 
 EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
 

-dnl FIXME -- must use configure option!
-MONOLITHIC=1
+if test $wxUSE_MONOLITHIC = "yes" ; then
+    MONOLITHIC=1
+else
+    MONOLITHIC=0
+fi
+
+dnl FIXME -- make configurable!
+VENDOR="custom"
+OFFICIAL_BUILD=0
+AC_SUBST(VENDOR)
+AC_SUBST(OFFICIAL_BUILD)

 
 AC_SUBST(WXUNIV)
 AC_SUBST(MONOLITHIC)
 
 AC_SUBST(WXUNIV)
 AC_SUBST(MONOLITHIC)


@@ -5552,23 +5620,7 @@ AC_SUBST(SAMPLES_RPATH_FLAG)
 
 AC_BAKEFILE
 
 
 AC_BAKEFILE
 

-dnl C/C++ compiler options used to compile wxWindows
-if test "$GXX" = yes ; then
-    dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
-    CXXWARNINGS="-Wall"
-    dnl should enable this one day...
-    dnl CXXWARNINGS="-Wall -Werror"
-fi

 
 

-EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
-
-dnl remove the extra white space from the cc/c++/ld options
-CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
-CFLAGS=`echo $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
-CXXFLAGS=`echo $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
-LIBS=`echo $LIBS | sed 's/ \+/ /g'`
-
-LDFLAGS="$LDFLAGS $PROFILE"

 
 dnl for convenience, sort the samples in alphabetical order
 dnl
 
 dnl for convenience, sort the samples in alphabetical order
 dnl


@@ -5610,12 +5662,7 @@ AC_SUBST(WX_ALL_INSTALLED)
 
 AC_SUBST(SHARED_LD)
 AC_SUBST(PIC_FLAG)
 
 AC_SUBST(SHARED_LD)
 AC_SUBST(PIC_FLAG)

-AC_SUBST(CODE_GEN_FLAGS)
-AC_SUBST(CODE_GEN_FLAGS_CXX)

 
 

-AC_SUBST(SONAME_FLAGS)
-AC_SUBST(SONAME_FLAGS_GL)
-AC_SUBST(WX_TARGET_LIBRARY_SONAME)

 AC_SUBST(WX_TARGET_LIBRARY_TYPE)
 
 AC_SUBST(STATIC_FLAG)
 AC_SUBST(WX_TARGET_LIBRARY_TYPE)
 
 AC_SUBST(STATIC_FLAG)


@@ -5635,7 +5682,7 @@ AC_SUBST(TOOLCHAIN_DEFS)
 AC_SUBST(TOOLCHAIN_DLL_DEFS)
 
 dnl wx-config options
 AC_SUBST(TOOLCHAIN_DLL_DEFS)
 
 dnl wx-config options

-AC_SUBST(top_builddir)
+AC_SUBST(top_builddir_wxconfig)

 AC_SUBST(host_alias)
 AC_SUBST(cross_compiling)
 AC_SUBST(WXCONFIG_LIBS)
 AC_SUBST(host_alias)
 AC_SUBST(cross_compiling)
 AC_SUBST(WXCONFIG_LIBS)


@@ -5645,6 +5692,8 @@ AC_SUBST(WXCONFIG_LIBS_STATIC_GL)
 AC_SUBST(WXCONFIG_INCLUDE)
 AC_SUBST(WXCONFIG_RPATH)
 AC_SUBST(WX_LARGEFILE_FLAGS)
 AC_SUBST(WXCONFIG_INCLUDE)
 AC_SUBST(WXCONFIG_RPATH)
 AC_SUBST(WX_LARGEFILE_FLAGS)

+AC_SUBST(CODE_GEN_FLAGS)
+AC_SUBST(CODE_GEN_FLAGS_CXX)

 
 dnl the list of files to compile/install
 AC_SUBST(ALL_OBJECTS)
 
 dnl the list of files to compile/install
 AC_SUBST(ALL_OBJECTS)


@@ -5693,6 +5742,10 @@ AC_SUBST(MAKEINFO)
 AC_SUBST(INSTALL_LIBRARY)
 AC_SUBST(INSTALL_DIR)
 
 AC_SUBST(INSTALL_LIBRARY)
 AC_SUBST(INSTALL_DIR)
 

+dnl contrib tests results:
+AC_SUBST(ESD_LINK)
+
+

 dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
 dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am
 dnl - and we do use it)
 dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
 dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am
 dnl - and we do use it)


@@ -5703,48 +5756,18 @@ if test -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h; then
     mv -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h setup.h
 fi
 
     mv -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h setup.h
 fi
 

-AC_CONFIG_HEADER(setup.h:setup.h.in)
-
-dnl we need to pass SAMPLES_SUBDIRS (and some other) to the configure in
-dnl samples and the only way to do it is to use the environment (another
-dnl idea could have been to use the cache but this wouldn't work when
-dnl configure doesn't use cache at all which is the default with autoconf 2.50)
-wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
-wx_cv_if_gnu_make=$IF_GNU_MAKE
-wx_cv_path_ifs=$PATH_IFS
-wx_cv_program_ext=$PROGRAM_EXT
-wx_cv_target_library=$WX_TARGET_LIBRARY
-wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
-wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
-wx_cv_library_basename=${WX_LIBRARY_BASENAME}
-wx_cv_release=${WX_RELEASE}
-wx_cv_current=${WX_CURRENT}
-wx_cv_revision=${WX_REVISION}
-wx_cv_age=${WX_AGE}
-wx_cv_use_gui=${USE_GUI}
-wx_cv_use_resources=${wxUSE_RESOURCES}
-export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
-       wx_cv_path_ifs wx_cv_program_ext \
-       wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \
-       wx_cv_library_basename \
-       wx_cv_release wx_cv_current wx_cv_revision wx_cv_age \
-       wx_cv_use_gui wx_cv_use_resources \
-       CFLAGS LDFLAGS CXXFLAGS CPPFLAGS \
-       top_builddir USE_GUI MONOLITHIC \
-       wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG \
-       wxUSE_LIBTIFF EXTRALIBS UNICODE BUILD SHARED TOOLKIT TOOLKIT_LOWERCASE \
-       TOOLKIT_VERSION SAMPLES_RPATH_FLAG WXUNIV
-
-AC_CONFIG_SUBDIRS(demos samples utils contrib)
+AC_CONFIG_HEADERS([setup.h])

 
 dnl create each of the files in the space separated list from the file.in
 dnl (the original file name may be overriden by appending another name after a
 dnl colon)
 
 dnl create each of the files in the space separated list from the file.in
 dnl (the original file name may be overriden by appending another name after a
 dnl colon)

-AC_OUTPUT([
+AC_CONFIG_FILES([

             wx-config
             version-script
             Makefile
             wx-config
             version-script
             Makefile

-          ],
+          ])
+
+AC_CONFIG_COMMANDS([default],

           [
             dnl This test is required to make the following idempotent.
             dnl Otherwise running config.status or rerunning configure
           [
             dnl This test is required to make the following idempotent.
             dnl Otherwise running config.status or rerunning configure


@@ -5784,11 +5807,57 @@ AC_OUTPUT([
           ]
          )
 
           ]
          )
 

+
+dnl Configure samples, contrib etc. directories, but only if they are present:
+if test "$wxUSE_GUI" = "yes"; then
+    SUBDIRS="samples demos utils contrib"
+else dnl we build wxBase only
+    dnl there are no wxBase programs in contrib nor demos
+    SUBDIRS="samples utils"
+fi
+
+for subdir in `echo $SUBDIRS`; do
+    if test -d ${srcdir}/${subdir} ; then
+        if test "$wxUSE_GUI" = "yes"; then
+            if test ${subdir} = "samples"; then
+                dnl only take those samples which compile in the current
+                dnl configuration and which exist
+                for sample in `echo $SAMPLES_SUBDIRS`; do
+                    if test -d $srcdir/samples/$sample; then
+                        makefiles="samples/$sample/Makefile.in $makefiles"
+                    fi
+                done
+            else dnl assume that everything compiles for utils &c
+                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
+            fi
+        else dnl we build wxBase only
+            dnl don't take all samples/utils, just those which build with
+            dnl wxBase
+            if test ${subdir} = "samples"; then
+                makefiles="samples/console/Makefile.in"
+            else dnl utils
+                makefiles="utils/HelpGen/Makefile.in \
+                           utils/HelpGen/src/Makefile.in \
+                           utils/makegen/Makefile.in"
+            fi
+        fi
+
+        for mkin in $makefiles ; do
+            mk=`echo $mkin | sed 's/Makefile\.in/Makefile/g'`
+            AC_CONFIG_FILES([$mk])
+        done
+    fi
+done
+
+
+AC_OUTPUT
+

 dnl report on what we decided to do
 echo
 echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
 echo ""
 echo "  Which GUI toolkit should wxWindows use?                 ${TOOLKIT:-base only}"
 dnl report on what we decided to do
 echo
 echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
 echo ""
 echo "  Which GUI toolkit should wxWindows use?                 ${TOOLKIT:-base only}"

+echo "  Should wxWindows be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"

 
 echo "  Should wxWindows be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
 echo "  Should wxWindows be linked as a shared library?         ${wxUSE_SHARED:-no}"
 
 echo "  Should wxWindows be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
 echo "  Should wxWindows be linked as a shared library?         ${wxUSE_SHARED:-no}"