File cego-includedir.patch of Package php5-cego

File cego-includedir.patch of Package php5-cego (Revision 86ce2ee0a2d695782ccd58bc0db7a916)

Currently displaying revision 86ce2ee0a2d695782ccd58bc0db7a916, show latest

--- config.m4.orig	2011-06-19 13:38:47.918701812 +0200
+++ config.m4	2011-06-19 13:56:12.037713751 +0200
@@ -17,7 +17,7 @@
 
   dnl # --with-cego -> check with-path
   SEARCH_PATH="/usr/local /usr"     # you might want to change this
-  SEARCH_FOR="/include/cgwrap.h"  # you most likely want to change this
+  SEARCH_FOR="/include/cego/cgwrap.h"  # you most likely want to change this
   if test -r $PHP_CEGO/$SEARCH_FOR
   then # 	path given as parameter
      CEGO_DIR=$PHP_CEGO
@@ -39,13 +39,13 @@
   fi
 
   dnl # --with-cego -> add include path
-  PHP_ADD_INCLUDE($CEGO_DIR/include)
+  PHP_ADD_INCLUDE($CEGO_DIR/include/cego)
 
   dnl # --with-cego -> check for lib and symbol presence
 
   PHP_ADD_LIBRARY(stdc++,, CEGO_SHARED_LIBADD)
-  PHP_ADD_LIBRARY_WITH_PATH(Base, $CEGO_DIR, CEGO_SHARED_LIBADD)
-  PHP_ADD_LIBRARY_WITH_PATH(XML, $CEGO_DIR, CEGO_SHARED_LIBADD)
+  dnl PHP_ADD_LIBRARY_WITH_PATH(Base, $CEGO_DIR, CEGO_SHARED_LIBADD)
+  dnl PHP_ADD_LIBRARY_WITH_PATH(XML, $CEGO_DIR, CEGO_SHARED_LIBADD)
   PHP_ADD_LIBRARY_WITH_PATH(cego, $CEGO_DIR, CEGO_SHARED_LIBADD)
   PHP_ADD_LIBRARY_WITH_PATH(cgwrap, $CEGO_DIR, CEGO_SHARED_LIBADD)
   
--- cego.c.orig	2011-06-19 13:39:43.095281500 +0200
+++ cego.c	2012-05-18 21:34:52.395055383 +0200
@@ -27,7 +27,7 @@
 #include "ext/standard/info.h"
 #include "php_cego.h"
 
-#include "cgwrap.h"
+#include "cego/cgwrap.h"
 
 #define PHPCEGOVERSION "1.0.1"
 
@@ -258,13 +258,15 @@
     RETURN_STRING(PHPCEGOVERSION, 1);
 }
 
-/* proto resource cego_connect(string hostname, int portno, string tableset, string user, string passwd)
+/* proto resource cego_connect(string hostname, int portno, string prot, string tableset, string user, string passwd, string logfile)
 
    hostname - database host to connect to
    portno - port number to connect to
+   prot - protocol type - serial or xml
    tableset - target tableset
    user - database user
    passwd - database user password
+   logfile - optional
 
    -->> if successful, returns a valid database connection 
 */
@@ -286,6 +288,8 @@
     struct php_cego_db *db = NULL;
     
     char *logfile=NULL; // "cgwrap.log";
+
+    char *prot="serial";
     
     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "slsss", 
 			      &host, &host_len,
@@ -301,7 +305,7 @@
     
     php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Connecting to host");    
     
-    if ( (cgdb = cego_connect(host, portno, tableset, user, passwd, logfile)) == NULL )
+    if ( (cgdb = cego_connect(host, portno, prot, tableset, user, passwd, logfile)) == NULL )
     {		
 		RETURN_FALSE;
     }