With commit of C-based raster2pgsql in r8369, removed dependency checks on Python...

git-svn-id: http://svn.osgeo.org/postgis/trunk@8371 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/configure.ac b/configure.ac
index 34fad2601778983859faae9b8d5d14411d1c0980..49d1e1eb708e5f5f60462792f9b27fdc2ba4575d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -920,38 +920,6 @@ if test "x$RASTER" = "xraster"; then dnl # {
        dnl Check if the new polygonize function is present
        AC_CHECK_LIB([gdal], [GDALFPolygonize], [AC_DEFINE_UNQUOTED([GDALFPOLYGONIZE], [1])], [AC_DEFINE_UNQUOTED([GDALFPOLYGONIZE], [0])], []) 
 
-       dnl Determine if GDAL Python bindings are available
-       AC_MSG_CHECKING([for GDAL Python bindings])
-       GDAL_PYTHON_TEST='try:
-  from osgeo import gdal
-  print 1
-except ImportError:
-  pass'
-
-       GDAL_PYTHON_FOUND=`python -c "$GDAL_PYTHON_TEST"`
-       if test "$GDAL_PYTHON_FOUND" = "1"; then
-           AC_MSG_RESULT([found])
-       else    
-               AC_MSG_RESULT([not found])
-           AC_MSG_ERROR([GDAL Python bindings required by raster2pgsql.py loader])
-       fi
-
-       dnl Determine if GDAL Python bindings come with NumPy support
-       AC_MSG_CHECKING([for NumPy array support in GDAL Python bindings])
-       GDAL_NUMPY_TEST='try:
-  from osgeo import gdal_array
-  print 1
-except ImportError:
-  pass'
-
-       GDAL_NUMPY_FOUND=`python -c "$GDAL_NUMPY_TEST"`
-       if test "$GDAL_NUMPY_FOUND" = "1"; then
-           AC_MSG_RESULT([found])
-       else    
-               AC_MSG_RESULT([not found])
-           AC_MSG_ERROR([GDAL Python bindings with NumPy array support required by raster2pgsql.py loader])
-       fi
-
     dnl Extract the linker and include flags 
     LIBGDAL_LDFLAGS=`$GDAL_CONFIG --libs`
     LIBGDAL_CFLAGS=`$GDAL_CONFIG --cflags`
@@ -979,8 +947,9 @@ except ImportError:
                     raster/loader/Makefile \ 
                     raster/test/Makefile \
                     raster/test/core/Makefile \ 
-                    raster/test/regress/Makefile \ 
-                    raster/scripts/python/Makefile"
+                    raster/test/regress/Makefile \
+                                                                               raster/scripts/Makefile \
+                                                                               raster/scripts/python/Makefile"
 
 else dnl # }{
     RT_MAKEFILE_LIST="raster/Makefile"

diff --git a/raster/Makefile.in b/raster/Makefile.in
index 1e356c56567db64eb0f8a79d5662937ca5153957..0f9902c8328f2d16e2ca511b14ab62a4d4ac1173 100644 (file)
--- a/raster/Makefile.in
+++ b/raster/Makefile.in
@@ -28,19 +28,19 @@ rtpostgis.sql:
 install: all
        $(MAKE) -C rt_pg install
        $(MAKE) -C loader install
-       $(MAKE) -C scripts/python install
+       $(MAKE) -C scripts install
 
 uninstall:
        $(MAKE) -C rt_pg uninstall
        $(MAKE) -C loader uninstall
-       $(MAKE) -C scripts/python uninstall
+       $(MAKE) -C scripts uninstall
 
 clean:
        $(MAKE) -C rt_core $@
        $(MAKE) -C rt_pg $@
        $(MAKE) -C loader $@
        $(MAKE) -C test $@
-       $(MAKE) -C scripts/python $@
+       $(MAKE) -C scripts $@
 
 distclean: clean
        $(RM) -R autom4te.cache

diff --git a/raster/scripts/python/Makefile.in b/raster/scripts/python/Makefile.in
index 05106531e8cfaab7673d92fd644f2b022ee8f0b1..d154d639cacd8a4cd19caf7b50a879b06dfb72e4 100644 (file)
--- a/raster/scripts/python/Makefile.in
+++ b/raster/scripts/python/Makefile.in
@@ -18,10 +18,10 @@ PGSQL_BINDIR=@PGSQL_BINDIR@
 all:
 
 install:
-       $(CP) $(RASTER2PGSQL) $(DESTDIR)$(PGSQL_BINDIR)/$(RASTER2PGSQL)
+#      $(CP) $(RASTER2PGSQL) $(DESTDIR)$(PGSQL_BINDIR)/$(RASTER2PGSQL)
 
 uninstall:
-       $(RM) $(DESTDIR)$(PGSQL_BINDIR)/$(RASTER2PGSQL)
+#      $(RM) $(DESTDIR)$(PGSQL_BINDIR)/$(RASTER2PGSQL)
 
 clean:
        $(RM) *.o