diff -urN mnogosearch-3.2.18.org/configure.in mnogosearch-3.2.18/configure.in --- mnogosearch-3.2.18.org/configure.in 2004-06-28 02:51:35.821426328 +0200 +++ mnogosearch-3.2.18/configure.in 2004-06-28 02:54:45.798545416 +0200 @@ -548,8 +548,12 @@ if test "$chasen" != no; then LIBS_SAVE="$LIBS" CFLAGS_SAVE="$CFLAGS" - LIBS="$LIBS -L/usr/local/lib -lchasen" - CFLAGS="$CFLAGS -I/usr/local/include" + if test "$chasen" != "yes"; then + LIBS="$LIBS -L$chasen/lib -lchasen" + CFLAGS="$CFLAGS -I$chasen/include" + else + LIBS="$LIBS -lchasen" + fi AC_TRY_LINK([#include #include @@ -578,8 +582,12 @@ if test "$mecab" != no; then LIBS_SAVE="$LIBS" CFLAGS_SAVE="$CFLAGS" - LIBS="$LIBS -L/usr/local/lib -lmecab -lstdc++ -lc_r" - CFLAGS="$CFLAGS -I/usr/local/include" + if test "$mecab" != "yes"; then + LIBS="$LIBS -L$mecab/lib -lmecab -lstdc++ -lc_r" + CFLAGS="$CFLAGS -I$mecab/include" + else + LIBS="$LIBS -lmecab -lstdc++ -lc_r" + fi AC_TRY_LINK([#include #include @@ -613,7 +621,7 @@ else SSL_INCDIR=/usr/local/ssl/include fi - if test -f /usr/lib/libssl.a; then + if test -f /usr/lib/libssl.a -o -f /usr/lib/libssl.so; then SSL_LIBDIR=/usr/lib else SSL_LIBDIR=/usr/local/ssl/lib @@ -711,7 +719,7 @@ withval="/usr/local/mysql" elif test -f /usr/include/mysql/mysql.h; then MYSQL_INCDIR=/usr/include/mysql - MYSQL_LIBDIR=/usr/lib/mysql + MYSQL_LIBDIR=/usr/lib withval="/usr" elif test -f /usr/include/mysql.h; then MYSQL_INCDIR=/usr/include @@ -746,7 +754,11 @@ fi fi MYSQL_INCLUDE="-I$MYSQL_INCDIR" + if test "$MYSQL_LIBDIR" = "/usr/lib" ; then + MYSQL_LFLAGS="-lmysqlclient" + else MYSQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqlclient" + fi AC_DEFINE(HAVE_MYSQL) AC_MSG_RESULT($withval) @@ -785,8 +797,8 @@ test -f /usr/local/include/postgresql/libpq-fe.h && PGSQL_INCDIR=/usr/local/include/postgresql test -f /usr/local/include/libpq-fe.h && PGSQL_INCDIR=/usr/local/include PGSQL_LIBDIR=/usr/local/lib - test -f /usr/lib/libpq.a && PGSQL_LIBDIR=/usr/lib - test -f /usr/local/pgsql/lib/libpq.a && PGSQL_LIBDIR=/usr/local/pgsql/lib + test -f /usr/lib/libpq.so -o -f /usr/lib/libpq.a && PGSQL_LIBDIR=/usr/lib + test -f /usr/local/pgsql/lib/libpq.so -o -f /usr/local/pgsql/lib/libpq.a && PGSQL_LIBDIR=/usr/local/pgsql/lib else PGSQL_INCDIR=$withval/include test -d $withval/include/pgsql && PGSQL_INCDIR=$withval/include/pgsql @@ -794,7 +806,11 @@ test -d $withval/lib/pgsql && PGSQL_LIBDIR=$withval/lib/pgsql fi PGSQL_INCLUDE="-I$PGSQL_INCDIR" + if "$PGSQL_LIBDIR" = "/usr/lib"; then + PGSQL_LFLAGS="-lpq" + else PGSQL_LFLAGS="-L$PGSQL_LIBDIR -lpq" + fi AC_DEFINE(HAVE_PGSQL) AC_MSG_RESULT(yes) have_db=yes @@ -824,7 +840,7 @@ install directory, defaults to /usr/local.], [ if test "$withval" = "yes"; then - withval=/usr/local + withval=/usr fi if test "$withval" != "no"; then @@ -835,8 +851,16 @@ AC_MSG_RESULT(no) AC_MSG_ERROR(Invalid iODBC directory - unable to find isql.h) fi + if test "$IODBC_LIBDIR" = "/usr/lib"; then + IODBC_LFLAGS="-liodbc" + else IODBC_LFLAGS="-L$IODBC_LIBDIR -liodbc" + fi + if test "$IODBC_INCDIR" = "/usr/include"; then + IODBC_INCLUDE= + else IODBC_INCLUDE="-I$IODBC_INCDIR" + fi AC_DEFINE(HAVE_IODBC) AC_MSG_RESULT(yes) have_db=yes @@ -862,12 +886,12 @@ if test "$withval" != "no"; then if test "$withval" = "yes"; then if test -f /usr/include/sql.h; then - UNIXODBC_INCDIR=/usr/include - UNIXODBC_LIBDIR=/usr/lib + UNIXODBC_INCLUDE= + UNIXODBC_LFLAGS="-lodbc" withval="/usr" elif test -f /usr/local/include/sql.h; then - UNIXODBC_INCDIR=/usr/local/include - UNIXODBC_LIBDIR=/usr/local/lib + UNIXODBC_INCLUDE="-I/usr/local/include" + UNIXODBC_LFLAGS="-L/usr/local/lib -lodbc" withval="/usr/local" else AC_MSG_RESULT(no) @@ -875,16 +899,14 @@ fi else if test -f $withval/include/sql.h; then - UNIXODBC_INCDIR=$withval/include - UNIXODBC_LIBDIR=$withval/lib + UNIXODBC_INCLUDE="-I$withval/include" + UNIXODBC_LFLAGS="-L$withval/lib -lodbc" else AC_MSG_RESULT(no) AC_MSG_ERROR(Invalid unixODBC directory - unable to find sql.h) fi fi have_db=yes - UNIXODBC_LFLAGS="-L$UNIXODBC_LIBDIR -lodbc" - UNIXODBC_INCLUDE="-I$UNIXODBC_INCDIR" AC_DEFINE(HAVE_UNIXODBC) AC_MSG_RESULT($withval) if test "x$DBTYPE" = "x" ; then @@ -1198,7 +1220,7 @@ install directory, defaults to /usr/local.], [ if test "$withval" = "yes"; then - withval=/usr/local + withval=/usr fi if test "$withval" != "no"; then @@ -1209,8 +1231,16 @@ AC_MSG_RESULT(no) AC_MSG_ERROR(Invalid FreeTDS directory - unable to find ctpublic.h) fi + if test "$CTLIB_LIBDIR" = "/usr/lib"; then + CTLIB_LFLAGS="-lct" + else CTLIB_LFLAGS="-L$CTLIB_LIBDIR -lct" + fi + if test "$CTLIB_INCDIR" = "/usr/include"; then + CTLIB_INCLUDE= + else CTLIB_INCLUDE="-I$CTLIB_INCDIR" + fi AC_DEFINE(HAVE_CTLIB) AC_MSG_RESULT(yes) have_db=yes