[GRASS-SVN] r44081 - grass/branches/releasebranch_6_4
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Oct 29 09:09:35 EDT 2010
Author: neteler
Date: 2010-10-29 06:09:35 -0700 (Fri, 29 Oct 2010)
New Revision: 44081
Modified:
grass/branches/releasebranch_6_4/configure
grass/branches/releasebranch_6_4/configure.in
Log:
rm references to swig (backport); quote variables (backport)
Modified: grass/branches/releasebranch_6_4/configure
===================================================================
--- grass/branches/releasebranch_6_4/configure 2010-10-29 09:36:45 UTC (rev 44080)
+++ grass/branches/releasebranch_6_4/configure 2010-10-29 13:09:35 UTC (rev 44081)
@@ -82,8 +82,8 @@
e.g. '--with-gdal=/usr/local/bin/gdal-config')"
ac_help="$ac_help
--with-python[=path/python-config]
- enable support for Python SWIG bindings and wxGUI
- Python extensions (python-config with path, e.g.
+ enable support for wxGUI Python extensions
+ (python-config with path, e.g.
'--with-python=/usr/bin/python2.5-config',
default: no)"
ac_help="$ac_help
@@ -1266,8 +1266,8 @@
# Set GISBASE and GRASS_BIN
-GISBASE=${WINDSTDIR}/dist.${ARCH}
-GRASS_BIN=${DSTDIR}/bin.${ARCH}
+GISBASE="${WINDSTDIR}/dist.${ARCH}"
+GRASS_BIN="${DSTDIR}/bin.${ARCH}"
@@ -1275,10 +1275,10 @@
# Set GRASS_VERSION_*
GRASS_VERSION_FILE=include/VERSION
-GRASS_VERSION_MAJOR=`sed -n 1p ${GRASS_VERSION_FILE}`
-GRASS_VERSION_MINOR=`sed -n 2p ${GRASS_VERSION_FILE}`
-GRASS_VERSION_RELEASE=`sed -n 3p ${GRASS_VERSION_FILE}`
-GRASS_VERSION_DATE=`sed -n 4p ${GRASS_VERSION_FILE}`
+GRASS_VERSION_MAJOR=`sed -n 1p "${GRASS_VERSION_FILE}"`
+GRASS_VERSION_MINOR=`sed -n 2p "${GRASS_VERSION_FILE}"`
+GRASS_VERSION_RELEASE=`sed -n 3p "${GRASS_VERSION_FILE}"`
+GRASS_VERSION_DATE=`sed -n 4p "${GRASS_VERSION_FILE}"`
GRASS_VERSION_NUMBER=`echo ${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.${GRASS_VERSION_RELEASE}`
NAME_VER=`echo ${GRASS_VERSION_NUMBER} | sed 's/\..*//'`
@@ -6051,8 +6051,8 @@
else :
fi
-DBMIEXTRALIB=$LIBS
-LIBS=$ac_save_libs
+DBMIEXTRALIB="$LIBS"
+LIBS="$ac_save_libs"
# Note: -lxdr -liberty -lws2_32 is for MinGW
@@ -9201,7 +9201,7 @@
fi
-LDFLAGS=${ac_save_ldflags}
+LDFLAGS="${ac_save_ldflags}"
fi # $USE_POSTGRES
@@ -11063,7 +11063,7 @@
echo "$ac_t""no" 1>&6
fi
-LDFLAGS=${ac_save_ldflags}
+LDFLAGS="${ac_save_ldflags}"
cat >> confdefs.h <<\EOF
#define OPENGL_X11 1
@@ -11246,7 +11246,7 @@
{ echo "configure: error: *** Unable to locate OpenGL library." 1>&2; exit 1; }
fi
-LDFLAGS=${ac_save_ldflags}
+LDFLAGS="${ac_save_ldflags}"
cat >> confdefs.h <<\EOF
#define OPENGL_AQUA 1
@@ -11420,7 +11420,7 @@
LIBS=${ac_save_libs}
LDFLAGS=${ac_save_ldflags}
-CFLAGS=${ac_save_cflags}
+CFLAGS="${ac_save_cflags}"
OPENGLLIB="$OPENGL_LIB_PATH $OPENGLLIB"
OPENGLULIB="$OPENGL_LIB_PATH $OPENGLULIB"
@@ -11656,7 +11656,7 @@
if test "$tcl_ver" = "$tk_ver" ; then
- tcltk_ver=$tcl_ver
+ tcltk_ver="$tcl_ver"
else
{ echo "configure: error: *** Tcl/Tk version mismatch." 1>&2; exit 1; }
fi
@@ -11664,7 +11664,7 @@
TCL_VERSION="$tcl_ver"
# FreeBSD and CygWin don't have a "dot" between major/minor version number
-tcltk_ver2=`echo $tcltk_ver | sed 's/\.//g'`
+tcltk_ver2=`echo "$tcltk_ver" | sed 's/\.//g'`
# With Tcl/Tk library directory
@@ -12598,7 +12598,7 @@
LIBS=${ac_save_libs}
LDFLAGS=${ac_save_ldflags}
-CFLAGS=${ac_save_cflags}
+CFLAGS="${ac_save_cflags}"
fi
@@ -13081,7 +13081,7 @@
fi
done
-CPPFLAGS=$save_CPPFLAGS
+CPPFLAGS="$save_CPPFLAGS"
ac_save_ldflags="$LDFLAGS"
@@ -13696,7 +13696,7 @@
fi
done
-CPPFLAGS=$save_CPPFLAGS
+CPPFLAGS="$save_CPPFLAGS"
# LAPACK linked to by default?
if test lapack_ok=no; then
@@ -14105,7 +14105,7 @@
fi
# With Cairo includes directory
-
+#FIXME: somehow quote dirs with spaces in $cairo ?
CAIROINC=`pkg-config --cflags $cairo`
@@ -15554,9 +15554,9 @@
#LOC_CHECK_LIBS(ad?.a,adSeekLayer,openDWG,$OPENDWGLIBPATH,OPENDWGLIB,,)
#
#for now hack (but working):
-TRUEOPENDWGLIBPATH=`echo $OPENDWGLIBPATH | cut -b3-`
-adlib=`ls -1 $TRUEOPENDWGLIBPATH/ad?.a | tail -1`
-OPENDWGLIB=$adlib
+TRUEOPENDWGLIBPATH=`echo "$OPENDWGLIBPATH" | cut -b3-`
+adlib=`ls -1 "$TRUEOPENDWGLIBPATH"/ad?.a | tail -1`
+OPENDWGLIB="$adlib"
fi # $USE_OPENDWG
@@ -15891,7 +15891,6 @@
PYTHONINC=
PYTHONCFLAGS=
PYTHONLDFLAGS=
-SWIG=
USE_PYTHON=
MACOSX_ARCHS_PYTHON=
@@ -15907,7 +15906,7 @@
# Extract the first word of "python-config", so it can be a program name with args.
set dummy python-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:15911: checking for $ac_word" >&5
+echo "configure:15910: checking for $ac_word" >&5
case "$PY_CONFIG" in
/*)
@@ -15949,15 +15948,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15953: checking for $ac_hdr" >&5
+echo "configure:15952: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 15956 "configure"
+#line 15955 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15960: \"$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*
@@ -16001,45 +16000,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:16009: 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
@@ -16063,11 +16023,10 @@
-
# Enable wxWidgets support (for wxGUI)
echo $ac_n "checking whether to use wxWidgets""... $ac_c" 1>&6
-echo "configure:16071: checking whether to use wxWidgets" >&5
+echo "configure:16030: checking whether to use wxWidgets" >&5
WXVERSION=
WXWIDGETSCXXFLAGS=
@@ -16088,7 +16047,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:16092: checking for $ac_word" >&5
+echo "configure:16051: checking for $ac_word" >&5
case "$WX_CONFIG" in
/*)
@@ -16136,7 +16095,7 @@
REQWX="2.8.1"
echo $ac_n "checking wxWidgets version""... $ac_c" 1>&6
-echo "configure:16140: checking wxWidgets version" >&5
+echo "configure:16099: checking wxWidgets version" >&5
if WXVERSION=`"$WX_CONFIG" --version`; then
echo "$ac_t""$WXVERSION" 1>&6
else
@@ -16159,15 +16118,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:16163: checking for $ac_hdr" >&5
+echo "configure:16122: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 16166 "configure"
+#line 16125 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:16171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16130: \"$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*
@@ -16241,7 +16200,7 @@
STRIPFLAG=
-GRASS_HOME=${DSTDIR}
+GRASS_HOME="${DSTDIR}"
trap '' 1 2 15
@@ -16504,7 +16463,6 @@
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
Modified: grass/branches/releasebranch_6_4/configure.in
===================================================================
--- grass/branches/releasebranch_6_4/configure.in 2010-10-29 09:36:45 UTC (rev 44080)
+++ grass/branches/releasebranch_6_4/configure.in 2010-10-29 13:09:35 UTC (rev 44081)
@@ -105,8 +105,8 @@
# Set GISBASE and GRASS_BIN
-GISBASE=${WINDSTDIR}/dist.${ARCH}
-GRASS_BIN=${DSTDIR}/bin.${ARCH}
+GISBASE="${WINDSTDIR}/dist.${ARCH}"
+GRASS_BIN="${DSTDIR}/bin.${ARCH}"
AC_SUBST(GISBASE)
AC_SUBST(GRASS_BIN)
@@ -114,10 +114,10 @@
# Set GRASS_VERSION_*
GRASS_VERSION_FILE=include/VERSION
-GRASS_VERSION_MAJOR=`sed -n 1p ${GRASS_VERSION_FILE}`
-GRASS_VERSION_MINOR=`sed -n 2p ${GRASS_VERSION_FILE}`
-GRASS_VERSION_RELEASE=`sed -n 3p ${GRASS_VERSION_FILE}`
-GRASS_VERSION_DATE=`sed -n 4p ${GRASS_VERSION_FILE}`
+GRASS_VERSION_MAJOR=`sed -n 1p "${GRASS_VERSION_FILE}"`
+GRASS_VERSION_MINOR=`sed -n 2p "${GRASS_VERSION_FILE}"`
+GRASS_VERSION_RELEASE=`sed -n 3p "${GRASS_VERSION_FILE}"`
+GRASS_VERSION_DATE=`sed -n 4p "${GRASS_VERSION_FILE}"`
GRASS_VERSION_NUMBER=`echo ${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.${GRASS_VERSION_RELEASE}`
NAME_VER=`echo ${GRASS_VERSION_NUMBER} | sed 's/\..*//'`
changequote(,)
@@ -264,8 +264,8 @@
AC_ARG_WITH(python,
[ --with-python[=path/python-config]
- enable support for Python SWIG bindings and wxGUI
- Python extensions (python-config with path, e.g.
+ enable support for wxGUI Python extensions
+ (python-config with path, e.g.
'--with-python=/usr/bin/python2.5-config',
default: no)],, with_python="no")
@@ -540,8 +540,8 @@
ac_save_libs="$LIBS"
LIBS=""
AC_SEARCH_LIBS(cuserid,[compat])
-DBMIEXTRALIB=$LIBS
-LIBS=$ac_save_libs
+DBMIEXTRALIB="$LIBS"
+LIBS="$ac_save_libs"
AC_SUBST(DBMIEXTRALIB)
# Note: -lxdr -liberty -lws2_32 is for MinGW
@@ -933,7 +933,7 @@
AC_CHECK_LIB(pq,PQcmdTuples, [AC_DEFINE(HAVE_PQCMDTUPLES)], [
], -lcrypt)
])
-LDFLAGS=${ac_save_ldflags}
+LDFLAGS="${ac_save_ldflags}"
fi # $USE_POSTGRES
@@ -1140,7 +1140,7 @@
LDFLAGS="$LDFLAGS $OPENGLLIB"
AC_CHECK_FUNC(glXCreatePbuffer, [AC_DEFINE(HAVE_PBUFFERS)])
AC_CHECK_FUNC(glXCreateGLXPixmap, [AC_DEFINE(HAVE_PIXMAPS)])
-LDFLAGS=${ac_save_ldflags}
+LDFLAGS="${ac_save_ldflags}"
AC_DEFINE(OPENGL_X11)
@@ -1168,7 +1168,7 @@
OPENGL_AQUA=1
],[AC_MSG_ERROR([*** Unable to locate GLU library.])])
],[AC_MSG_ERROR([*** Unable to locate OpenGL library.])])
-LDFLAGS=${ac_save_ldflags}
+LDFLAGS="${ac_save_ldflags}"
AC_DEFINE(OPENGL_AQUA)
@@ -1190,7 +1190,7 @@
CFLAGS="$CFLAGS $OPENGLINC"
LOC_CHECK_LINK(opengl32,[#include <GL/gl.h>],[glEnd();],OpenGL,$OPENGL_LIB_PATH,OPENGLLIB)
LOC_CHECK_LINK(glu32,[#include <GL/glu.h>],[gluNewQuadric();],GLU,$OPENGL_LIB_PATH,OPENGLULIB,$OPENGLLIB)
-CFLAGS=${ac_save_cflags}
+CFLAGS="${ac_save_cflags}"
OPENGLLIB="$OPENGL_LIB_PATH $OPENGLLIB"
OPENGLULIB="$OPENGL_LIB_PATH $OPENGLULIB"
@@ -1236,7 +1236,7 @@
LOC_CHECK_VERSION_STRING(tk.h,TK_VERSION,Tk,tk_ver,$TCLINCDIR $X_CFLAGS,UNKNOWN)
if test "$tcl_ver" = "$tk_ver" ; then
- tcltk_ver=$tcl_ver
+ tcltk_ver="$tcl_ver"
else
AC_MSG_ERROR([*** Tcl/Tk version mismatch.])
fi
@@ -1244,7 +1244,7 @@
TCL_VERSION="$tcl_ver"
# FreeBSD and CygWin don't have a "dot" between major/minor version number
-tcltk_ver2=`echo $tcltk_ver | sed 's/\.//g'`
+tcltk_ver2=`echo "$tcltk_ver" | sed 's/\.//g'`
# With Tcl/Tk library directory
@@ -1345,7 +1345,7 @@
CFLAGS="$CFLAGS $ODBCINC"
LOC_CHECK_LINK(odbc32,[#include <windows.h>
#include <sql.h>],[SQLAllocEnv((SQLHENV *)0);],ODBC,$ODBCLIB,ODBCLIB)
-CFLAGS=${ac_save_cflags}
+CFLAGS="${ac_save_cflags}"
])
])
@@ -1412,7 +1412,7 @@
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$BLASINC $CPPFLAGS"
AC_CHECK_HEADERS(cblas.h)
-CPPFLAGS=$save_CPPFLAGS
+CPPFLAGS="$save_CPPFLAGS"
LOC_CHECK_LIBS(blas,dnrm2_,BLAS,$BLASLIB,BLASLIB,$MATHLIB,,,-lg2c)
@@ -1511,7 +1511,7 @@
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$LAPACKINC $CPPFLAGS"
AC_CHECK_HEADERS(clapack.h)
-CPPFLAGS=$save_CPPFLAGS
+CPPFLAGS="$save_CPPFLAGS"
# LAPACK linked to by default?
if test lapack_ok=no; then
@@ -1589,7 +1589,7 @@
fi
# With Cairo includes directory
-
+#FIXME: somehow quote dirs with spaces in $cairo ?
CAIROINC=`pkg-config --cflags $cairo`
LOC_CHECK_INC_PATH(cairo,cairo,CAIROINC)
@@ -1752,9 +1752,9 @@
#LOC_CHECK_LIBS(ad?.a,adSeekLayer,openDWG,$OPENDWGLIBPATH,OPENDWGLIB,,)
#
#for now hack (but working):
-TRUEOPENDWGLIBPATH=`echo $OPENDWGLIBPATH | cut -b3-`
-adlib=`ls -1 $TRUEOPENDWGLIBPATH/ad?.a | tail -1`
-OPENDWGLIB=$adlib
+TRUEOPENDWGLIBPATH=`echo "$OPENDWGLIBPATH" | cut -b3-`
+adlib=`ls -1 "$TRUEOPENDWGLIBPATH"/ad?.a | tail -1`
+OPENDWGLIB="$adlib"
fi # $USE_OPENDWG
@@ -1791,7 +1791,6 @@
PYTHONINC=
PYTHONCFLAGS=
PYTHONLDFLAGS=
-SWIG=
USE_PYTHON=
MACOSX_ARCHS_PYTHON=
@@ -1826,13 +1825,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
@@ -1853,7 +1845,6 @@
AC_SUBST(PYTHONINC)
AC_SUBST(PYTHONCFLAGS)
AC_SUBST(PYTHONLDFLAGS)
-AC_SUBST(SWIG)
AC_SUBST(USE_PYTHON)
AC_SUBST(MACOSX_ARCHS_PYTHON)
@@ -1957,7 +1948,7 @@
STRIPFLAG=
AC_SUBST(STRIPFLAG)
-GRASS_HOME=${DSTDIR}
+GRASS_HOME="${DSTDIR}"
AC_SUBST(GRASS_HOME)
AC_OUTPUT(include/Make/Grass.make include/Make/Platform.make include/Make/Doxyfile_arch_html include/Make/Doxyfile_arch_latex include/version.h include/winname.h grass.pc)
More information about the grass-commit
mailing list