From 254e8e291364f143176660ca056846704fb53743 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 24 Sep 2005 11:25:07 +0000
Subject: [PATCH] removed code defining NO_GCC_PRAGMA, we shouldn't need it any
 longer (alternatively, if user code requires it, we should always define it,
 but we still don't need any tests in configure)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 configure        | 182 +----------------------------------------------
 configure.in     |  72 ++-----------------
 docs/changes.txt |   7 ++
 3 files changed, 12 insertions(+), 249 deletions(-)

diff --git a/configure b/configure
index 07919ab2b6..4bbb1e9b93 100755
--- a/configure
+++ b/configure
@@ -45317,189 +45317,9 @@ if test "$wxUSE_OMF" = "yes"; then
     esac
 fi
 
-GCC_PRAGMA_FLAGS=""
-PCH_FLAGS=""
-
 if test $GCC_PCH = 1 ; then
-    PCH_FLAGS="-DWX_PRECOMP"
-    GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-else
-        if test "$GCC" = yes; then
-        echo "$as_me:$LINENO: checking if this GCC version is >= 4.0 and needs -DNO_GCC_PRAGMA" >&5
-echo $ECHO_N "checking if this GCC version is >= 4.0 and needs -DNO_GCC_PRAGMA... $ECHO_C" >&6
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#if (__GNUC__ < 4)
-             Not GCC 4.0 or greater
-             #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-             echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-            case "${host}" in
-                *-*-darwin* )
-                                                            GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-                ;;
-                *-*-mingw32* )
-                                                                                                                                            if test "$wxUSE_STL" = "yes" -o \
-                    "$wxUSE_NO_EXCEPTIONS" != "yes" -o \
-                    "$wxUSE_NO_RTTI" != "yes"; then
-                        echo "$as_me:$LINENO: checking if this MinGW version needs -DNO_GCC_PRAGMA" >&5
-echo $ECHO_N "checking if this MinGW version needs -DNO_GCC_PRAGMA... $ECHO_C" >&6
-                        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
-                             Not GCC 3.2 or greater
-                             #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-                             echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-                    fi
-                    ;;
-                *-pc-os2_emx | *-pc-os2-emx )
-                                                                                if test "$wxUSE_STL" = "yes"; then
-                        echo "$as_me:$LINENO: checking if this gcc version needs -DNO_GCC_PRAGMA" >&5
-echo $ECHO_N "checking if this gcc version needs -DNO_GCC_PRAGMA... $ECHO_C" >&6
-                        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
-                             Not GCC 3.2 or greater
-                             #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-                             echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-                    fi
-                    ;;
-            esac
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
+    CPPFLAGS="-DWX_PRECOMP $CPPFLAGS"
 fi
-CPPFLAGS="$PCH_FLAGS $GCC_PRAGMA_FLAGS $CPPFLAGS"
 
 
 SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
diff --git a/configure.in b/configure.in
index 60b52e4fe0..b0160a125c 100644
--- a/configure.in
+++ b/configure.in
@@ -7038,76 +7038,12 @@ if test "$wxUSE_OMF" = "yes"; then
     esac
 fi
 
-dnl According to Vaclav, if NO_GCC_PRAGMA is used for any reason it needs to
-dnl be in wx-config output.  Not doing so could result in link problems.
-GCC_PRAGMA_FLAGS=""
-PCH_FLAGS=""
-
-dnl Find out if we have to define WX_PRECOMP (and thus NO_GCC_PRAGMA)
+dnl find out if the compiler supports PCH
+dnl
+dnl TODO: this should be in bakefile
 if test $GCC_PCH = 1 ; then
-    PCH_FLAGS="-DWX_PRECOMP"
-    GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-else
-    dnl Find out if we have to define NO_GCC_PRAGMA
-    if test "$GCC" = yes; then
-        AC_MSG_CHECKING([if this GCC version is >= 4.0 and needs -DNO_GCC_PRAGMA])
-        AC_TRY_COMPILE([],
-            [#if (__GNUC__ < 4)
-             Not GCC 4.0 or greater
-             #endif
-            ],
-            [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-             AC_MSG_RESULT([yes])],
-            [AC_MSG_RESULT([no])
-            case "${host}" in
-                *-*-darwin* )
-                    dnl Some Apple's GCC version are broken and can't handle the
-                    dnl pragmas:
-                    GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-                ;;
-                *-*-mingw32* )
-                    dnl MinGW GCC versions > 3.2 have problems with
-                    dnl static member of classes derived from templates
-                    dnl in combination with #pragma interface/implementation
-                    dnl (the test case uses 4 files)
-                    dnl ... and with exceptions handling (undefined symbols needed
-                    dnl to correctly calls dtors when unwinding) as well
-                    if test "$wxUSE_STL" = "yes" -o \
-                    "$wxUSE_NO_EXCEPTIONS" != "yes" -o \
-                    "$wxUSE_NO_RTTI" != "yes"; then
-                        AC_MSG_CHECKING([if this MinGW version needs -DNO_GCC_PRAGMA])
-                        AC_TRY_COMPILE([],
-                            [#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
-                             Not GCC 3.2 or greater
-                             #endif
-                            ],
-                            [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-                             AC_MSG_RESULT([yes])],
-                            [AC_MSG_RESULT([no])])
-                    fi
-                    ;;
-                *-pc-os2_emx | *-pc-os2-emx )
-                    dnl GCC versions ported to OS/2 have similar problems with
-                    dnl static member of classes in combination with STL and
-                    dnl pragma interface/implementation
-                    if test "$wxUSE_STL" = "yes"; then
-                        AC_MSG_CHECKING([if this gcc version needs -DNO_GCC_PRAGMA])
-                        AC_TRY_COMPILE([],
-                            [#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
-                             Not GCC 3.2 or greater
-                             #endif
-                            ],
-                            [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-                             AC_MSG_RESULT([yes])],
-                            [AC_MSG_RESULT([no])])
-                    fi
-                    ;;
-            esac
-dnl  closing bracket of if GCC < 4.0
-        ] ) 
-    fi
+    CPPFLAGS="-DWX_PRECOMP $CPPFLAGS"
 fi
-CPPFLAGS="$PCH_FLAGS $GCC_PRAGMA_FLAGS $CPPFLAGS"
 
 
 dnl for convenience, sort the samples in alphabetical order
diff --git a/docs/changes.txt b/docs/changes.txt
index 4af5d62dff..ea01f0fc6b 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -2,6 +2,13 @@
 wxWidgets Change Log - For more verbose changes, see the manual
 ---------------------------------------------------------------
 
+2.7.0
+-----
+
+Unix:
+
+- NO_GCC_PRAGMA is not used any more, remove checks for it if you used it
+
 2.6.2
 -----
 
-- 
2.45.2