mnogosearch-acfixes.patch

   1 --- mnogosearch-3.2.39/configure.in.orig        2006-05-28 13:48:13.000000000 +0200
   2 +++ mnogosearch-3.2.39/configure.in     2006-08-24 15:44:28.655971000 +0200
   3 @@ -629,7 +629,7 @@
   4                  else
   5                          SSL_INCDIR=/usr/local/ssl/include
   6                  fi
   7 -                if test -f /usr/lib/libssl.a; then
   8 +                if test -f /usr/lib/libssl.a -o -f /usr/lib/libssl.so; then
   9                          SSL_LIBDIR=/usr/lib
  10                  else
  11                          SSL_LIBDIR=/usr/local/ssl/lib
  12 @@ -738,7 +738,11 @@
  13
  14    AC_MSG_RESULT($path)
  15    CHASEN_INCLUDE="-I$path/include"
  16 -  CHASEN_LFLAGS="-L$path/lib -lstdc++ -lchasen"
  17 +  if test "$path" = "/usr" ; then
  18 +       CHASEN_LFLAGS="-lchasen -lstdc++"
  19 +  else
  20 +       CHASEN_LFLAGS="-L$path/lib -lstdc++ -lchasen"
  21 +  fi
  22    AC_DEFINE([HAVE_CHARSET_japanese], [1], [Define if you want Japanese support])
  23    ADDCHARSETS="japanese"
  24  ],
  25 @@ -771,7 +775,11 @@
  26    fi
  27
  28    AC_MSG_RESULT($path)
  29 +  if test "$path" = "/usr"; then
  30 +  LIBS="$LIBS -lmecab -lstdc++"
  31 +  else
  32    LIBS="$LIBS -L$path/lib -lstdc++ -lmecab"
  33 +  fi
  34    CFLAGS="$CFLAGS -I$path/include"
  35    AC_DEFINE([HAVE_CHARSET_japanese], [1], [Define if you want Japanese support])
  36    ADDCHARSETS="japanese"
  37 @@ -803,7 +811,7 @@
  38                         withval="/usr/local/mysql"
  39                 elif test -f /usr/include/mysql/mysql.h; then
  40                         MYSQL_INCDIR=/usr/include/mysql
  41 -                       MYSQL_LIBDIR=/usr/lib/mysql
  42 +                       MYSQL_LIBDIR=/usr/lib
  43                         withval="/usr"
  44                 elif test -f /usr/include/mysql.h; then
  45                         MYSQL_INCDIR=/usr/include
  46 @@ -838,7 +846,11 @@
  47                 fi
  48         fi
  49      MYSQL_INCLUDE="-I$MYSQL_INCDIR"
  50 +    if test "$MYSQL_LIBDIR" = "/usr/lib" ; then
  51 +       MYSQL_LFLAGS="-lmysqlclient"
  52 +    else
  53      MYSQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqlclient"
  54 +    fi
  55
  56      AC_DEFINE([HAVE_MYSQL], [1], [Define if you want to use MySQL])
  57      AC_MSG_RESULT($withval)
  58 @@ -877,8 +889,8 @@
  59                  test -f /usr/local/include/postgresql/libpq-fe.h && PGSQL_INCDIR=/usr/local/include/postgresql
  60                 test -f /usr/local/include/libpq-fe.h && PGSQL_INCDIR=/usr/local/include
  61                 PGSQL_LIBDIR=/usr/local/lib
  62 -               test -f /usr/lib/libpq.a && PGSQL_LIBDIR=/usr/lib
  63 -               test -f /usr/local/pgsql/lib/libpq.a && PGSQL_LIBDIR=/usr/local/pgsql/lib
  64 +               test -f /usr/lib/libpq.so -o -f /usr/lib/libpq.a && PGSQL_LIBDIR=/usr/lib
  65 +               test -f /usr/local/pgsql/lib/libpq.so -o -f /usr/local/pgsql/lib/libpq.a && PGSQL_LIBDIR=/usr/local/pgsql/lib
  66         else
  67                 PGSQL_INCDIR=$withval/include
  68                 test -d $withval/include/pgsql && PGSQL_INCDIR=$withval/include/pgsql
  69 @@ -886,7 +898,11 @@
  70                 test -d $withval/lib/pgsql && PGSQL_LIBDIR=$withval/lib/pgsql
  71         fi
  72      PGSQL_INCLUDE="-I$PGSQL_INCDIR"
  73 +    if test "$PGSQL_LIBDIR" = "/usr/lib"; then
  74 +           PGSQL_LFLAGS="-lpq"
  75 +    else
  76      PGSQL_LFLAGS="-L$PGSQL_LIBDIR -lpq"
  77 +    fi
  78      AC_DEFINE([HAVE_PGSQL], [1], [Define if you want to use PostgreSQL])
  79      AC_MSG_RESULT(yes)
  80      have_db=yes
  81 @@ -916,7 +932,7 @@
  82                            install directory, defaults to /usr/local.],
  83  [
  84         if test "$withval" = "yes"; then
  85 -               withval=/usr/local
  86 +               withval=/usr
  87         fi
  88
  89         if test "$withval" != "no"; then
  90 @@ -927,7 +943,11 @@
  91                         AC_MSG_RESULT(no)
  92                         AC_MSG_ERROR(Invalid iODBC directory - unable to find isql.h)
  93                 fi
  94 +               if test "$IODBC_LIBDIR" = "/usr/lib"; then
  95 +                       IODBC_LFLAGS="-liodbc"
  96 +               else
  97                 IODBC_LFLAGS="-L$IODBC_LIBDIR -liodbc"
  98 +               fi
  99                 IODBC_INCLUDE="-I$IODBC_INCDIR"
 100                 AC_DEFINE([HAVE_IODBC], [1], [Define if you want to use iODBC])
 101                 AC_MSG_RESULT(yes)
 102 @@ -954,12 +974,12 @@
 103  if test "$withval" != "no"; then
 104         if test "$withval" = "yes"; then
 105                 if test -f /usr/include/sql.h; then
 106 -                       UNIXODBC_INCDIR=/usr/include
 107 -                       UNIXODBC_LIBDIR=/usr/lib
 108 +                       UNIXODBC_INCLUDE=
 109 +                       UNIXODBC_LFLAGS="-lodbc"
 110                         withval="/usr"
 111                 elif test -f /usr/local/include/sql.h; then
 112 -                       UNIXODBC_INCDIR=/usr/local/include
 113 -                       UNIXODBC_LIBDIR=/usr/local/lib
 114 +                       UNIXODBC_INCLUDE="-I/usr/local/include"
 115 +                       UNIXODBC_LFLAGS="-L/usr/local/lib -lodbc"
 116                         withval="/usr/local"
 117                 else
 118                         AC_MSG_RESULT(no)
 119 @@ -967,16 +987,14 @@
 120                 fi
 121         else
 122                 if test -f $withval/include/sql.h; then
 123 -                       UNIXODBC_INCDIR=$withval/include
 124 -                       UNIXODBC_LIBDIR=$withval/lib
 125 +                       UNIXODBC_INCLUDE="-I$withval/include"
 126 +                       UNIXODBC_LFLAGS="-L$withval/lib -lodbc"
 127                 else
 128                         AC_MSG_RESULT(no)
 129                         AC_MSG_ERROR(Invalid unixODBC directory - unable to find sql.h)
 130                 fi
 131         fi
 132         have_db=yes
 133 -       UNIXODBC_LFLAGS="-L$UNIXODBC_LIBDIR -lodbc"
 134 -       UNIXODBC_INCLUDE="-I$UNIXODBC_INCDIR"
 135         AC_DEFINE([HAVE_UNIXODBC], [1], [Define if you want to use unixODBC])
 136         AC_MSG_RESULT($withval)
 137         if test "x$DBTYPE" = "x" ; then
 138 @@ -1272,7 +1290,11 @@
 139                         AC_MSG_RESULT(no)
 140                         AC_MSG_ERROR(Invalid Ct-Lib directory - unable to find ctpublic.h)
 141                 fi
 142 -               CTLIB_LFLAGS="-L$CTLIB_LIBDIR -lct -lcs -lsybtcl -lcomn -lintl"
 143 +               if test "$CTLIB_LIBDIR" = "/usr/lib"; then
 144 +                       CTLIB_LFLAGS="-lct -lcs -lsybtcl -lcomn"
 145 +               else
 146 +                       CTLIB_LFLAGS="-L$CTLIB_LIBDIR -lct -lcs -lsybtcl -lcomn -lintl"
 147 +               fi
 148                 CTLIB_INCLUDE="-I$CTLIB_INCDIR"
 149                 AC_DEFINE([HAVE_CTLIB], [1], [Define if you want to use CT-LIB SyBase SQL Server])
 150                 AC_MSG_RESULT(yes)
 151 @@ -1299,7 +1321,7 @@
 152                            install directory, defaults to /usr/local.],
 153  [
 154         if test "$withval" = "yes"; then
 155 -               withval=/usr/local
 156 +               withval=/usr
 157         fi
 158
 159         if test "$withval" != "no"; then
 160 @@ -1313,7 +1335,11 @@
 161                         AC_MSG_RESULT(no)
 162                         AC_MSG_ERROR(Invalid FreeTDS directory - unable to find ctpublic.h)
 163                 fi
 164 +               if test "$CTLIB_LFLAGS" = "/usr/lib"; then
 165 +                       CTLIB_LFLAGS="-lct"
 166 +               else
 167                 CTLIB_LFLAGS="-L$CTLIB_LIBDIR -lct"
 168 +               fi
 169                 CTLIB_INCLUDE="-I$CTLIB_INCDIR"
 170                 AC_DEFINE([HAVE_CTLIB], [1], [Define if you want to use CT-LIB SyBase SQL Server])
 171                 AC_MSG_RESULT(yes)
 172 @@ -1349,7 +1375,11 @@
 173                 if test -f $d/include/sqlite.h; then
 174                         SQLITE_INCDIR=$d/include
 175                         SQLITE_LIBDIR=$d/lib
 176 +                       if test "$d" = "/usr"; then
 177 +                               SQLITE_LFLAGS="-lsqlite"
 178 +                       else
 179                         SQLITE_LFLAGS="-L$SQLITE_LIBDIR -lsqlite"
 180 +                       fi
 181                         SQLITE_INCLUDE="-I$SQLITE_INCDIR"
 182                         path=$d
 183                         AC_MSG_RESULT($d)
 184 @@ -1394,7 +1424,11 @@
 185                 if test -f $d/include/sqlite3.h; then
 186                         SQLITE3_INCDIR=$d/include
 187                         SQLITE3_LIBDIR=$d/lib
 188 +                       if test "$d" = "/usr"; then
 189 +                       SQLITE3_LFLAGS="-lsqlite3"
 190 +                       else
 191                         SQLITE3_LFLAGS="-L$SQLITE3_LIBDIR -lsqlite3"
 192 +                       fi
 193                         SQLITE3_INCLUDE="-I$SQLITE3_INCDIR"
 194                         path=$d
 195                         AC_MSG_RESULT($d)