Mercurial > hg > xemacs-beta

changeset 4557:790bd95b84c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with file:/Sources/xemacs-21.5-checked-out
author Aidan Kehoe <kehoea@parhasard.net>
date Tue, 13 May 2008 20:26:47 +0200
parents a1f8c5c250c2 (current diff) d9b9b5f90386 (diff)
children d9fcb5442c95
files
diffstat 10 files changed, 80 insertions(+), 70 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun May 11 19:50:49 2008 +0200
+++ b/ChangeLog	Tue May 13 20:26:47 2008 +0200
@@ -1,3 +1,10 @@
+2008-05-12  Michael Sperber  <mike@xemacs.org>
+
+	* configure.ac: 
+	A number of the checks that tried to determine whether an explicit
+	path was specified were wrong.
+	Also, add an AC_SUBST for INFOPATH.
+
 2008-05-07  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* configure.ac (XE_EXPAND_VARIABLE): Call AC_SUBST on
--- a/configure	Sun May 11 19:50:49 2008 +0200
+++ b/configure	Tue May 13 20:26:47 2008 +0200
@@ -779,6 +779,7 @@
 INFODIR
 infopath
 INFOPATH_USER_DEFINED
+INFOPATH
 early_packages
 EARLY_PACKAGE_DIRECTORIES_USER_DEFINED
 EARLY_PACKAGE_DIRECTORIES
@@ -4548,6 +4549,34 @@
     *) break ;;
   esac
 done
+exec_prefix_expanded=$exec_prefix
+while true; do
+  case "$exec_prefix_expanded" in
+    *\$* ) eval "exec_prefix_expanded=$exec_prefix_expanded" ;;
+    *) break ;;
+  esac
+done
+libdir_expanded=$libdir
+while true; do
+  case "$libdir_expanded" in
+    *\$* ) eval "libdir_expanded=$libdir_expanded" ;;
+    *) break ;;
+  esac
+done
+mandir_expanded=$mandir
+while true; do
+  case "$mandir_expanded" in
+    *\$* ) eval "mandir_expanded=$mandir_expanded" ;;
+    *) break ;;
+  esac
+done
+infodir_expanded=$infodir
+while true; do
+  case "$infodir_expanded" in
+    *\$* ) eval "infodir_expanded=$infodir_expanded" ;;
+    *) break ;;
+  esac
+done
 
 if test "x$datadir_expanded" != "x$prefix_expanded/share"
 then
@@ -4565,7 +4594,7 @@
 
 fi
 
-if test "x$lib_expanded" != "x$prefix_expanded/lib"
+if test "x$libdir_expanded" != "x$prefix_expanded/lib"
 then
   cat >>confdefs.h <<\_ACEOF
 #define MODULEDIR_USER_DEFINED 1
@@ -4581,51 +4610,7 @@
 
 fi
 
-exec_prefix_expanded=$exec_prefix
-while true; do
-  case "$exec_prefix_expanded" in
-    *\$* ) eval "exec_prefix_expanded=$exec_prefix_expanded" ;;
-    *) break ;;
-  esac
-done
-libdir_expanded=$libdir
-while true; do
-  case "$libdir_expanded" in
-    *\$* ) eval "libdir_expanded=$libdir_expanded" ;;
-    *) break ;;
-  esac
-done
-
-if test "x$libdir_expanded" != "x$exec_prefix_expanded/lib"
-then
-  cat >>confdefs.h <<\_ACEOF
-#define ARCHLIBDIR_USER_DEFINED 1
-_ACEOF
-
-fi
-
-mandir_expanded=$mandir
-while true; do
-  case "$mandir_expanded" in
-    *\$* ) eval "mandir_expanded=$mandir_expanded" ;;
-    *) break ;;
-  esac
-done
-
-if test "x$mandir_expanded" = "x$prefix_expanded/man"
-then
-  mandir='${datarootdir}/man/man1'
-fi
-
-infodir_expanded=$infodir
-while true; do
-  case "$infodir_expanded" in
-    *\$* ) eval "infodir_expanded=$infodir_expanded" ;;
-    *) break ;;
-  esac
-done
-
-if test "x$infodir_expanded" != "x${prefix_expanded}/info"
+if test "x$infodir_expanded" != "x${prefix_expanded}/share/info"
 then
   cat >>confdefs.h <<\_ACEOF
 #define INFODIR_USER_DEFINED 1
