C->C++ conversion

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 94f7a16e151925fabadf9e7d200c4be8f9d36331..d0d06fba2069f0da6e1ce6d8451d36b397e3848f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -56,6 +56,7 @@ dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=5
 WX_RELEASE_NUMBER=2
+WX_SUBRELEASE_NUMBER=3
 
 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
@@ -1353,18 +1354,6 @@ AC_PROG_CXX
 
 AC_LANG_RESTORE
 
-dnl check if compiler includes /usr/local/include in
-dnl default include files search path.
-AC_MSG_CHECKING([for /usr/local/include in default include path])
-GCC_SEARCHES_USR_LOCAL_INCLUDE="no"
-if test "$GCC" = "yes" ; then
-  echo | gcc -v -x c++ -E - 2>&1 | sed -n '/^#include </,$p' | \
-       sed -n '1,/End of search list\./p' | \
-        grep '^ */usr/local/include$' 2>&1 /dev/null \
-  && GCC_SEARCHES_USR_LOCAL_INCLUDE="yes"
-fi
-AC_MSG_RESULT([$GCC_SEARCHES_USR_LOCAL_INCLUDE])
-
 dnl ranlib command
 dnl   defines RANLIB with the appropriate command
 AC_PROG_RANLIB
@@ -5784,6 +5773,7 @@ fi
 
 if test "$wxUSE_SPLASH" = "yes"; then
     AC_DEFINE(wxUSE_SPLASH)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splash"
 fi
 
 if test "$wxUSE_STARTUP_TIPS" = "yes"; then
@@ -6148,6 +6138,7 @@ dnl global options
 AC_SUBST(WX_MAJOR_VERSION_NUMBER)
 AC_SUBST(WX_MINOR_VERSION_NUMBER)
 AC_SUBST(WX_RELEASE_NUMBER)
+AC_SUBST(WX_SUBRELEASE_NUMBER)
 AC_SUBST(WX_LIBRARY_NAME_STATIC)
 AC_SUBST(WX_LIBRARY_NAME_SHARED)
 AC_SUBST(WX_LIBRARY_BASENAME_NOGUI)
@@ -6246,7 +6237,6 @@ AC_SUBST(MACRESWXCONFIG)
 
 dnl other tools
 AC_SUBST(GCC)
-AC_SUBST(GCC_SEARCHES_USR_LOCAL_INCLUDE)
 AC_SUBST(DLLTOOL)
 AC_SUBST(AS)
 AC_SUBST(NM)
@@ -6308,12 +6298,12 @@ AC_CONFIG_COMMANDS([default],
                 ( cd lib/wx/config ; 
                   rm -f ${TOOLCHAIN_NAME}
                   ${LN_S} ${WXCONFIG_DATA_FILE} ${TOOLCHAIN_NAME} )
-                rm -f wx${TOOLCHAIN_NAME}-config
-                ${LN_S} wx-config wx${TOOLCHAIN_NAME}-config
             fi
             if test -f wx-config-wrapper; then
                 chmod +x wx-config-wrapper
                 mv -f wx-config-wrapper wx-config
+                rm -f wx${TOOLCHAIN_NAME}-config
+                ${LN_S} wx-config wx${TOOLCHAIN_NAME}-config
             fi
           ],
           [