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

[bdwalton at users.sourceforge.net]

Revision: 13866
          http://gar.svn.sourceforge.net/gar/?rev=13866&view=rev
Author:   bdwalton
Date:     2011-03-20 00:25:11 +0000 (Sun, 20 Mar 2011)

Log Message:
-----------
php5/trunk: drop an unnecessary extra cflag and correct the iconv setup so we use the csw version properly

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-03-19 17:25:28 UTC (rev 13865)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-03-20 00:25:11 UTC (rev 13866)
@@ -538,7 +538,6 @@
 #include $(EXTENSION_MAKEFILES)
 
 EXTRA_CFLAGS = -I$(prefix)/include/ncursesw
-EXTRA_CFLAGS   += -I/opt/csw/include
 
 export CPPFLAGS
 EXTRA_CPPFLAGS = -I../ext/mbstring
@@ -587,8 +586,7 @@
 CONFIGURE_ARGS += --with-gettext=shared,$(prefix)
 CONFIGURE_ARGS += --with-gmp=shared,$(prefix)
 CONFIGURE_ARGS += --enable-hash=shared
-CONFIGURE_ARGS += --with-iconv=shared
-CONFIGURE_ARGS += --with-iconv-dir=$(prefix)
+CONFIGURE_ARGS += --with-iconv=shared,$(prefix)
 CONFIGURE_ARGS += --with-imap=shared,$(prefix)
 CONFIGURE_ARGS += --with-kerberos=$(prefix)
 CONFIGURE_ARGS += --with-imap-ssl=$(prefix)
@@ -647,7 +645,6 @@
 CONFIGURE_ARGS += --with-libxml-dir=$(prefix)
 CONFIGURE_ARGS += --with-xmlrpc=shared
 CONFIGURE_ARGS += --with-libxml-dir=$(prefix)
-CONFIGURE_ARGS += --with-iconv-dir=$(prefix)
 CONFIGURE_ARGS += --with-libexpat-dir=$(prefix)
 CONFIGURE_ARGS += --enable-xmlwriter=shared
 CONFIGURE_ARGS += --with-libxml-dir=$(prefix)


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