[GRASS-SVN] r37062 - grass/branches/releasebranch_6_4
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat May 9 05:47:56 EDT 2009
Author: martinl
Date: 2009-05-09 05:47:56 -0400 (Sat, 09 May 2009)
New Revision: 37062
Modified:
grass/branches/releasebranch_6_4/configure
grass/branches/releasebranch_6_4/configure.in
Log:
make checking python-config optional
(merged from trunk, r37060)
Modified: grass/branches/releasebranch_6_4/configure
===================================================================
--- grass/branches/releasebranch_6_4/configure 2009-05-09 09:26:33 UTC (rev 37061)
+++ grass/branches/releasebranch_6_4/configure 2009-05-09 09:47:56 UTC (rev 37062)
@@ -72,7 +72,7 @@
--with-gdal[=path/gdal-config] enable GDAL/OGR support (gdal-config with path, \
e.g. '--with-gdal=/usr/local/bin/gdal-config')"
ac_help="$ac_help
- --with-python[=path/python-config] enable support for Python SWIG bindings \
+ --with-python[=path/python-config] enable support for Python SWIG bindings and wxGUI Python extensions \
(python-config with path, e.g. '--with-python=/usr/bin/python2.5-config', \
default: no)"
ac_help="$ac_help
@@ -15761,29 +15761,26 @@
fi
- if test "$PY_CONFIG" = "no" ; then
- { echo "configure: error: *** couldn't find python-config" 1>&2; exit 1; }
- fi
+ if test "$PY_CONFIG" != "no" ; then
+ # With Python includes directory
- # With Python includes directory
-
- PYTHONINC=`"$PY_CONFIG" --includes`
-
+ PYTHONINC=`"$PY_CONFIG" --includes`
+
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$PYTHONINC $CPPFLAGS"
for ac_hdr in Python.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15779: checking for $ac_hdr" >&5
+echo "configure:15776: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 15782 "configure"
+#line 15779 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15784: \"$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*
@@ -15813,17 +15810,18 @@
CPPFLAGS=$ac_save_cppflags
- PYTHONCFLAGS=`"$PY_CONFIG" --cflags`
+ PYTHONCFLAGS=`"$PY_CONFIG" --cflags`
- # With Python library directory
+ # With Python library directory
- PYTHONLDFLAGS=`"$PY_CONFIG" --ldflags`
+ PYTHONLDFLAGS=`"$PY_CONFIG" --ldflags`
+ 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:15827: checking for $ac_word" >&5
+echo "configure:15825: checking for $ac_word" >&5
case "$SWIG" in
/*)
@@ -15869,7 +15867,7 @@
# Enable wxWidgets support (for wxGUI)
echo $ac_n "checking whether to use wxWidgets""... $ac_c" 1>&6
-echo "configure:15873: checking whether to use wxWidgets" >&5
+echo "configure:15871: checking whether to use wxWidgets" >&5
WXVERSION=
WXWIDGETSCXXFLAGS=
@@ -15889,7 +15887,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:15893: checking for $ac_word" >&5
+echo "configure:15891: checking for $ac_word" >&5
case "$WX_CONFIG" in
/*)
@@ -15937,7 +15935,7 @@
REQWX="2.8.1"
echo $ac_n "checking wxWidgets version""... $ac_c" 1>&6
-echo "configure:15941: checking wxWidgets version" >&5
+echo "configure:15939: checking wxWidgets version" >&5
if WXVERSION=`"$WX_CONFIG" --version`; then
echo "$ac_t""$WXVERSION" 1>&6
else
@@ -15960,15 +15958,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15964: checking for $ac_hdr" >&5
+echo "configure:15962: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 15967 "configure"
+#line 15965 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15970: \"$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*
Modified: grass/branches/releasebranch_6_4/configure.in
===================================================================
--- grass/branches/releasebranch_6_4/configure.in 2009-05-09 09:26:33 UTC (rev 37061)
+++ grass/branches/releasebranch_6_4/configure.in 2009-05-09 09:47:56 UTC (rev 37062)
@@ -204,7 +204,7 @@
e.g. '--with-gdal=/usr/local/bin/gdal-config')])
AC_ARG_WITH(python,
-[ --with-python[=path/python-config] enable support for Python SWIG bindings \
+[ --with-python[=path/python-config] enable support for Python SWIG bindings and wxGUI Python extensions \
(python-config with path, e.g. '--with-python=/usr/bin/python2.5-config', \
default: no)],, with_python="no")
@@ -1704,21 +1704,19 @@
AC_PATH_PROG(PY_CONFIG, python-config, no)
- if test "$PY_CONFIG" = "no" ; then
- AC_MSG_ERROR([*** couldn't find python-config])
- fi
+ if test "$PY_CONFIG" != "no" ; then
+ # With Python includes directory
- # With Python includes directory
+ PYTHONINC=`"$PY_CONFIG" --includes`
+ LOC_CHECK_INCLUDES(Python.h,Python,$PYTHONINC)
- PYTHONINC=`"$PY_CONFIG" --includes`
- LOC_CHECK_INCLUDES(Python.h,Python,$PYTHONINC)
+ PYTHONCFLAGS=`"$PY_CONFIG" --cflags`
- PYTHONCFLAGS=`"$PY_CONFIG" --cflags`
+ # With Python library directory
- # With Python library directory
+ PYTHONLDFLAGS=`"$PY_CONFIG" --ldflags`
+ fi
- PYTHONLDFLAGS=`"$PY_CONFIG" --ldflags`
-
# look for the swig program
AC_PATH_PROG(SWIG, swig, no)
More information about the grass-commit
mailing list