Explorar o código

=yes doesn't need basename, minor whitespace/reorder

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@36955 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman %!s(int64=16) %!d(string=hai) anos
pai
achega
6a02be443a
Modificáronse 2 ficheiros con 778 adicións e 772 borrados
  1. 768 765
      configure
  2. 10 7
      configure.in

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 768 - 765
configure


+ 10 - 7
configure.in

@@ -196,19 +196,22 @@ LOC_ARG_WITH(readline, Readline, no)
 LOC_ARG_WITH(opendwg, openDWG, no)
 LOC_ARG_WITH(regex, regex)
 LOC_ARG_WITH(pthread, POSIX threads, no)
+
+AC_ARG_WITH(gdal,
+[  --with-gdal[=path/gdal-config] enable GDAL/OGR support (gdal-config with path, \
+e.g. '--with-gdal=/usr/local/bin/gdal-config')])
+
 AC_ARG_WITH(python,
-[  --with-python[=path/python-config] enable support for Python SWIG bindings (python-config with path, \
-e.g. '--with-python=/usr/bin/python2.5-config', default: no)],, with_python="no")
+[  --with-python[=path/python-config] enable support for Python SWIG bindings \
+(python-config with path, e.g. '--with-python=/usr/bin/python2.5-config', \
+default: no)],, with_python="no")
+
 AC_ARG_WITH(wxwidgets,
 [  --with-wxwidgets[=path/wx-config] enable wxWidgets support (wx-config with path, \
 e.g. '--with-wxwidgets=/usr/local/bin/wx-config', default: no)],, with_wxwidgets="no")
 
 # With includes and libs options
 
-AC_ARG_WITH(gdal,
-[  --with-gdal[=path/gdal-config] enable GDAL/OGR support (gdal-config with path, \
-e.g. '--with-gdal=/usr/local/bin/gdal-config')])
-
 AC_ARG_WITH(geos,
 [  --with-geos[=path/geos-config] enable GEOS support (geos-config with path, \
 e.g. '--with-geos=/usr/local/bin/geos-config', default: no)],, with_geos="no")
@@ -1691,7 +1694,7 @@ if test "$with_wxwidgets" = "no" ; then
 else
   AC_MSG_RESULT(yes)
   USE_WXWIDGETS="1"
-  if test "`basename $with_wxwidgets`" != "yes" ; then
+  if test "$with_wxwidgets" != "yes" ; then
     WX_CONFIG="$with_wxwidgets"
   fi