updates.

diff --git a/apps/irssi/autogen.sh b/apps/irssi/autogen.sh
index a8daf65207c8da3ce9428ac61e689105134fc7fd..849e0663c8a95478bf4e424b7c1f9605f29d9e3d 100755 (executable)
--- a/apps/irssi/autogen.sh
+++ b/apps/irssi/autogen.sh
@@ -37,7 +37,6 @@ cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!
 
 # .html -> .txt with lynx
 echo "Documentation: html -> txt..."
-lynx -dump -nolist docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
 
 echo "Checking auto* tools..."
 

diff --git a/apps/irssi/configure.in b/apps/irssi/configure.in
index 51ccc718191a0efe5bf14c766f03ccf124493645..85c6a8c19ee9731dbce33a70c6ec7ca06b3e7a76 100644 (file)
--- a/apps/irssi/configure.in
+++ b/apps/irssi/configure.in
@@ -183,6 +183,12 @@ AC_ARG_WITH(perl,
        fi,
        want_perl=static)
 
+AC_ARG_WITH(file-offset-size,
+[  --with-file-offset-size=BITS  Set size of file offsets. Usually 32 or 64.
+                          (default: 64 if available)],
+        preferred_off_t_bits=$withval,
+        preferred_off_t_bits=64)
+
 AC_ARG_ENABLE(ipv6,
 [  --enable-ipv6           Enable IPv6 support],
        if test x$enableval = xyes; then
@@ -245,35 +251,6 @@ AC_DEFINE(socklen_t, int, Define to 'int' if <sys/socket.h> doesn't define.)
 fi
 AC_MSG_RESULT($irssi_cv_type_socklen_t)
 
-dnl * off_t checks, try to make it 64bit
-AC_DEFINE_UNQUOTED(_FILE_OFFSET_BITS, $preferred_off_t_bits)
-
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(long long)
-
-if test $sizeof_off_t = 8; then
-  offt_64bit=yes
-else
-  offt_64bit=no
-fi
-                
-if test x$sizeof_off_t = x$ac_cv_sizeof_long; then
-  # try to use unsigned long always first
-  AC_DEFINE_UNQUOTED(PRIuUOFF_T, "lu")
-  AC_DEFINE(UOFF_T_LONG)
-elif test x$sizeof_off_t = x$ac_cv_sizeof_int; then
-  # next try int
-  AC_DEFINE_UNQUOTED(PRIuUOFF_T, "u")
-  AC_DEFINE(UOFF_T_INT)
-elif test x$sizeof_off_t = x$ac_cv_sizeof_long_long; then
-  # and finally long long
-  AC_DEFINE_UNQUOTED(PRIuUOFF_T, "llu")
-  AC_DEFINE(UOFF_T_LONG_LONG)
-else                    
-  AC_ERROR([Couldn't find integer type for off_t])
-fi
-
 dnl **
 dnl ** check for socks
 dnl **

diff --git a/apps/irssi/src/common.h b/apps/irssi/src/common.h
index b88cd9da9af7ddcbc1a7588f241f98862dda9384..6691da54d5e74fbb69b8784b6fba256be8945a61 100644 (file)
--- a/apps/irssi/src/common.h
+++ b/apps/irssi/src/common.h
@@ -59,7 +59,7 @@ typedef unsigned long uoff_t;
 #elif defined (UOFF_T_LONGLONG)
 typedef unsigned long long uoff_t;
 #else
-#  error uoff_t size not set
+typedef unsigned int uoff_t;
 #endif
 
 /* input functions */