APPROVE COMMIT 21.5 This probably ought to go into 21.4; I don't know if it applies, though. Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.404 diff -u -U0 -r1.404 ChangeLog --- ChangeLog 14 May 2004 15:35:28 -0000 1.404 +++ ChangeLog 14 Jun 2004 10:37:28 -0000 ＠＠ -0,0 +1,8 ＠＠ +2004-05-20 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * configure.in (HAVE_GPM): Die if GPM requested but not found. + Index: configure.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v retrieving revision 1.225 diff -u -r1.225 configure.in --- configure.in 14 May 2004 15:35:31 -0000 1.225 +++ configure.in 14 Jun 2004 10:37:35 -0000 ＠＠ -4756,12 +4770,19 ＠＠ AC_DEFINE_UNQUOTED(CURSES_H_FILE, "${curses_h_file-curses.h}") AC_DEFINE_UNQUOTED(TERM_H_FILE, "${term_h_file-term.h}") - dnl Autodetect gpm - test -z "$with_gpm" && { AC_CHECK_HEADER(gpm.h, , with_gpm=no) } - test -z "$with_gpm" && { AC_CHECK_LIB(gpm, Gpm_Open, with_gpm=yes, with_gpm=no) } - if test "$with_gpm" = "yes"; then - AC_DEFINE(HAVE_GPM) - XE_PREPEND(-lgpm, LIBS) + dnl General Purpose Mouse (libgpm) support + if test "$with_gpm" != "no"; then + AC_CHECK_HEADER(gpm.h, [ + AC_CHECK_LIB(gpm, Gpm_Open, have_gpm=yes)]) + if test "$have_gpm" = "yes"; then + with_gpm=yes + AC_DEFINE(HAVE_GPM) + XE_PREPEND(-lgpm, LIBS) + else + test "$with_gpm" = "yes" && \ + XE_DIE("GPM requested, but gpm.h or libgpm seems to be missing.") + with_gpm=no + fi fi else dnl "$with_tty" = "no" -- Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.