Mercurial > hg > xemacs-beta
changeset 2128:3c2d928e17ad
[xemacs-hg @ 2004-06-14 11:01:20 by stephent]
wording nits in configure.in <871xkixw8h.fsf@tleepslib.sk.tsukuba.ac.jp>
die if user request can't work <87wu2awhh3.fsf@tleepslib.sk.tsukuba.ac.jp>
don't mix toolkits <87smcywh54.fsf@tleepslib.sk.tsukuba.ac.jp>
do missing commits <87u0zgwfhi.fsf@tleepslib.sk.tsukuba.ac.jp>
<867jxiqihl.fsf@comcast.net>
| author | stephent |
|---|---|
| date | Mon, 14 Jun 2004 11:01:21 +0000 |
| parents | 4657b5a54253 |
| children | ee04e84d7cd5 |
| files | ChangeLog Makefile.in.in configure.in |
| diffstat | 3 files changed, 48 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jun 14 10:24:45 2004 +0000 +++ b/ChangeLog Mon Jun 14 11:01:21 2004 +0000 @@ -1,3 +1,16 @@ +2004-06-14 Stephen J. Turnbull <stephen@xemacs.org> + + * configure.in (Autodetection of Gdk libraries and includes): + Don't allow mixing of GTK with other toolkits. + +2004-06-12 Stephen J. Turnbull <stephen@xemacs.org> + + * configure.in: Improve style of WARNINGs. + +2004-05-20 Stephen J. Turnbull <stephen@xemacs.org> + + * configure.in (HAVE_GPM): Die if GPM requested but not found. + 2004-05-10 Jerry James <james@xemacs.org> * aclocal.m4: Typo fix.
--- a/Makefile.in.in Mon Jun 14 10:24:45 2004 +0000 +++ b/Makefile.in.in Mon Jun 14 11:01:21 2004 +0000 @@ -456,7 +456,7 @@ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \ chmod 0644 ${mandir}/$${page}${manext} ; \ done - @echo "If you would like to save approximately 2M of disk space, do" + @echo "If you would like to save approximately 4M of disk space, do" @echo "make gzip-el" @echo "or you may run " @echo ${srcdir}/lib-src/gzip-el.sh lispdir " from the command line."
--- a/configure.in Mon Jun 14 10:24:45 2004 +0000 +++ b/configure.in Mon Jun 14 11:01:21 2004 +0000 @@ -1763,7 +1763,7 @@ AC_DEFINE(_XOPEN_SOURCE,500) AC_DEFINE(_XOPEN_SOURCE_EXTENDED) ;; - freebsd4.9) + freebsd4.[5-9]) AC_DEFINE(_POSIX_C_SOURCE,199506L) dnl #### Do we want these too? Apparently yes for _XOPEN_SOURCE=500. AC_DEFINE(_XOPEN_SOURCE,500) @@ -2923,10 +2923,24 @@ window_system=gtk with_gtk=yes - with_x11=no + if test "$with_x11" != "no"; then + AC_MSG_WARN([Configuring GTK, forcing with_x11 to no]) + with_x11=no + fi + + for feature in scrollbars toolbars menubars dialogs widgets + do + eval "feature_value=\${with_${feature}}" + case "${feature_value}" in + yes|no|gtk|"" ) + ;; + * ) + AC_MSG_WARN([${feature_value} requested for ${feature}, forcing to gtk]) ;; + esac + done test "${with_scrollbars}" != "no" && with_scrollbars=gtk - test "${with_toolbars}" != no && with_toolbars=gtk + test "${with_toolbars}" != "no" && with_toolbars=gtk test "${with_menubars}" != "no" && with_menubars=gtk test "${with_dialogs}" != "no" && with_dialogs=gtk test "${with_widgets}" != "no" && with_widgets=gtk @@ -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" @@ -5554,19 +5575,19 @@ echo " WARNING: ---------------------------------------------------------" echo " WARNING: This tends to trigger compiler bugs, especially when" echo " WARNING: combined with MULE and ERROR_CHECKING. Crashes have" - echo " WARNING: been seen with various versions of GCC, and recently" - echo " WARNING: with Visual C++ as well." + echo " WARNING: been seen with various versions of GCC (up to about 2.95)," + echo " WARNING: and recently with Visual C++ as well (mid-2003)." + echo " WARNING: More recent versions may be safer, or not." echo " WARNING: ---------------------------------------------------------" fi -test "$use_union_type" = yes && echo " WARNING: Use of the union type may cause crashes due to compiler bugs." test "$use_kkcc" = yes && echo " Using the new GC algorithms." test "$pdump" = yes && echo " Using the new portable dumper." test "$debug" = yes && echo " Compiling in support for extra debugging code." test "$usage_tracking" = yes && echo " Compiling in support for active usage tracking (Sun internal)." if test "$error_check_extents $error_check_types $error_check_text $error_check_gc $error_check_malloc $error_check_glyphs $error_check_byte_code $error_check_display $error_check_structures" \ != "no no no no no no no no no"; then + echo " Compiling in support for runtime error checking." echo " WARNING: ---------------------------------------------------------" - echo " WARNING: Compiling in support for runtime error checking." echo " WARNING: XEmacs will run noticeably more slowly as a result." echo " WARNING: Error checking is on by default for XEmacs beta releases." echo " WARNING: ---------------------------------------------------------"