User: stephent Date: 06/07/19 18:36:43 Modified: xemacs configure configure.ac ChangeLog Removed: xemacs configure.in configure.usage Log: Configure fixups. <87d5c15zbf.fsf(a)tleepslib.sk.tsukuba.ac.jp&gt; Revision Changes Path 1.284 +8 -8 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.283 retrieving revision 1.284 diff -u -p -r1.283 -r1.284 --- configure 2006/07/07 20:07:45 1.283 +++ configure 2006/07/19 16:36:30 1.284 ＠＠ -989,15 +989,15 ＠＠ Run-time path-searching options --with-late-packages=DIR Specify location of late/system packages (instead of default location; same as --with-system-packages). - --with-late-packages=DIR + --with-system-packages=DIR Specify location of late/system packages (instead of default location; same as --with-late-packages). --with-last-packages=DIR Specify location of last/legacy packages (instead of default location; same as --with-legacy-packages). - --with-late-packages=DIR + --with-legacy-packages=DIR Specify location of late/legacy packages (instead of - default location; same as --with-late-packages). + default location; same as --with-last-packages). --with-package-path=PATH Search path for package directories. --with-infopath=PATH Location of info directories ＠＠ -16478,7 +16478,7 ＠＠ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. + # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ ＠＠ -16486,7 +16486,7 ＠＠ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <X11/Xlib.h> +#include <X11/Intrinsic.h> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ＠＠ -16513,7 +16513,7 ＠＠ else sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then + if test -r "$ac_dir/X11/Intrinsic.h"; then ac_x_includes=$ac_dir break fi ＠＠ -16534,11 +16534,11 ＠＠ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <X11/Xlib.h> +#include <X11/Intrinsic.h> int main () { -XrmInitialize () +XtMalloc (0) ; return 0; } 1.46 +2 -2 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.45 retrieving revision 1.46 diff -u -p -r1.45 -r1.46 --- configure.ac 2006/07/07 20:07:45 1.45 +++ configure.ac 2006/07/19 16:36:35 1.46 ＠＠ -651,13 +651,13 ＠＠ XE_MERGED_ARG([late-packages], AS_HELP_STRING([--with-late-packages=DIR],[Specify location of late/system packages (instead of default location; same as --with-system-packages).]), [AC_DEFINE(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)], []) XE_MERGED_ARG([system-packages], - AS_HELP_STRING([--with-late-packages=DIR],[Specify location of late/system packages (instead of default location; same as --with-late-packages).]), + AS_HELP_STRING([--with-system-packages=DIR],[Specify location of late/system packages (instead of default location; same as --with-late-packages).]), [AC_DEFINE(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)], []) XE_MERGED_ARG([last-packages], AS_HELP_STRING([--with-last-packages=DIR],[Specify location of last/legacy packages (instead of default location; same as --with-legacy-packages).]), [AC_DEFINE(LAST_PACKAGE_DIRECTORIES_USER_DEFINED)], []) XE_MERGED_ARG([legacy-packages], - AS_HELP_STRING([--with-late-packages=DIR],[Specify location of late/legacy packages (instead of default location; same as --with-late-packages).]), + AS_HELP_STRING([--with-legacy-packages=DIR],[Specify location of late/legacy packages (instead of default location; same as --with-last-packages).]), [AC_DEFINE(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)], []) XE_MERGED_ARG([package-path], AS_HELP_STRING([--with-package-path=PATH],[Search path for package directories.]), 1.509 +7 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.508 retrieving revision 1.509 diff -u -p -r1.508 -r1.509 --- ChangeLog 2006/07/07 20:07:44 1.508 +++ ChangeLog 2006/07/19 16:36:37 1.509 ＠＠ -1,3 +1,10 ＠＠ +2006-07-20 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * configure.ac (system-packages,legacy-packages): Fix help strings. + + * configure.in: cvs remove. + * configure.usage: cvs remove. + 2006-06-20 Jerry James <james(a)xemacs.org&gt; * configure.ac: When gcc is used, capture the values of __GNUC__