[PHP-CVS] cvs: php4 /ext/mnogosearch config.m4

[Jon Parise]

jon Wed Feb 14 12:10:15 2001 EDT

  Modified files:  
/php4/ext/mnogosearch   config.m4 
  Log:
  Fix build.
  
  
Index: php4/ext/mnogosearch/config.m4
diff -u php4/ext/mnogosearch/config.m4:1.5 php4/ext/mnogosearch/config.m4:1.6
--- php4/ext/mnogosearch/config.m4:1.5  Wed Feb 14 06:39:39 2001
+++ php4/ext/mnogosearch/config.m4  Wed Feb 14 12:10:14 2001
@@ -1,5 +1,5 @@
 dnl $Source: /local/repository/php4/ext/mnogosearch/config.m4,v $
-dnl $Id: config.m4,v 1.5 2001/02/14 14:39:39 gluke Exp $
+dnl $Id: config.m4,v 1.6 2001/02/14 20:10:14 jon Exp $
 
 PHP_ARG_WITH(mnogosearch,for mnoGoSearch support,
 [  --with-mnogosearch[=DIR]   Include mnoGoSearch support.  DIR is the 
mnoGoSearch base
@@ -21,7 +21,7 @@
 
 if test -x "$MNOGOSEARCH_BINDIR/udm-config"; then
MNOGOSEARCH_VERSION=`$MNOGOSEARCH_BINDIR/udm-config --version`
-   MNOGOSEARCH_VERSION_ID=`$MNOGOSEARCH_BINDIR/udm-config -version-id`
+   MNOGOSEARCH_VERSION_ID=`$MNOGOSEARCH_BINDIR/udm-config --version-id`
 
if test $? -ne 0; then
AC_MSG_RESULT(<= 3.1.9)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/mnogosearch config.m4

[Sergey Kartashoff]

gluke   Wed Feb 14 06:39:39 2001 EDT

  Modified files:  
/php4/ext/mnogosearch   config.m4 
  Log:
  mnoGoSearch config.m4 freebsd compatibility fix.
  
  
Index: php4/ext/mnogosearch/config.m4
diff -u php4/ext/mnogosearch/config.m4:1.4 php4/ext/mnogosearch/config.m4:1.5
--- php4/ext/mnogosearch/config.m4:1.4  Wed Feb 14 06:27:45 2001
+++ php4/ext/mnogosearch/config.m4  Wed Feb 14 06:39:39 2001
@@ -1,5 +1,5 @@
 dnl $Source: /local/repository/php4/ext/mnogosearch/config.m4,v $
-dnl $Id: config.m4,v 1.4 2001/02/14 14:27:45 gluke Exp $
+dnl $Id: config.m4,v 1.5 2001/02/14 14:39:39 gluke Exp $
 
 PHP_ARG_WITH(mnogosearch,for mnoGoSearch support,
 [  --with-mnogosearch[=DIR]   Include mnoGoSearch support.  DIR is the 
mnoGoSearch base
@@ -24,11 +24,6 @@
MNOGOSEARCH_VERSION_ID=`$MNOGOSEARCH_BINDIR/udm-config -version-id`
 
if test $? -ne 0; then
-   AC_MSG_RESULT(<= 3.1.9)
-   AC_MSG_ERROR(mnoGoSearch 3.1.10 at least required)
-   fi
-   
-   if test -l "$MNOGOSEARCH_VERSION_ID" -gt 6; then
AC_MSG_RESULT(<= 3.1.9)
AC_MSG_ERROR(mnoGoSearch 3.1.10 at least required)
fi



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/mnogosearch config.m4 php_mnogo.c

[Sergey Kartashoff]

gluke   Wed Feb 14 06:27:46 2001 EDT

  Modified files:  
/php4/ext/mnogosearch   config.m4 php_mnogo.c 
  Log:
  Added mnogosearch version checking into config.m4.
  Some proto fixes.
  
  
Index: php4/ext/mnogosearch/config.m4
diff -u php4/ext/mnogosearch/config.m4:1.3 php4/ext/mnogosearch/config.m4:1.4
--- php4/ext/mnogosearch/config.m4:1.3  Mon Feb  5 06:00:35 2001
+++ php4/ext/mnogosearch/config.m4  Wed Feb 14 06:27:45 2001
@@ -1,5 +1,5 @@
 dnl $Source: /local/repository/php4/ext/mnogosearch/config.m4,v $
-dnl $Id: config.m4,v 1.3 2001/02/05 14:00:35 gluke Exp $
+dnl $Id: config.m4,v 1.4 2001/02/14 14:27:45 gluke Exp $
 
 PHP_ARG_WITH(mnogosearch,for mnoGoSearch support,
 [  --with-mnogosearch[=DIR]   Include mnoGoSearch support.  DIR is the 
mnoGoSearch base
@@ -17,13 +17,35 @@
   MNOGOSEARCH_LIBDIR=$PHP_MNOGOSEARCH/lib
 fi
 
-AC_ADD_INCLUDE($MNOGOSEARCH_INCDIR)
+AC_MSG_CHECKING(for mnoGoSearch version)
 
 if test -x "$MNOGOSEARCH_BINDIR/udm-config"; then
+   MNOGOSEARCH_VERSION=`$MNOGOSEARCH_BINDIR/udm-config --version`
+   MNOGOSEARCH_VERSION_ID=`$MNOGOSEARCH_BINDIR/udm-config -version-id`
+
+   if test $? -ne 0; then
+   AC_MSG_RESULT(<= 3.1.9)
+   AC_MSG_ERROR(mnoGoSearch 3.1.10 at least required)
+   fi
+   
+   if test -l "$MNOGOSEARCH_VERSION_ID" -gt 6; then
+   AC_MSG_RESULT(<= 3.1.9)
+   AC_MSG_ERROR(mnoGoSearch 3.1.10 at least required)
+   fi
+   
+   if test "$MNOGOSEARCH_VERSION_ID" -lt 30110; then
+   AC_MSG_RESULT(<= 3.1.9)
+   AC_MSG_ERROR(mnoGoSearch 3.1.10 at least required)
+   fi
+   
+   AC_MSG_RESULT($MNOGOSEARCH_VERSION)
+   
PHP_EVAL_LIBLINE(`$MNOGOSEARCH_BINDIR/udm-config --libs`, 
MNOGOSEARCH_SHARED_LIBADD)
 else
-   AC_ADD_LIBRARY_WITH_PATH(udmsearch, $MNOGOSEARCH_LIBDIR, 
MNOGOSEARCH_SHARED_LIBADD)
+   AC_MSG_ERROR(udm-config script not found in $MNOGOSEARCH_BINDIR)
 fi
+
+AC_ADD_INCLUDE($MNOGOSEARCH_INCDIR)
 
 AC_DEFINE(HAVE_MNOGOSEARCH,1,[ ])
 
Index: php4/ext/mnogosearch/php_mnogo.c
diff -u php4/ext/mnogosearch/php_mnogo.c:1.13 php4/ext/mnogosearch/php_mnogo.c:1.14
--- php4/ext/mnogosearch/php_mnogo.c:1.13   Fri Feb  9 05:29:19 2001
+++ php4/ext/mnogosearch/php_mnogo.cWed Feb 14 06:27:45 2001
@@ -1,5 +1,5 @@
 /* $Source: /local/repository/php4/ext/mnogosearch/php_mnogo.c,v $ */
-/* $Id: php_mnogo.c,v 1.13 2001/02/09 13:29:19 gluke Exp $ */
+/* $Id: php_mnogo.c,v 1.14 2001/02/14 14:27:45 gluke Exp $ */
 
 /*
+--+
@@ -682,12 +682,12 @@
 /* }}} */
 
 
-/* {{{ proto int udm_errno(int agent)
-   mnoGoSearch error number */
-DLEXPORT PHP_FUNCTION(udm_errno)
+/* {{{ proto int udm_free_agent(int agent)
+   Free mnoGoSearch session */
+DLEXPORT PHP_FUNCTION(udm_free_agent)
 {
pval ** yyagent;
-   UDM_AGENT * Agent;
+   UDM_RESULT * Agent;
switch(ZEND_NUM_ARGS()){
case 1: {
if (zend_get_parameters_ex(1, &yyagent)==FAILURE) {
@@ -699,19 +699,20 @@
WRONG_PARAM_COUNT;
break;
}
-   ZEND_FETCH_RESOURCE(Agent, UDM_AGENT *, yyagent, -1, "mnoGoSearch-Agent", 
le_link);
-   RETURN_LONG(UdmDBErrorCode(Agent->db));
+   ZEND_FETCH_RESOURCE(Agent, UDM_RESULT *, yyagent, -1, "mnoGoSearch-agent", 
+le_link);
+   zend_list_delete((*yyagent)->value.lval);
+   
+   RETURN_TRUE;
 }
 /* }}} */
 
 
-/* {{{ proto string udm_error(int agent)
-   mnoGoSearch error message */
-DLEXPORT PHP_FUNCTION(udm_error)
+/* {{{ proto int udm_errno(int agent)
+   Get mnoGoSearch error number */
+DLEXPORT PHP_FUNCTION(udm_errno)
 {
pval ** yyagent;
UDM_AGENT * Agent;
-   
switch(ZEND_NUM_ARGS()){
case 1: {
if (zend_get_parameters_ex(1, &yyagent)==FAILURE) {
@@ -724,17 +725,18 @@
break;
}
ZEND_FETCH_RESOURCE(Agent, UDM_AGENT *, yyagent, -1, "mnoGoSearch-Agent", 
le_link);
-   RETURN_STRING(UdmDBErrorMsg(Agent->db),1);
+   RETURN_LONG(UdmDBErrorCode(Agent->db));
 }
 /* }}} */
 
 
-/* {{{ proto int udm_free_agent(int agent)
-   Free mnoGoSearch session */
-DLEXPORT PHP_FUNCTION(udm_free_agent)
+/* {{{ proto string udm_error(int agent)
+   Get mnoGoSearch error message */
+DLEXPORT PHP_FUNCTION(udm_error)
 {
pval ** yyagent;
-   UDM_RESULT * Agent;
+   UDM_AGENT * Agent;
+   
switch(ZEND_NUM_ARGS()){
case 1: {
if (zend_get_parameters_ex(1, &yyagent)==FAILURE) {
@@ -746,10 +748,8 @@
WRONG_PARAM_COUNT;
break;
}
-   ZEND_FETCH_RESOURCE(Agent, UDM_RESULT *, yyagent, -1, "mnoGoSearch-agent", 
le_link);

[PHP-CVS] cvs: php4 /ext/mnogosearch config.m4

[Sergey Kartashoff]

gluke   Mon Feb  5 06:00:35 2001 EDT

  Modified files:  
/php4/ext/mnogosearch   config.m4 
  Log:
  Fixed default search path.
  @- Fixed default search path. (gluke)
  
  
Index: php4/ext/mnogosearch/config.m4
diff -u php4/ext/mnogosearch/config.m4:1.2 php4/ext/mnogosearch/config.m4:1.3
--- php4/ext/mnogosearch/config.m4:1.2  Wed Jan 31 06:04:29 2001
+++ php4/ext/mnogosearch/config.m4  Mon Feb  5 06:00:35 2001
@@ -1,16 +1,16 @@
 dnl $Source: /local/repository/php4/ext/mnogosearch/config.m4,v $
-dnl $Id: config.m4,v 1.2 2001/01/31 14:04:29 gluke Exp $
+dnl $Id: config.m4,v 1.3 2001/02/05 14:00:35 gluke Exp $
 
 PHP_ARG_WITH(mnogosearch,for mnoGoSearch support,
 [  --with-mnogosearch[=DIR]   Include mnoGoSearch support.  DIR is the 
mnoGoSearch base
-  install directory, defaults to /usr/local/udmsearch.])
+  install directory, defaults to /usr/local/mnogosearch.])
 
   if test "$PHP_MNOGOSEARCH" != "no"; then
   
 if test "$PHP_MNOGOSEARCH" = "yes"; then
-  MNOGOSEARCH_BINDIR=/usr/local/udmsearch/bin
-  MNOGOSEARCH_INCDIR=/usr/local/udmsearch/include
-  MNOGOSEARCH_LIBDIR=/usr/local/udmsearch/lib
+  MNOGOSEARCH_BINDIR=/usr/local/mnogosearch/bin
+  MNOGOSEARCH_INCDIR=/usr/local/mnogosearch/include
+  MNOGOSEARCH_LIBDIR=/usr/local/mnogosearch/lib
 else
   MNOGOSEARCH_BINDIR=$PHP_MNOGOSEARCH/bin
   MNOGOSEARCH_INCDIR=$PHP_MNOGOSEARCH/include



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]