zorba-coders team mailing list archive

[William Candillon <william.candillon@xxxxxxxxxx>]

William Candillon has proposed merging lp:~zorba-coders/zorba/php into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935

Fix bug #897825
-- 
https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'swig/php/CMakeLists.txt'
--- swig/php/CMakeLists.txt	2011-10-12 20:56:27 +0000
+++ swig/php/CMakeLists.txt	2011-11-30 12:50:30 +0000
@@ -78,6 +78,7 @@
   ### Start PHP proxy generation
   # Configure the test file
   SET (phpAPIPath ${CMAKE_CURRENT_BINARY_DIR})
+  SET (phpLibPrefix ${ZORBA_SWIG_LIB_PREFIX})
   CONFIGURE_FILE (
     ${CMAKE_CURRENT_SOURCE_DIR}/generate_proxy.php.in
     ${CMAKE_CURRENT_BINARY_DIR}/generate_proxy.php

=== modified file 'swig/php/generate_proxy.php.in'
--- swig/php/generate_proxy.php.in	2011-06-24 19:58:33 +0000
+++ swig/php/generate_proxy.php.in	2011-11-30 12:50:30 +0000
@@ -1,4 +1,5 @@
 <?php
+$libPrefix = '@phpLibPrefix@';
 $file = file_get_contents('@phpAPIPath@/zorba_api.php');
 $file = str_replace('class Iterator {', 'class IteratorImpl {', $file);
 $file = str_replace('extends Iterator {', 'extends IteratorImpl {', $file);
@@ -17,9 +18,9 @@
     if(!dl('php_zorba_api.dll')) return;
   } else {
     if(PHP_SHLIB_SUFFIX === 'PHP_SHLIB_SUFFIX' || PHP_SHLIB_SUFFIX === 'dylib') {
-      if(!dl('zorba_api.so')) return;
+      if(!dl('$libPrefix'.'zorba_api.so')) return;
     } else {
-      if(!dl('zorba_api.' . PHP_SHLIB_SUFFIX)) return;
+      if(!dl('$libPrefix'.'zorba_api.' . PHP_SHLIB_SUFFIX)) return;
     }
   }
 }