1 diff -urN irssi-0.7.98.4.org/configure.in irssi-0.7.98.4/configure.in
2 --- irssi-0.7.98.4.org/configure.in Tue Sep 11 23:32:08 2001
3 +++ irssi-0.7.98.4/configure.in Tue Sep 11 23:53:17 2001
11 -dnl * ahem.. :) we don't want static libraries for modules
12 -if test "x$lt_target" = "x"; then
13 - if test "$target" = "NONE"; then
19 -dnl * --disable-static isn't a good idea, complain if it's used
20 -if test "x$enable_static" = "xno"; then
21 - AC_ERROR([Don't give --disable-static option to configure])
24 -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
25 -$libtool_flags --disable-static --output=libtool-shared --no-verify $ac_aux_dir/ltmain.sh $lt_target \
26 -|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
27 -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
28 -$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
29 -|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
32 AC_CHECK_HEADERS(string.h stdlib.h unistd.h dirent.h sys/ioctl.h libintl.h)
36 PROG_LIBS="$PROG_LIBS $GLIB_LIBS"
39 -dnl ** check if we can link dynamic libraries to modules
40 -dnl ** also checks if libraries are built to .libs dir
43 -AC_MSG_CHECKING([if we can link dynamic libraries with modules])
46 -dnl ** compile object file
47 -cat > conftest.c <<EOF
49 -int modfunc(void){return (int)floor(1.2);}
51 -./libtool --mode=compile $CC $CFLAGS -c conftest.c 2> /dev/null > /dev/null
52 -if test ! -s conftest.lo; then
53 - AC_ERROR([error compiling test module])
56 -dnl ** link to library
57 -./libtool --mode=link $CC $CFLAGS $LDFLAGS -rpath /usr/lib conftest.lo -lm -o libconftest.la > /dev/null
58 -if test ! -s .libs/libconftest.a; then
59 - AC_ERROR([error, can't even find .a library])
62 -dnl ** check if dynamic linking worked
63 -libfile=`grep ^library_names libconftest.la|$sedpath "s/library_names='\(.*\)'.*/\1/"|$sedpath 's/.* \([[^ ]]*\)$/\1/'`
64 -if test ! -s .libs/$libfile; then
65 - AC_MSG_RESULT([no, error linking test module])
67 - cat > conftest.c <<EOF
70 -GModule *m; int (*modfunc)(void);
71 -m = g_module_open(".libs/$libfile", 0);
72 -if (!m) g_print("error loading: %s", g_module_error());
73 -else if (!g_module_symbol(m, "modfunc", (gpointer *) &modfunc))
74 - g_print("modfunc() symbol not found from module");
75 -else if (modfunc() == 1) g_print("ok"); else g_print("wrong result?! 1 vs %d", modfunc());
78 - $CC $CFLAGS conftest.c -o conftest $GLIB_CFLAGS $GLIB_LIBS 2> /dev/null > /dev/null
79 - if test ! -s conftest; then
80 - AC_MSG_RESULT([no, error compiling test program])
82 - status="`./conftest`"
83 - if test "x$status" = "xok"; then
85 - AC_MSG_RESULT([yes])
87 - AC_MSG_RESULT([no, error running: $status])
91 -rm -rf conftest conftest.* libconftest.* .libs
96 diff -urN irssi-0.7.98.4.org/curses.m4 irssi-0.7.98.4/curses.m4
97 --- irssi-0.7.98.4.org/curses.m4 Tue Sep 11 23:32:09 2001
98 +++ irssi-0.7.98.4/curses.m4 Wed Sep 12 00:10:58 2001
100 AC_MSG_RESULT(Found ncurses on $1/$2)
103 - AC_CHECK_LIB(ncurses, initscr, [
105 + AC_CHECK_LIB(ncurses, initscr,, [
106 CHECKLIBS=`echo "$3"|sed 's/-lncurses/-lcurses/g'`
107 AC_CHECK_LIB(curses, initscr, [
108 CURSES_LIBS="$CHECKLIBS"