[GRASS-SVN] r35583 - grass/branches/releasebranch_6_4

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-01-24 15:58:16 -0500 (Sat, 24 Jan 2009)
New Revision: 35583

Modified:
   grass/branches/releasebranch_6_4/configure
   grass/branches/releasebranch_6_4/configure.in
Log:
configure: remove check for wx/wxPython/pseudodc.h, local copy of
pseudodc.h introduced in r35537
          (merge from trunk, r35556)


Modified: grass/branches/releasebranch_6_4/configure
===================================================================
--- grass/branches/releasebranch_6_4/configure	2009-01-24 20:53:44 UTC (rev 35582)
+++ grass/branches/releasebranch_6_4/configure	2009-01-24 20:58:16 UTC (rev 35583)
@@ -15833,51 +15833,7 @@
 
 CPPFLAGS=$ac_save_cppflags
  
- 
-ac_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$WXWIDGETSCPPFLAGS $CPPFLAGS"
-for ac_hdr in wx/wxPython/pseudodc.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15844: checking for $ac_hdr" >&5
 
-cat > conftest.$ac_ext <<EOF
-#line 15847 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-{ echo "configure: error: *** Unable to locate wxWidgets includes." 1>&2; exit 1; }
-
-fi
-done
-
-CPPFLAGS=$ac_save_cppflags
- 
-
  # With wxWidgets library directory 
 
  WXWIDGETSLIB=`"$WX_CONFIG" --libs`

Modified: grass/branches/releasebranch_6_4/configure.in
===================================================================
--- grass/branches/releasebranch_6_4/configure.in	2009-01-24 20:53:44 UTC (rev 35582)
+++ grass/branches/releasebranch_6_4/configure.in	2009-01-24 20:58:16 UTC (rev 35583)
@@ -1771,7 +1771,6 @@
  WXWIDGETSCPPFLAGS=`"$WX_CONFIG" --cppflags`
 
  LOC_CHECK_INCLUDES(wx/wxprec.h,wxWidgets,$WXWIDGETSCPPFLAGS) 
- LOC_CHECK_INCLUDES(wx/wxPython/pseudodc.h,wxWidgets,$WXWIDGETSCPPFLAGS) 
 
  # With wxWidgets library directory