1 --- fvwm-2.5.0/configure.in~ Sat Nov 23 02:40:14 2002
2 +++ fvwm-2.5.0/configure.in Sat Nov 23 02:43:20 2002
5 dnl Check for standard functions that we have replacements for.
6 AC_REPLACE_FUNCS(gethostname strcasecmp strncasecmp strdup strerror usleep atexit)
10 dnl If we do not have atexit(), then check for on_exit()
11 if test $ac_cv_func_atexit = no; then
12 --- fvwm-2.5.0/configure.in~ Sat Nov 23 02:59:52 2002
13 +++ fvwm-2.5.0/configure.in Sat Nov 23 03:05:17 2002
16 problem_readline=": Both termcap and ncurses disabled"
18 -smr_ARG_WITHLIB(termcap, , to accomplish readline)
19 -if test "$with_termcap" != "no"; then
20 - dnl Forget cached values, so user can re-run configure
21 - $UNSET ac_cv_header_readline_history_h
22 - $UNSET ac_cv_lib_readline_readline
23 - AC_MSG_CHECKING([with termcap])
24 - smr_CHECK_LIB(readline, , line editing/history, readline, readline/history.h,
26 - if test "$readline_LIBS"; then
28 - readline_LIBS="$readline_LIBS $termcap_LIBS"
29 - AC_DEFINE(HAVE_READLINE)
32 smr_ARG_WITHLIB(ncurses, , to accomplish readline)
33 if test "$with_ncurses" != "no" -a ! "$readline_LIBS"; then
34 - # We couldn't use readline with termcap; try with ncurses?
35 - dnl Doesn't this seem a hacky way to do this??
36 dnl unset cached values from last check...
37 $UNSET ac_cv_header_readline_history_h
38 $UNSET ac_cv_lib_readline_readline
39 --- fvwm-2.5.0/libs/Makefile.am~ Tue Oct 9 22:05:40 2001
40 +++ fvwm-2.5.0/libs/Makefile.am Sat Nov 23 03:24:20 2002
42 XError.c fvwmsignal.c GetFont.c Strings.c wild.c safemalloc.c \
43 Pointer.c debug.c Grab.c ClientMsg.c fvwmrect.c Cursor.c
45 -libfvwm_a_LIBADD = @LIBOBJS@ @ALLOCA@
46 +## libfvwm_a_LIBADD = @LIBOBJS@ @ALLOCA@
48 INCLUDES = -I$(top_srcdir) $(xpm_CFLAGS) $(X_CFLAGS)