- updated for 3.3.7

Changed files:
    mnogosearch-acfixes.patch -> 1.5
    mnogosearch-as_needed-fix.patch -> 1.3

diff --git a/mnogosearch-acfixes.patch b/mnogosearch-acfixes.patch
index 73fb3e5d38b122dbf5f2c64684dd5006c715e2d8..34f205d6fa557539404d890c4b5e9bcb08b0bdba 100644 (file)
--- a/mnogosearch-acfixes.patch
+++ b/mnogosearch-acfixes.patch
@@ -1,6 +1,6 @@
---- mnogosearch-3.2.39/configure.in.orig       2006-05-28 13:48:13.000000000 +0200
-+++ mnogosearch-3.2.39/configure.in    2006-08-24 15:44:28.655971000 +0200
-@@ -629,7 +629,7 @@
+--- mnogosearch-3.3.7/configure.in.orig        2007-12-07 11:30:37.000000000 +0100
++++ mnogosearch-3.3.7/configure.in     2008-09-17 23:32:30.415625393 +0200
+@@ -687,7 +687,7 @@
                  else
                          SSL_INCDIR=/usr/local/ssl/include
                  fi
@@ -9,7 +9,7 @@
                          SSL_LIBDIR=/usr/lib
                  else
                          SSL_LIBDIR=/usr/local/ssl/lib
-@@ -738,7 +738,11 @@
+@@ -834,7 +834,11 @@
  
    AC_MSG_RESULT($path)
    CHASEN_INCLUDE="-I$path/include"
@@ -22,7 +22,7 @@
    AC_DEFINE([HAVE_CHARSET_japanese], [1], [Define if you want Japanese support])
    ADDCHARSETS="japanese"
  ],
-@@ -771,7 +775,11 @@
+@@ -867,7 +871,11 @@
    fi
  
    AC_MSG_RESULT($path)
@@ -34,16 +34,16 @@
    CFLAGS="$CFLAGS -I$path/include"
    AC_DEFINE([HAVE_CHARSET_japanese], [1], [Define if you want Japanese support])
    ADDCHARSETS="japanese"
-@@ -803,7 +811,7 @@
+@@ -899,7 +907,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
-@@ -838,7 +846,11 @@
+               elif test -f /usr/local/mysql/include/mysql.h; then
+                       MYSQL_INCDIR=/usr/local/mysql/include/
+@@ -938,7 +946,11 @@
                fi
        fi
      MYSQL_INCLUDE="-I$MYSQL_INCDIR"
@@ -55,7 +55,7 @@
  
      AC_DEFINE([HAVE_MYSQL], [1], [Define if you want to use MySQL])
      AC_MSG_RESULT($withval)
-@@ -877,8 +889,8 @@
+@@ -977,8 +989,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
@@ -66,7 +66,7 @@
        else
                PGSQL_INCDIR=$withval/include
                test -d $withval/include/pgsql && PGSQL_INCDIR=$withval/include/pgsql
-@@ -886,7 +898,11 @@
+@@ -986,7 +998,11 @@
                test -d $withval/lib/pgsql && PGSQL_LIBDIR=$withval/lib/pgsql
        fi
      PGSQL_INCLUDE="-I$PGSQL_INCDIR"
@@ -78,7 +78,7 @@
      AC_DEFINE([HAVE_PGSQL], [1], [Define if you want to use PostgreSQL])
      AC_MSG_RESULT(yes)
      have_db=yes
