Changeset 1485

Show
Ignore:
Timestamp:
07/22/04 00:39:49 (4 years ago)
Author:
augur
Message:

config.m4: assume libswish-e will be in $SWISHE_DIR/lib and swish-e.h will be in $SWISHE_DIR/include. Need to fix this so we can still specify the swish-e source directory. However users are having trouble building it at all.
swishe.c: looks like some API function names changed before 2.4.0 release.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/swish_php/config.m4

    r1276 r1485  
    2626    AC_MSG_ERROR([Please reinstall the swish-e distribution or fix path in --with-swishe]) 
    2727  else 
    28     if test -z "$SWISHE_DIR/src/swish.h"; then 
     28    if test -z "$SWISHE_DIR/include/swish.h"; then 
    2929      AC_MSG_RESULT([swish.h not found]) 
    3030      AC_MSG_ERROR([Please install the swish-e distribution or give a proper path]) 
    …… 
    3838 
    3939  dnl # --with-swishe -> add include path 
    40   PHP_ADD_INCLUDE($SWISHE_DIR/src) 
     40  PHP_ADD_INCLUDE($SWISHE_DIR/include) 
    4141 
    4242  dnl # --with-swishe -> chech for lib  

  • trunk/swish_php/swishe.c

    r1381 r1485  
    730730 
    731731    FETCH_SEARCH(); 
    732     SwishStructure(search->swishe_search_handle, structure); 
     732    SwishSetStructure(search->swishe_search_handle, structure); 
    733733} 
    734734/* }}} */ 
    …… 
    803803 
    804804    FETCH_SEARCH(); 
    805     SwishReSetSearchLimit(search->swishe_search_handle); 
     805    SwishResetSearchLimit(search->swishe_search_handle); 
    806806} 
    807807/* }}} */