mnogosearch-acfixes.patch

   1 diff -urN mnogosearch-3.2.18.org/configure.in mnogosearch-3.2.18/configure.in
   2 --- mnogosearch-3.2.18.org/configure.in 2004-06-28 02:51:35.821426328 +0200
   3 +++ mnogosearch-3.2.18/configure.in     2004-06-28 02:54:45.798545416 +0200
   4 @@ -548,8 +548,12 @@
   5  if test "$chasen" != no; then
   6         LIBS_SAVE="$LIBS"
   7         CFLAGS_SAVE="$CFLAGS"
   8 -       LIBS="$LIBS -L/usr/local/lib -lchasen"
   9 -       CFLAGS="$CFLAGS -I/usr/local/include"
  10 +       if test "$chasen" != "yes"; then
  11 +               LIBS="$LIBS -L$chasen/lib -lchasen"
  12 +               CFLAGS="$CFLAGS -I$chasen/include"
  13 +       else
  14 +               LIBS="$LIBS -lchasen"
  15 +       fi
  16
  17  AC_TRY_LINK([#include <stdio.h>
  18  #include <chasen.h>
  19 @@ -578,8 +582,12 @@
  20  if test "$mecab" != no; then
  21         LIBS_SAVE="$LIBS"
  22         CFLAGS_SAVE="$CFLAGS"
  23 -       LIBS="$LIBS -L/usr/local/lib -lmecab -lstdc++ -lc_r"
  24 -       CFLAGS="$CFLAGS -I/usr/local/include"
  25 +       if test "$mecab" != "yes"; then
  26 +               LIBS="$LIBS -L$mecab/lib -lmecab -lstdc++ -lc_r"
  27 +               CFLAGS="$CFLAGS -I$mecab/include"
  28 +       else
  29 +               LIBS="$LIBS -lmecab -lstdc++ -lc_r"
  30 +       fi
  31
  32  AC_TRY_LINK([#include <stdio.h>
  33  #include <mecab.h>
  34 @@ -613,7 +621,7 @@
  35                  else
  36                          SSL_INCDIR=/usr/local/ssl/include
  37                  fi
  38 -                if test -f /usr/lib/libssl.a; then
  39 +                if test -f /usr/lib/libssl.a -o -f /usr/lib/libssl.so; then
  40                          SSL_LIBDIR=/usr/lib
  41                  else
  42                          SSL_LIBDIR=/usr/local/ssl/lib
  43 @@ -711,7 +719,7 @@
  44                         withval="/usr/local/mysql"
  45                 elif test -f /usr/include/mysql/mysql.h; then
  46                         MYSQL_INCDIR=/usr/include/mysql
  47 -                       MYSQL_LIBDIR=/usr/lib/mysql
  48 +                       MYSQL_LIBDIR=/usr/lib
  49                         withval="/usr"
  50                 elif test -f /usr/include/mysql.h; then
  51                         MYSQL_INCDIR=/usr/include
  52 @@ -746,7 +754,11 @@
  53                 fi
  54         fi
  55      MYSQL_INCLUDE="-I$MYSQL_INCDIR"
  56 +    if test "$MYSQL_LIBDIR" = "/usr/lib" ; then
  57 +       MYSQL_LFLAGS="-lmysqlclient"
  58 +    else
  59      MYSQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqlclient"
  60 +    fi
  61
  62      AC_DEFINE(HAVE_MYSQL)
  63      AC_MSG_RESULT($withval)
  64 @@ -785,8 +797,8 @@
  65                  test -f /usr/local/include/postgresql/libpq-fe.h && PGSQL_INCDIR=/usr/local/include/postgresql
  66                 test -f /usr/local/include/libpq-fe.h && PGSQL_INCDIR=/usr/local/include
  67                 PGSQL_LIBDIR=/usr/local/lib
  68 -               test -f /usr/lib/libpq.a && PGSQL_LIBDIR=/usr/lib
  69 -               test -f /usr/local/pgsql/lib/libpq.a && PGSQL_LIBDIR=/usr/local/pgsql/lib
  70 +               test -f /usr/lib/libpq.so -o -f /usr/lib/libpq.a && PGSQL_LIBDIR=/usr/lib
  71 +               test -f /usr/local/pgsql/lib/libpq.so -o -f /usr/local/pgsql/lib/libpq.a && PGSQL_LIBDIR=/usr/local/pgsql/lib
  72         else
  73                 PGSQL_INCDIR=$withval/include
  74                 test -d $withval/include/pgsql && PGSQL_INCDIR=$withval/include/pgsql
  75 @@ -794,7 +806,11 @@
  76                 test -d $withval/lib/pgsql && PGSQL_LIBDIR=$withval/lib/pgsql
  77         fi
  78      PGSQL_INCLUDE="-I$PGSQL_INCDIR"
  79 +    if "$PGSQL_LIBDIR" = "/usr/lib"; then
  80 +       PGSQL_LFLAGS="-lpq"
  81 +    else
  82      PGSQL_LFLAGS="-L$PGSQL_LIBDIR -lpq"
  83 +    fi
  84      AC_DEFINE(HAVE_PGSQL)
  85      AC_MSG_RESULT(yes)
  86      have_db=yes
  87 @@ -824,7 +840,7 @@
  88                            install directory, defaults to /usr/local.],
  89  [
  90         if test "$withval" = "yes"; then
  91 -               withval=/usr/local
  92 +               withval=/usr
  93         fi
  94
  95         if test "$withval" != "no"; then
  96 @@ -835,8 +851,16 @@
  97                         AC_MSG_RESULT(no)
  98                         AC_MSG_ERROR(Invalid iODBC directory - unable to find isql.h)
  99                 fi
 100 +               if test "$IODBC_LIBDIR" = "/usr/lib"; then
 101 +                       IODBC_LFLAGS="-liodbc"
 102 +               else
 103                 IODBC_LFLAGS="-L$IODBC_LIBDIR -liodbc"
 104 +               fi
 105 +               if test "$IODBC_INCDIR" = "/usr/include"; then
 106 +                       IODBC_INCLUDE=
 107 +               else
 108                 IODBC_INCLUDE="-I$IODBC_INCDIR"
 109 +               fi
 110                 AC_DEFINE(HAVE_IODBC)
 111                 AC_MSG_RESULT(yes)
 112                 have_db=yes
 113 @@ -862,12 +886,12 @@
 114  if test "$withval" != "no"; then
 115         if test "$withval" = "yes"; then
 116                 if test -f /usr/include/sql.h; then
 117 -                       UNIXODBC_INCDIR=/usr/include
 118 -                       UNIXODBC_LIBDIR=/usr/lib
 119 +                       UNIXODBC_INCLUDE=
 120 +                       UNIXODBC_LFLAGS="-lodbc"
 121                         withval="/usr"
 122                 elif test -f /usr/local/include/sql.h; then
 123 -                       UNIXODBC_INCDIR=/usr/local/include
 124 -                       UNIXODBC_LIBDIR=/usr/local/lib
 125 +                       UNIXODBC_INCLUDE="-I/usr/local/include"
 126 +                       UNIXODBC_LFLAGS="-L/usr/local/lib -lodbc"
 127                         withval="/usr/local"
 128                 else
 129                         AC_MSG_RESULT(no)
 130 @@ -875,16 +899,14 @@
 131                 fi
 132         else
 133                 if test -f $withval/include/sql.h; then
 134 -                       UNIXODBC_INCDIR=$withval/include
 135 -                       UNIXODBC_LIBDIR=$withval/lib
 136 +                       UNIXODBC_INCLUDE="-I$withval/include"
 137 +                       UNIXODBC_LFLAGS="-L$withval/lib -lodbc"
 138                 else
 139                         AC_MSG_RESULT(no)
 140                         AC_MSG_ERROR(Invalid unixODBC directory - unable to find sql.h)
 141                 fi
 142         fi
 143         have_db=yes
 144 -       UNIXODBC_LFLAGS="-L$UNIXODBC_LIBDIR -lodbc"
 145 -       UNIXODBC_INCLUDE="-I$UNIXODBC_INCDIR"
 146         AC_DEFINE(HAVE_UNIXODBC)
 147         AC_MSG_RESULT($withval)
 148         if test "x$DBTYPE" = "x" ; then
 149 @@ -1198,7 +1220,7 @@
 150                            install directory, defaults to /usr/local.],
 151  [
 152         if test "$withval" = "yes"; then
 153 -               withval=/usr/local
 154 +               withval=/usr
 155         fi
 156
 157         if test "$withval" != "no"; then
 158 @@ -1209,8 +1231,16 @@
 159                         AC_MSG_RESULT(no)
 160                         AC_MSG_ERROR(Invalid FreeTDS directory - unable to find ctpublic.h)
 161                 fi
 162 +               if test "$CTLIB_LIBDIR" = "/usr/lib"; then
 163 +                       CTLIB_LFLAGS="-lct"
 164 +               else
 165                 CTLIB_LFLAGS="-L$CTLIB_LIBDIR -lct"
 166 +               fi
 167 +               if test "$CTLIB_INCDIR" = "/usr/include"; then
 168 +                       CTLIB_INCLUDE=
 169 +               else
 170                 CTLIB_INCLUDE="-I$CTLIB_INCDIR"
 171 +               fi
 172                 AC_DEFINE(HAVE_CTLIB)
 173                 AC_MSG_RESULT(yes)
 174                 have_db=yes