@@ -39134,6 +39119,7 @@
   esac
 done
 
+
 test -n "$with_user_packages" && with_early_packages=$with_user_packages
 early_packages=$with_early_packages
 
@@ -40576,6 +40562,7 @@
 INFODIR!$INFODIR$ac_delim
 infopath!$infopath$ac_delim
 INFOPATH_USER_DEFINED!$INFOPATH_USER_DEFINED$ac_delim
+INFOPATH!$INFOPATH$ac_delim
 early_packages!$early_packages$ac_delim
 EARLY_PACKAGE_DIRECTORIES_USER_DEFINED!$EARLY_PACKAGE_DIRECTORIES_USER_DEFINED$ac_delim
 EARLY_PACKAGE_DIRECTORIES!$EARLY_PACKAGE_DIRECTORIES$ac_delim
@@ -40632,7 +40619,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- a/configure.ac	Sun May 11 19:50:49 2008 +0200
+++ b/configure.ac	Tue May 13 20:26:47 2008 +0200
@@ -1068,6 +1068,10 @@
 
 XE_EXPAND_VARIABLE(prefix,prefix_expanded)
 XE_EXPAND_VARIABLE(datadir,datadir_expanded)
+XE_EXPAND_VARIABLE(exec_prefix,exec_prefix_expanded)
+XE_EXPAND_VARIABLE(libdir,libdir_expanded)
+XE_EXPAND_VARIABLE(mandir,mandir_expanded)
+XE_EXPAND_VARIABLE(infodir,infodir_expanded)
 
 if test "x$datadir_expanded" != "x$prefix_expanded/share"
 then
@@ -1076,31 +1080,14 @@
   AC_DEFINE(ETCDIR_USER_DEFINED)
 fi
 
-if test "x$lib_expanded" != "x$prefix_expanded/lib"
+if test "x$libdir_expanded" != "x$prefix_expanded/lib"
 then
   AC_DEFINE(MODULEDIR_USER_DEFINED)
   AC_DEFINE(ARCHLIBDIR_USER_DEFINED)
   AC_DEFINE(DOCDIR_USER_DEFINED)
 fi
 
-XE_EXPAND_VARIABLE(exec_prefix,exec_prefix_expanded)
-XE_EXPAND_VARIABLE(libdir,libdir_expanded)
-
-if test "x$libdir_expanded" != "x$exec_prefix_expanded/lib"
-then
-  AC_DEFINE(ARCHLIBDIR_USER_DEFINED)
-fi
-
-XE_EXPAND_VARIABLE(mandir,mandir_expanded)
-
-if test "x$mandir_expanded" = "x$prefix_expanded/man"
-then
-  mandir='${datarootdir}/man/man1'
-fi
-
-XE_EXPAND_VARIABLE(infodir,infodir_expanded)
-
-if test "x$infodir_expanded" != "x${prefix_expanded}/info"
+if test "x$infodir_expanded" != "x${prefix_expanded}/share/info"
 then
   AC_DEFINE(INFODIR_USER_DEFINED)
 else
@@ -5771,6 +5758,7 @@
 AC_SUBST(infopath,$with_infopath)
 AC_SUBST(INFOPATH_USER_DEFINED)
 XE_EXPAND_VARIABLE(with_info_path,INFOPATH)
+AC_SUBST(INFOPATH)
 
 test -n "$with_user_packages" && with_early_packages=$with_user_packages
 AC_SUBST(early_packages,$with_early_packages)
--- a/lib-src/ChangeLog	Sun May 11 19:50:49 2008 +0200
+++ b/lib-src/ChangeLog	Tue May 13 20:26:47 2008 +0200
@@ -1,3 +1,11 @@
+2008-05-13  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* make-docfile.c (scan_file):
+	Pass READ_BINARY to scan_lisp_file, scan_c_file; avoids an
+	assertion failure with Visual C++ 2005 Express Edition, and is
+	logically more coherent, given that our Lisp and C files are saved
+	with Unix line endings. 
+
 2007-08-27  Mike Sperber  <mike@xemacs.org>
 
 	* config.values.in (datarootdir):  Add.
