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

[bdwalton at users.sourceforge.net]

Revision: 13503
          http://gar.svn.sourceforge.net/gar/?rev=13503&view=rev
Author:   bdwalton
Date:     2011-03-01 02:25:06 +0000 (Tue, 01 Mar 2011)

Log Message:
-----------
php5/trunk: force 32-bit mysql_config and use proper prefix for mysql

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-03-01 01:53:43 UTC (rev 13502)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-03-01 02:25:06 UTC (rev 13503)
@@ -540,14 +540,16 @@
 CONFIGURE_ARGS += --with-mhash=shared,$(prefix)
 CONFIGURE_ARGS += --with-mime-magic=shared
 CONFIGURE_ARGS += --with-mssql=shared,$(prefix)
-CONFIGURE_ARGS += --with-mysql=shared,$(prefix)
-CONFIGURE_ARGS += --with-mysqli=shared,$(bindir)/mysql_config
+CONFIGURE_ARGS += --with-mysql=shared,$(prefix)/mysql5
+CONFIGURE_ARGS += --with-mysqli=shared,$(prefix)/mysql5/bin/$(ISA_DEFAULT)/mysql_config
 CONFIGURE_ARGS += --with-ncurses=shared,$(prefix)
 CONFIGURE_ARGS += --with-unixODBC=shared,$(prefix)
 CONFIGURE_ARGS += --with-openssl=shared,$(prefix)
 CONFIGURE_ARGS += --enable-pcntl=shared
 CONFIGURE_ARGS += --enable-pdo=shared
-CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix)
+# not documented, but you can pass the path to mysql_config directly
+# we need the 32-bit version, so we have to force this
+CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix)/mysql5/bin/$(ISA_DEFAULT)/mysql_config
 CONFIGURE_ARGS += --with-zlib-dir=$(prefix)
 CONFIGURE_ARGS += --with-pdo-odbc=shared,unixODBC,$(prefix)
 CONFIGURE_ARGS += --with-pdo-pgsql=shared,$(prefix)/postgresql


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