[GRASS-SVN] r44056 - grass/branches/develbranch_6

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-10-27 19:45:38 -0700 (Wed, 27 Oct 2010)
New Revision: 44056

Modified:
   grass/branches/develbranch_6/configure
   grass/branches/develbranch_6/configure.in
Log:
rm references to swig

Modified: grass/branches/develbranch_6/configure
===================================================================
--- grass/branches/develbranch_6/configure	2010-10-27 21:26:49 UTC (rev 44055)
+++ grass/branches/develbranch_6/configure	2010-10-28 02:45:38 UTC (rev 44056)
@@ -16183,45 +16183,6 @@
     done
   fi
 
-  # look for the swig program
-  # Extract the first word of "swig", so it can be a program name with args.
-set dummy swig; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16191: checking for $ac_word" >&5
-
-case "$SWIG" in
-  /*)
-  ac_cv_path_SWIG="$SWIG" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_SWIG="$SWIG" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_SWIG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_SWIG" && ac_cv_path_SWIG="no"
-  ;;
-esac
-SWIG="$ac_cv_path_SWIG"
-if test -n "$SWIG"; then
-  echo "$ac_t""$SWIG" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  if test "$SWIG" = "no" ; then
-    { echo "configure: error: *** couldn't find swig" 1>&2; exit 1; }
-  fi
-
   # check for available OSX archs in Python, assume framework
   if test -n "$MACOSX_ARCHS" ; then
     pylib=`"$PY_CONFIG" --prefix`/Python
@@ -16249,7 +16210,7 @@
 # Enable wxWidgets support (for wxGUI)
 
 echo $ac_n "checking whether to use wxWidgets""... $ac_c" 1>&6
-echo "configure:16253: checking whether to use wxWidgets" >&5
+echo "configure:16214: checking whether to use wxWidgets" >&5
 
 WXVERSION=
 WXWIDGETSCXXFLAGS= 
@@ -16270,7 +16231,7 @@
   # Extract the first word of "wx-config", so it can be a program name with args.
 set dummy wx-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16274: checking for $ac_word" >&5
+echo "configure:16235: checking for $ac_word" >&5
 
 case "$WX_CONFIG" in
   /*)
@@ -16318,7 +16279,7 @@
  REQWX="2.8.1"
 
  echo $ac_n "checking wxWidgets version""... $ac_c" 1>&6
-echo "configure:16322: checking wxWidgets version" >&5
+echo "configure:16283: checking wxWidgets version" >&5
  if WXVERSION=`"$WX_CONFIG" --version`; then
    echo "$ac_t""$WXVERSION" 1>&6
  else
@@ -16341,15 +16302,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:16345: checking for $ac_hdr" >&5
+echo "configure:16306: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 16348 "configure"
+#line 16309 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:16353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16314: \"$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*
@@ -16690,10 +16651,10 @@
 s%@USE_OPENDWG@%$USE_OPENDWG%g
 s%@USE_LARGEFILES@%$USE_LARGEFILES%g
 s%@PY_CONFIG@%$PY_CONFIG%g
-s%@SWIG@%$SWIG%g
 s%@PYTHONINC@%$PYTHONINC%g
 s%@PYTHONCFLAGS@%$PYTHONCFLAGS%g
 s%@PYTHONLDFLAGS@%$PYTHONLDFLAGS%g
+s%@SWIG@%$SWIG%g
 s%@USE_PYTHON@%$USE_PYTHON%g
 s%@MACOSX_ARCHS_PYTHON@%$MACOSX_ARCHS_PYTHON%g
 s%@WX_CONFIG@%$WX_CONFIG%g

Modified: grass/branches/develbranch_6/configure.in
===================================================================
--- grass/branches/develbranch_6/configure.in	2010-10-27 21:26:49 UTC (rev 44055)
+++ grass/branches/develbranch_6/configure.in	2010-10-28 02:45:38 UTC (rev 44056)
@@ -1870,13 +1870,6 @@
     done
   fi
 
-  # look for the swig program
-  AC_PATH_PROG(SWIG, swig, no)
-
-  if test "$SWIG" = "no" ; then
-    AC_MSG_ERROR([*** couldn't find swig])
-  fi
-
   # check for available OSX archs in Python, assume framework
   if test -n "$MACOSX_ARCHS" ; then
     pylib=`"$PY_CONFIG" --prefix`/Python