php4-mnogosearch-fix.patch

   1 --- php-4.3.9RC2.orig/ext/mnogosearch/config.m4 2004-09-01 18:13:53.495238432 +0200
   2 +++ php-4.3.9RC2/ext/mnogosearch/config.m4      2004-09-01 18:16:52.696995624 +0200
   3 @@ -46,8 +46,10 @@
   4      PHP_ADD_INCLUDE($MNOGOSEARCH_INCDIR)
   5
   6      AC_DEFINE(HAVE_MNOGOSEARCH,1,[ ])
   7 +    MNOGOSEARCH_CFLAGS="-DNOT_USED_OR_REPLACED"
   8
   9 -    PHP_NEW_EXTENSION(mnogosearch, php_mnogo.c, $ext_shared)
  10 +    PHP_SUBST(MNOGOSEARCH_CFLAGS)
  11 +    PHP_NEW_EXTENSION(mnogosearch, php_mnogo.c, $ext_shared,, $MNOGOSEARCH_CFLAGS)
  12      PHP_SUBST(MNOGOSEARCH_SHARED_LIBADD)
  13
  14    fi
  15 --- php-4.4.9/ext/mnogosearch/php_mnogo.c~      2009-06-25 22:11:26.000000000 +0300
  16 +++ php-4.4.9/ext/mnogosearch/php_mnogo.c       2009-06-25 22:14:22.544491038 +0300
  17 @@ -901,10 +901,14 @@
  18                         if (UdmSynonymListLoad(Agent->Conf,val)) {
  19                                 php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s",Agent->Conf->errstr);
  20                                 RETURN_FALSE;
  21 +#if UDM_VERSION_ID >= 30300
  22 +                       } else UdmSynonymListSort(&(Agent->Conf->Synonym));
  23 +#else
  24  #if UDM_VERSION_ID >= 30204
  25                         } else UdmSynonymListSort(&(Agent->Conf->Synonyms));
  26  #else
  27                         } else UdmSynonymListSort(&(Agent->Conf->SynList));
  28 +#endif
  29  #endif
  30                         break;
  31
  32 @@ -1819,7 +1823,11 @@
  33                 if (UdmSynonymListLoad(Agent->Conf,val)) {
  34                         php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s",Agent->Conf->errstr);
  35                         RETURN_FALSE;
  36 +#if UDM_VERSION_ID >= 30300
  37 +               } else UdmSynonymListSort(&(Agent->Conf->Synonym));
  38 +#else
  39                 } else UdmSynonymListSort(&(Agent->Conf->Synonyms));
  40 +#endif
  41         } else if (!strcasecmp(var,"Stopwordfile")) {
  42                 if (UdmStopListLoad(Agent->Conf,val)) {
  43                         php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", Agent->Conf->errstr);