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

[bdwalton at users.sourceforge.net]

Revision: 17387
          http://gar.svn.sourceforge.net/gar/?rev=17387&view=rev
Author:   bdwalton
Date:     2012-03-12 15:00:35 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
php5/trunk: cannot build the apache module and the cgi version at the same time so apxs2 must remain a modulation specific directive

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2012-03-12 11:34:11 UTC (rev 17386)
+++ csw/mgar/pkg/php5/trunk/Makefile	2012-03-12 15:00:35 UTC (rev 17387)
@@ -247,7 +247,6 @@
 CONFIGURE_ARGS += --with-config-file-scan-dir=$(sysconfdir)/conf.d
 CONFIGURE_ARGS += --enable-bcmath=shared
 CONFIGURE_ARGS += --enable-calendar=shared
-CONFIGURE_ARGS += --enable-cli
 CONFIGURE_ARGS += --enable-ctype=shared
 CONFIGURE_ARGS += --enable-dba=shared
 CONFIGURE_ARGS += --enable-dom=shared
@@ -277,7 +276,6 @@
 CONFIGURE_ARGS += --enable-xmlreader=shared
 CONFIGURE_ARGS += --enable-xmlwriter=shared
 CONFIGURE_ARGS += --enable-zip=shared
-CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs
 CONFIGURE_ARGS += --with-bz2=shared,$(prefix)
 CONFIGURE_ARGS += --with-curl=shared,$(prefix)
 CONFIGURE_ARGS += --with-curlwrappers
@@ -328,9 +326,14 @@
 CONFIGURE_ARGS += --with-xsl=shared,$(prefix)
 CONFIGURE_ARGS += --with-zlib-dir=$(prefix)
 CONFIGURE_ARGS += --with-zlib=$(prefix)
+CONFIGURE_ARGS += --enable-cli
 
+ifeq ($(SAPI),ap2)
+CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs
+endif
+
 # Disable Tests (report submitted to PHP QA)
-#SKIPTEST = 1
+SKIPTEST = 1
 #ENABLE_CHECK = 0
 TEST_TARGET = test
 

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