[mapserver-commits] r13180 - trunk/mapserver

Tue Feb 28 11:42:38 EST 2012

Author: dmorissette
Date: 2012-02-28 08:42:38 -0800 (Tue, 28 Feb 2012)
New Revision: 13180

Modified:
   trunk/mapserver/MIGRATION_GUIDE.txt
   trunk/mapserver/README.CONFIGURE
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
Try to reflect libtool and php build changes

Modified: trunk/mapserver/MIGRATION_GUIDE.txt
===================================================================

--- trunk/mapserver/MIGRATION_GUIDE.txt	2012-02-28 16:09:04 UTC (rev 13179)
+++ trunk/mapserver/MIGRATION_GUIDE.txt	2012-02-28 16:42:38 UTC (rev 13180)
@@ -13,9 +13,26 @@
 Mapserver 6.0 to 6.2 Migration
 ==============================
 
+This section documents the changes that must be made to MapServer 
+applications when migrating from version 6.0.x (or earlier versions) 
+to 6.2 (i.e. backwards incompatibilities), as well as information
+on some of the new features.
+
 TODO:document changes in gap calculation for line markers and polygon
 tile symbols (#3879 and #3867)
 
+--------------------
+Build system changes
+--------------------
+
+If you are building MapServer from source, then the following may be of interest to you:
+
+* Use of libtool: In version 6.2, the Unix/Linux build scripts and Makefiles were converted to use libtool. One impact of this change is that the 'mapserv' file in the main source tree is a libtool wrapper script and not the actual binary. To use 'mapserv' you actually have to use 'make install' and then point to the installed binary. More info is available in the Compiling on Unix document at http://mapserver.org/trunk/installation/unix.html#installation
+
+* The --with-php configure option has been changed to point directly to the php-config script instead of to the directory where the PHP headers are located.
+
+
+
 MapServer 5.6 to 6.0 Migration
 ==============================
     

Modified: trunk/mapserver/README.CONFIGURE
===================================================================
--- trunk/mapserver/README.CONFIGURE	2012-02-28 16:09:04 UTC (rev 13179)
+++ trunk/mapserver/README.CONFIGURE	2012-02-28 16:42:38 UTC (rev 13180)
@@ -5,7 +5,7 @@
 For Unix users, Mapserver comes with a GNU autoconf "configure" script 
 that should take care of (hopefully!) all compilation issues for you.
 
-The configure script won't work on Windows NT.  See the file README.WIN32
+The configure script won't work on Windows.  See the file README.WIN32
 for details on compiling on Windows systems.
 
 The default configure behavior is to try to locate on your system the most
@@ -22,16 +22,19 @@
 
 ::
 
- $ cd mapserver-6.0.x
+ $ cd mapserver-6.2.x
  $ ./configure
  $ make
+ $ make install
 
-Unless something went wrong, you should have executables in the current 
-directory for the "mapserv" CGI program and the other utility programs.
-You can copy the "mapserv" program to your HTTP server's CGI directory
-and start using it.  
+Unless something went wrong, this should compile and install the "mapserv"
+CGI program and the other utility programs.
 
-See the MapServer web site at http://mapserver.gis.umn.edu/ for usage
+You should then locate the installed "mapserv" executable and link to it
+from your web server's cgi-bin directory. More information on how to do this
+is available at http://mapserver.org/installation/unix.html#installation
+
+See the MapServer web site at http://mapserver.org/ for usage
 instructions.
 
 
@@ -125,8 +128,8 @@
   --with-fastcgi=path     Enable FastCGI, point to installed tree.
   --with-httpd            Specify path to 'httpd' executable.
   --with-warnings[=flags] Enable strict warnings (or user defined warnings)
-  --with-php=DIR          Specify directory where PHP4's include files are
-                          installed (or a pointer to the full source tree)
+  --with-php=yes|no|/path/to/php-config
+                          Specify location of php-config script.
                           Required in order to compile the PHP/MapScript
                           module.
   --without-ld-shared     Disable shared library support
@@ -696,8 +699,8 @@
 
 ::
 
-  --with-php=DIR          Specify directory where PHP4's include files are
-                          installed (or a pointer to the full source tree)
+  --with-php=yes|no|/path/to/php-config
+                          Specify location of php-config script.
                           Required in order to compile the PHP/MapScript
                           module.
   --enable-perlv-ld-detect (applies to --with-php only)
@@ -707,23 +710,16 @@
 
 
 - The --with-php option will trigger the compilation of the PHP MapScript
-  module in the ./mapscript/php3/ directory.  
+  module in the ./mapscript/php/ directory.  
 
-- DIR should be the location of the PHP4 or PHP5 distribution (source or dev
-  package).  The module may work with older versions of PHP (4.1.x or 4.2.x), but 
-  PHP 4.3.x is strongly recommended. The configure script should 
-  automatically detect which version of PHP you are attempting to build 
-  with and take the necessary actions.
+- The argument to the --with-php option is the full path to the php-config
+  script
+    e.g.  $ ./configure --with-php=/usr/local/bin/php-config
 
-    e.g.  $ ./configure --with-php=../php-4.3.11
+- PHP MapScript now requires PHP 5.2.0 or more recent.
+  Support for PHP3 has been dropped after MapServer version 3.5.
+  Support for PHP4 has been dropped after MapServer version 5.6.
 
-- The PHP module has to be built as a shared library that will then
-  be loaded as a Dynamic Module by the PHP interpreter using the dl()
-  PHP command.  See the Wiki for detailed build instructions for various
-  platforms: http://mapserver.gis.umn.edu/cgi-bin/wiki.pl?PHPMapScript
-  See also the file ./mapscript/php3/README for more details on the
-  MapScript classes and functions.  
-
 - Some libraries are used by both PHP and MapServer, and using different 
   versions of these libs will lead to potential crashes at runtime.  In most
   cases it is safe to have both PHP and MapServer compiled with the same 

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2012-02-28 16:09:04 UTC (rev 13179)
+++ trunk/mapserver/configure	2012-02-28 16:42:38 UTC (rev 13180)
@@ -1635,8 +1635,7 @@
   --with-apr-config       path to apr-config program
   --with-warnings[=flags] Enable strict warnings (or user defined warnings)
   --with-php=yes|no|/path/to/php-config
-                          Specify directory where PHP5's include files are
-                          installed (or a pointer to the full source tree)
+                          Specify location of php-config script.
                           Required in order to compile the PHP/MapScript
                           module.
   --with-ld-shared=CMD    Specify link command to use to build shared libs

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2012-02-28 16:09:04 UTC (rev 13179)
+++ trunk/mapserver/configure.in	2012-02-28 16:42:38 UTC (rev 13180)
@@ -2564,8 +2564,7 @@
 AC_CHECKING(for PHP/MapScript module options)
 AC_ARG_WITH(php,
 [  --with-php=yes|no|/path/to/php-config
-                          Specify directory where PHP5's include files are
-                          installed (or a pointer to the full source tree)
+                          Specify location of php-config script.
                           Required in order to compile the PHP/MapScript 
                           module.],,[with_php=no])
 

