add except to the samples being built; verify that --enable-exceptions and --enable...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index ace3f1074a6298592de7c68e2e448272be168931..cf3b6f4fb1bc50a2421498e500165c50250ed114 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5614,7 +5614,12 @@ if test "$wxUSE_DRAGIMAGE" = "yes"; then
 fi
 
 if test "$wxUSE_EXCEPTIONS" = "yes"; then
-    AC_DEFINE(wxUSE_EXCEPTIONS)
+    if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
+        AC_MSG_WARN([--enable-exceptions can't be used with --enable-no_exceptions])
+    else
+        AC_DEFINE(wxUSE_EXCEPTIONS)
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS except"
+    fi
 fi
 
 USE_HTML=0