Python configuration changes

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4201 c8812cc2-4d05-0410-92ff-de0c093fc19c

acinclude.m4

@@ -630,9 +630,8 @@ AC_HELP_STRING([--with-python],
 
 if test x"$with_python" = "x"; then
 AC_MSG_RESULT( Not using python )
-have_python=no
+    ac_use_python=no
 else
-have_python=yes
 AC_MSG_CHECKING(for python build information)
    for python in python2.4 python2.3 python2.2 python2.1 python; do
    AC_CHECK_PROGS(PYTHON_BIN, [$python])
@@ -663,6 +662,7 @@ AC_MSG_CHECKING(for python build information)
    AC_MSG_RESULT([    Binary:      $ax_python_bin])
    AC_MSG_RESULT([    Library:     $ax_python_lib])
    AC_MSG_RESULT([    Include Dir: $ax_python_header])
+   AC_MSG_RESULT([    Have python: $ac_use_python])
  
    if test x$ax_python_header != xno; then
      PYTHON_INCLUDE_DIR=-I$ax_python_header
@@ -672,9 +672,13 @@ AC_MSG_CHECKING(for python build information)
      PYTHON_LIB=-l$ax_python_lib
      AC_SUBST(PYTHON_LIB)
    fi
+  if test x$ax_python_header != xno; then
+  dnl  & x$ax_python_lib != xno; then
+    ac_use_python=yes
     HAVE_PYTHON=-DHAVE_PYTHON
-    AC_SUBST(HAVE_PYTHON)
-   ]
   fi 
-)
+fi
+
+AM_CONDITIONAL([USE_PYTHON], [test "$ac_use_python" = "yes"])
+])
 dnl 

configure.in

@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl configure.in,v 1.204 2004/10/21 17:27:35 mcoletti Exp
+dnl $Id$
 
 
 
@@ -488,6 +488,7 @@ AC_CONFIG_FILES([
   doc/plugins/delimited_text/Makefile
   tools/Makefile
   tools/qgis_config/Makefile
+  tools/mapserver_export/Makefile
   widgets/Makefile
   widgets/projectionselector/Makefile
   designer_plugins/Makefile
@@ -512,7 +513,7 @@ echo "Georeferencer : $ac_gsl"
 echo "GPS/GPX       : $have_expat_lib"
 echo "PROJ4         : $have_proj_lib"
 echo "SQLITE3       : $have_sqlite3_lib"
-echo "Python        : $have_python"
+echo "Python        : $ac_use_python"
 echo ""
 echo "Debug         : $ac_debug"
 echo "Plugin dir    : ${libdir}/$PACKAGE"

tools/Makefile.am

@@ -9,8 +9,11 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # $Id$
+if USE_PYTHON
+MAPSERVER = mapserver_export
+endif
 
-SUBDIRS = qgis_config
+SUBDIRS = qgis_config $(MAPSERVER)
 
 m4filedir = $(datadir)/aclocal