--- a/lib-src/make-docfile.c	Sun May 11 19:50:49 2008 +0200
+++ b/lib-src/make-docfile.c	Tue May 13 20:26:47 2008 +0200
@@ -306,12 +306,12 @@
   else if (ellcc == 0 && len > 3 && !strcmp (filename + len - 3, ".el"))
     {
       Current_file_type = el_file;
-      return scan_lisp_file (filename, READ_TEXT);
+      return scan_lisp_file (filename, READ_BINARY);
     }
   else
     {
       Current_file_type = c_file;
-      return scan_c_file (filename, READ_TEXT);
+      return scan_c_file (filename, READ_BINARY);
     }
 }
 
--- a/nt/ChangeLog	Sun May 11 19:50:49 2008 +0200
+++ b/nt/ChangeLog	Tue May 13 20:26:47 2008 +0200
@@ -1,3 +1,8 @@
+2008-05-13  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* xemacs.mak (PROGRAM_DEFINES): 
+	Provide SHEBANG_PROGNAME on Win32 too. 
+
 2008-01-25  Michael Sperber  <mike@xemacs.org>
 
 	* xemacs.mak (version.sh): Generate version.sh via Mercurial.
--- a/nt/xemacs.mak	Sun May 11 19:50:49 2008 +0200
+++ b/nt/xemacs.mak	Tue May 13 20:26:47 2008 +0200
@@ -427,6 +427,7 @@
 	-DPATH_VERSION=\"$(INFODOCK_VERSION_STRING)\"		\
 	-DPATH_PROGNAME=\"infodock\" 				\
 	-DEMACS_PROGNAME=\"infodock\"				\
+	-DSHEBANG_PROGNAME=\"infodock-script\"			\
 	-DEMACS_VERSION=\"$(INFODOCK_VERSION_STRING)\"		\
 	-DINFODOCK_MAJOR_VERSION=$(infodock_major_version)	\
 	-DINFODOCK_MINOR_VERSION=$(infodock_minor_version)	\
@@ -444,7 +445,7 @@
 	-DPATH_VERSION=\"$(XEMACS_VERSION_STRING)\"		\
 	-DPATH_PROGNAME=\"xemacs\"				\
 	-DEMACS_VERSION=\"$(XEMACS_VERSION_STRING)\"		\
-	-DEMACS_PROGNAME=\"xemacs\"
+	-DEMACS_PROGNAME=\"xemacs\" -DSHEBANG_PROGNAME=\"xemacs-script\"
 !endif
 
 ########################### Set up installation and package directories.
--- a/src/ChangeLog	Sun May 11 19:50:49 2008 +0200
+++ b/src/ChangeLog	Tue May 13 20:26:47 2008 +0200
@@ -1,3 +1,16 @@
+2008-05-13  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* emacs.c (SHEBANG_EXE_PROGNAME_LENGTH):
+	Use WEXTSTRING separately on the two concatenated strings,
+	avoiding an error on Win32. 
+
+2008-05-13  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* config.h.in (_CRT_NONSTDC_NO_DEPRECATE): 
+	Define this, to avoid warnings about using standard POSIX and C9X
+	functions on Win32; fixes part of Matthew Persico's problems of
+	9ea6aaa80805081832r1a3308e9wb6d2bfea7457379f@mail.gmail.com .
+
 2008-01-20  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* config.h.in: Add SHEBANG_PROGNAME.
--- a/src/config.h.in	Sun May 11 19:50:49 2008 +0200
+++ b/src/config.h.in	Tue May 13 20:26:47 2008 +0200
@@ -875,6 +875,7 @@
    "deprecated" in favor of Microsoft-specific "secure" ones (!)
    This must go *before* the inclusion of any system files. */
 #define _CRT_SECURE_NO_DEPRECATE
+#define _CRT_NONSTDC_NO_DEPRECATE
 #endif
 
 /* alloca twiddling.
--- a/src/emacs.c	Sun May 11 19:50:49 2008 +0200
+++ b/src/emacs.c	Tue May 13 20:26:47 2008 +0200
@@ -958,7 +958,7 @@
 #define SHEBANG_PROGNAME_LENGTH                                         \
   (int)((sizeof (WEXTSTRING (SHEBANG_PROGNAME)) - sizeof (WEXTSTRING (""))))
 #define SHEBANG_EXE_PROGNAME_LENGTH                                     \
-  (int)(sizeof (WEXTSTRING (SHEBANG_PROGNAME ".exe"))                   \
+  (int)(sizeof (WEXTSTRING (SHEBANG_PROGNAME) WEXTSTRING(".exe"))       \
         - sizeof (WEXTSTRING ("")))
 
   {