[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 41c3067eee836bdc44f4b124f22f6fd69f2548c0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jun 15 00:46:15 2013 +0200

    Update configure arguments (several no longer supported).

diff --git a/debian/changelog b/debian/changelog
index 11568c3..7e656da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Remove unused shlibs:Depends.
   * shp2mysql was removed, no more perl in mapserver-bin.
   * Use --install-layout=deb for python setup.py.
+  * Update configure arguments (several no longer supported).
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/rules b/debian/rules
index 653e461..5544b0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,17 +24,12 @@ PHP5API=$(shell php-config5 --phpapi)
 
 
 COMMON_CONFIG=	--prefix=/usr \
-		--without-tiff \
-		--without-pdf \
 		--with-gd=/usr \
 		--with-freetype=/usr \
 		--with-fribidi-config \
-		--with-zlib=/usr \
-		--with-xpm=/usr \
 		--with-gdal \
 		--with-ogr \
 		--with-proj \
-		--with-eppl \
 		--with-postgis \
 		--with-wcs \
 		--with-sos \
@@ -45,7 +40,6 @@ COMMON_CONFIG=	--prefix=/usr \
 		--with-threads \
 		--with-geos \
 		--with-fastcgi \
-		--with-agg \
 		--with-php \
 		--with-cairo
 

-- 
Mapserver