-@@ -916,7 +932,7 @@
+@@ -1016,7 +1032,7 @@
                            install directory, defaults to /usr/local.],
  [
        if test "$withval" = "yes"; then
@@ -87,7 +87,7 @@
        fi
  
        if test "$withval" != "no"; then
-@@ -927,7 +943,11 @@
+@@ -1027,7 +1043,11 @@
                        AC_MSG_RESULT(no)
                        AC_MSG_ERROR(Invalid iODBC directory - unable to find isql.h)
                fi
@@ -99,7 +99,7 @@
                IODBC_INCLUDE="-I$IODBC_INCDIR"
                AC_DEFINE([HAVE_IODBC], [1], [Define if you want to use iODBC])
                AC_MSG_RESULT(yes)
-@@ -954,12 +974,12 @@
+@@ -1054,12 +1074,12 @@
  if test "$withval" != "no"; then
        if test "$withval" = "yes"; then
                if test -f /usr/include/sql.h; then
@@ -116,7 +116,7 @@
                        withval="/usr/local"
                else
                        AC_MSG_RESULT(no)
-@@ -967,16 +987,14 @@
+@@ -1067,16 +1087,14 @@
                fi
        else
                if test -f $withval/include/sql.h; then
@@ -135,20 +135,25 @@
        AC_DEFINE([HAVE_UNIXODBC], [1], [Define if you want to use unixODBC])
        AC_MSG_RESULT($withval)
        if test "x$DBTYPE" = "x" ; then
-@@ -1272,7 +1290,11 @@
-                       AC_MSG_RESULT(no)
+@@ -1378,9 +1396,17 @@
                        AC_MSG_ERROR(Invalid Ct-Lib directory - unable to find ctpublic.h)
                fi
--              CTLIB_LFLAGS="-L$CTLIB_LIBDIR -lct -lcs -lsybtcl -lcomn -lintl"
-+              if test "$CTLIB_LIBDIR" = "/usr/lib"; then
-+                      CTLIB_LFLAGS="-lct -lcs -lsybtcl -lcomn"
-+              else
-+                      CTLIB_LFLAGS="-L$CTLIB_LIBDIR -lct -lcs -lsybtcl -lcomn -lintl"
-+              fi
+               if test -f $withval/lib/libsybct.a; then
++                      if test "$CTLIB_LIBDIR" = "/usr/lib"; then
++                              CTLIB_LFLAGS="-lsybct -lsybcs -lsybtcl -lsybcomn -lsybintl -lsybunic"
++                      else
+                       CTLIB_LFLAGS="-L$CTLIB_LIBDIR -lsybct -lsybcs -lsybtcl -lsybcomn -lsybintl -lsybunic"
++                      fi
+               else
++                      if test "$CTLIB_LIBDIR" = "/usr/lib"; then
++                              CTLIB_LFLAGS="-lct -lcs -lsybtcl -lcomn -lintl"
++                      else
+                       CTLIB_LFLAGS="-L$CTLIB_LIBDIR -lct -lcs -lsybtcl -lcomn -lintl"
++                      fi
+               fi
                CTLIB_INCLUDE="-I$CTLIB_INCDIR"
                AC_DEFINE([HAVE_CTLIB], [1], [Define if you want to use CT-LIB SyBase SQL Server])
-               AC_MSG_RESULT(yes)
-@@ -1299,7 +1321,7 @@
+@@ -1408,7 +1434,7 @@
                            install directory, defaults to /usr/local.],
  [
        if test "$withval" = "yes"; then
@@ -157,7 +162,7 @@
        fi
  
        if test "$withval" != "no"; then
-@@ -1313,7 +1335,11 @@
+@@ -1422,7 +1448,11 @@
                        AC_MSG_RESULT(no)
                        AC_MSG_ERROR(Invalid FreeTDS directory - unable to find ctpublic.h)
                fi
@@ -169,7 +174,7 @@
                CTLIB_INCLUDE="-I$CTLIB_INCDIR"
                AC_DEFINE([HAVE_CTLIB], [1], [Define if you want to use CT-LIB SyBase SQL Server])
                AC_MSG_RESULT(yes)
-@@ -1349,7 +1375,11 @@
+@@ -1458,7 +1488,11 @@
                if test -f $d/include/sqlite.h; then
                        SQLITE_INCDIR=$d/include
                        SQLITE_LIBDIR=$d/lib
@@ -181,7 +186,7 @@
                        SQLITE_INCLUDE="-I$SQLITE_INCDIR"               
                        path=$d
                        AC_MSG_RESULT($d)
-@@ -1394,7 +1424,11 @@
+@@ -1503,7 +1537,11 @@
                if test -f $d/include/sqlite3.h; then
                        SQLITE3_INCDIR=$d/include
                        SQLITE3_LIBDIR=$d/lib

diff --git a/mnogosearch-as_needed-fix.patch b/mnogosearch-as_needed-fix.patch
index 306be320121679574cb28923a616f648157c6e14..1f0285f92302dba1e83bf04b2467ec437ae6d995 100644 (file)
--- a/mnogosearch-as_needed-fix.patch
+++ b/mnogosearch-as_needed-fix.patch
@@ -1,14 +1,52 @@
---- mnogosearch-3.2.39/src/Makefile.am.orig    2006-05-25 07:26:12.000000000 +0200
-+++ mnogosearch-3.2.39/src/Makefile.am 2006-08-24 15:45:56.845971000 +0200
-@@ -38,9 +38,9 @@
- mirror.c sqldbms.c chinese.c parsexml.c wild.c hash.c \
+--- mnogosearch-3.3.7/src/Makefile.am.orig     2007-09-01 17:52:27.000000000 +0200
++++ mnogosearch-3.3.7/src/Makefile.am  2008-09-18 20:03:05.211613660 +0200
+@@ -38,9 +38,25 @@
+ mirror.c sqldbms.c chinese.c parsexml.c wild.c hash.c segment.c \
  sql-mysql.c sql-oracle.c sql-ibase.c sql-pgsql.c
  EXTRA_libmnogosearch_la_SOURCES = efence.c ef_page.c ef_print.c
 -libmnogosearch_la_LIBADD = @efOBJ@ -L. -L.libs -lmnogocharset
-+libmnogosearch_la_LIBADD = @efOBJ@ -L. libmnogocharset.la
- libmnogosearch_la_LDFLAGS = -release 3.2
++libmnogosearch_la_LIBADD = @efOBJ@ libmnogocharset.la \
++      @VIRT_LFLAGS@ \
++      @SOLID_LFLAGS@ \
++      @UNIXODBC_LFLAGS@ \
++      @DB2_LFLAGS@ \
++      @IODBC_LFLAGS@ \
++      @EASYSOFT_LFLAGS@ \
++      @MYSQL_LFLAGS@ \
++      @PGSQL_LFLAGS@ \
++      @IBASE_LFLAGS@ \
++      @CTLIB_LFLAGS@ \
++      @SQLITE_LFLAGS@ \
++      @SQLITE3_LFLAGS@ \
++      @ORACLE8_LFLAGS@ \
++      @SAPDB_LFLAGS@ \
++      @SSL_LFLAGS@ \
++      @CHASEN_LFLAGS@
+ libmnogosearch_la_LDFLAGS = -release 3.3
 -libmnogosearch_la_DEPENDENCIES = libmnogocharset.la @efOBJ@
 +libmnogosearch_la_DEPENDENCIES = @efOBJ@
  
  libmnogocharset_la_SOURCES = uconv.c unidata.c sgml.c unicode.c \
  uconv-8bit.c uconv-alias.c uconv-big5.c uconv-eucjp.c uconv-euckr.c \
+@@ -75,20 +91,4 @@
+ @CHASEN_INCLUDE@
+ 
+ LIBS = @STATIC_LFLAGS@ \
+-@LIBS@ \
+-@VIRT_LFLAGS@ \
+-@SOLID_LFLAGS@ \
+-@UNIXODBC_LFLAGS@ \
+-@DB2_LFLAGS@ \
+-@IODBC_LFLAGS@ \
+-@EASYSOFT_LFLAGS@ \
+-@MYSQL_LFLAGS@ \
+-@PGSQL_LFLAGS@ \
+-@IBASE_LFLAGS@ \
+-@CTLIB_LFLAGS@ \
+-@SQLITE_LFLAGS@ \
+-@SQLITE3_LFLAGS@ \
+-@ORACLE8_LFLAGS@ \
+-@SAPDB_LFLAGS@ \
+-@SSL_LFLAGS@ \
+-@CHASEN_LFLAGS@
++@LIBS@