[csw-devel] SF.net SVN: gar:[17156] csw/mgar/pkg/php5/trunk/Makefile

[bdwalton at users.sourceforge.net]

Revision: 17156
          http://gar.svn.sourceforge.net/gar/?rev=17156&view=rev
Author:   bdwalton
Date:     2012-02-24 01:40:57 +0000 (Fri, 24 Feb 2012)
Log Message:
-----------
php5/trunk: build all modules regardless of modulation; Mantis 4904

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/Makefile

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2012-02-23 16:09:24 UTC (rev 17155)
+++ csw/mgar/pkg/php5/trunk/Makefile	2012-02-24 01:40:57 UTC (rev 17156)
@@ -234,6 +234,8 @@
 
 sysconfdir = /etc$(prefix)/php5
 
+MYSQL_VER = 5.0
+
 CONFIGURE_ARGS += --prefix=$(prefix)/php5
 CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)
 ## build this static, php can not run without it.
@@ -245,10 +247,6 @@
 CONFIGURE_ARGS += --with-libxml-dir=$(prefix)
 CONFIGURE_ARGS += --with-config-file-path=$(sysconfdir)
 CONFIGURE_ARGS += --with-config-file-scan-dir=$(sysconfdir)/conf.d
-
-ifeq ($(SAPI),ap2)
-MYSQL_VER = 5.0
-
 CONFIGURE_ARGS += --enable-bcmath=shared
 CONFIGURE_ARGS += --enable-calendar=shared
 CONFIGURE_ARGS += --enable-cli
@@ -332,9 +330,7 @@
 CONFIGURE_ARGS += --with-xsl=shared,$(prefix)
 CONFIGURE_ARGS += --with-zlib-dir=$(prefix)
 CONFIGURE_ARGS += --with-zlib=$(prefix)
-endif
 
-
 # Disable Tests (report submitted to PHP QA)
 #SKIPTEST = 1
 #ENABLE_CHECK = 0

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.