Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
9411886d
Commit
9411886d
authored
Feb 24, 2011
by
Paul Eggert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Regenerate.
parent
b1894766
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
79 additions
and
10 deletions
+79
-10
ChangeLog
ChangeLog
+5
-0
configure
configure
+26
-8
lib/Makefile.in
lib/Makefile.in
+8
-0
lib/getopt_int.h
lib/getopt_int.h
+1
-1
lib/gnulib.mk
lib/gnulib.mk
+4
-0
lib/stdlib.in.h
lib/stdlib.in.h
+30
-0
m4/stdlib_h.m4
m4/stdlib_h.m4
+5
-1
No files found.
ChangeLog
View file @
9411886d
2011-02-25 Paul Eggert <eggert@cs.ucla.edu>
* configure, lib/Makefile.in, lib/getopt_int.h, lib/gnulib.mk:
* lib/stdlib.in.h, m4/stdlib_h.m4: Regenerate.
2011-02-24 Glenn Morris <rgm@gnu.org>
* configure.in: Replace obsolete AC_OUTPUT() with AC_CONFIG_FILES(),
...
...
configure
View file @
9411886d
...
...
@@ -874,6 +874,7 @@ GNULIB_DUP2
GNULIB_CLOSE
GNULIB_CHOWN
GETLOADAVG_LIBS
REPLACE_WCTOMB
REPLACE_UNSETENV
REPLACE_STRTOD
REPLACE_SETENV
...
...
@@ -881,6 +882,7 @@ REPLACE_REALPATH
REPLACE_REALLOC
REPLACE_PUTENV
REPLACE_MKSTEMP
REPLACE_MBTOWC
REPLACE_MALLOC
REPLACE_CANONICALIZE_FILE_NAME
REPLACE_CALLOC
...
...
@@ -909,6 +911,7 @@ HAVE_DECL_GETLOADAVG
HAVE_CANONICALIZE_FILE_NAME
HAVE_ATOLL
HAVE__EXIT
GNULIB_WCTOMB
GNULIB_UNSETENV
GNULIB_UNLOCKPT
GNULIB_SYSTEM_POSIX
...
...
@@ -927,6 +930,7 @@ GNULIB_MKSTEMP
GNULIB_MKOSTEMPS
GNULIB_MKOSTEMP
GNULIB_MKDTEMP
GNULIB_MBTOWC
GNULIB_MALLOC_POSIX
GNULIB_GRANTPT
GNULIB_GETSUBOPT
...
...
@@ -13780,6 +13784,7 @@ _ACEOF
GNULIB_GETSUBOPT=0;
GNULIB_GRANTPT=0;
GNULIB_MALLOC_POSIX=0;
GNULIB_MBTOWC=0;
GNULIB_MKDTEMP=0;
GNULIB_MKOSTEMP=0;
GNULIB_MKOSTEMPS=0;
...
...
@@ -13798,6 +13803,7 @@ _ACEOF
GNULIB_SYSTEM_POSIX=0;
GNULIB_UNLOCKPT=0;
GNULIB_UNSETENV=0;
GNULIB_WCTOMB=0;
HAVE__EXIT=1;
HAVE_ATOLL=1;
HAVE_CANONICALIZE_FILE_NAME=1;
...
...
@@ -13826,6 +13832,7 @@ _ACEOF
REPLACE_CALLOC=0;
REPLACE_CANONICALIZE_FILE_NAME=0;
REPLACE_MALLOC=0;
REPLACE_MBTOWC=0;
REPLACE_MKSTEMP=0;
REPLACE_PUTENV=0;
REPLACE_REALLOC=0;
...
...
@@ -13833,6 +13840,7 @@ _ACEOF
REPLACE_SETENV=0;
REPLACE_STRTOD=0;
REPLACE_UNSETENV=0;
REPLACE_WCTOMB=0;
GNULIB_CHOWN=0;
...
...
@@ -19249,7 +19257,15 @@ test "${exec_prefix}" != NONE &&
ac_config_files="$ac_config_files Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile test/automated/Makefile"
ac_config_commands="$ac_config_commands default"
ac_config_commands="$ac_config_commands mkdirs"
ac_config_commands="$ac_config_commands epaths"
ac_config_commands="$ac_config_commands gdbinit"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
...
...
@@ -20034,7 +20050,9 @@ do
"lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;;
"leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;;
"test/automated/Makefile") CONFIG_FILES="$CONFIG_FILES test/automated/Makefile" ;;
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"mkdirs") CONFIG_COMMANDS="$CONFIG_COMMANDS mkdirs" ;;
"epaths") CONFIG_COMMANDS="$CONFIG_COMMANDS epaths" ;;
"gdbinit") CONFIG_COMMANDS="$CONFIG_COMMANDS gdbinit" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
...
...
@@ -20764,21 +20782,20 @@ $as_echo X"$file" |
done
}
;;
"default":C)
### Make the necessary directories, if they don't exist.
"mkdirs":C)
for dir in etc lisp ; do
test -d ${dir} || mkdir ${dir}
done
;;
"epaths":C)
echo creating src/epaths.h
${MAKE-make} epaths-force
;;
"gdbinit":C)
if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then
echo creating src/.gdbinit
echo source $srcdir/src/.gdbinit > src/.gdbinit
fi
;;
esac
...
...
@@ -20818,3 +20835,4 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
lib/Makefile.in
View file @
9411886d
...
...
@@ -179,6 +179,7 @@ GNULIB_LINKAT = @GNULIB_LINKAT@
GNULIB_LSEEK
=
@GNULIB_LSEEK@
GNULIB_LSTAT
=
@GNULIB_LSTAT@
GNULIB_MALLOC_POSIX
=
@GNULIB_MALLOC_POSIX@
GNULIB_MBTOWC
=
@GNULIB_MBTOWC@
GNULIB_MKDIRAT
=
@GNULIB_MKDIRAT@
GNULIB_MKDTEMP
=
@GNULIB_MKDTEMP@
GNULIB_MKFIFO
=
@GNULIB_MKFIFO@
...
...
@@ -225,6 +226,7 @@ GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@
GNULIB_UNSETENV
=
@GNULIB_UNSETENV@
GNULIB_USLEEP
=
@GNULIB_USLEEP@
GNULIB_UTIMENSAT
=
@GNULIB_UTIMENSAT@
GNULIB_WCTOMB
=
@GNULIB_WCTOMB@
GNULIB_WRITE
=
@GNULIB_WRITE@
GNULIB__EXIT
=
@GNULIB__EXIT@
GNU_OBJC_CFLAGS
=
@GNU_OBJC_CFLAGS@
...
...
@@ -452,6 +454,7 @@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
REPLACE_LSEEK
=
@REPLACE_LSEEK@
REPLACE_LSTAT
=
@REPLACE_LSTAT@
REPLACE_MALLOC
=
@REPLACE_MALLOC@
REPLACE_MBTOWC
=
@REPLACE_MBTOWC@
REPLACE_MKDIR
=
@REPLACE_MKDIR@
REPLACE_MKFIFO
=
@REPLACE_MKFIFO@
REPLACE_MKNOD
=
@REPLACE_MKNOD@
...
...
@@ -478,6 +481,7 @@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
REPLACE_UNSETENV
=
@REPLACE_UNSETENV@
REPLACE_USLEEP
=
@REPLACE_USLEEP@
REPLACE_UTIMENSAT
=
@REPLACE_UTIMENSAT@
REPLACE_WCTOMB
=
@REPLACE_WCTOMB@
REPLACE_WRITE
=
@REPLACE_WRITE@
RSVG_CFLAGS
=
@RSVG_CFLAGS@
RSVG_LIBS
=
@RSVG_LIBS@
...
...
@@ -1001,6 +1005,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e
's|@''GNULIB_GETSUBOPT''@|
$(GNULIB_GETSUBOPT)
|g'
\
-e
's|@''GNULIB_GRANTPT''@|
$(GNULIB_GRANTPT)
|g'
\
-e
's|@''GNULIB_MALLOC_POSIX''@|
$(GNULIB_MALLOC_POSIX)
|g'
\
-e
's|@''GNULIB_MBTOWC''@|
$(GNULIB_MBTOWC)
|g'
\
-e
's|@''GNULIB_MKDTEMP''@|
$(GNULIB_MKDTEMP)
|g'
\
-e
's|@''GNULIB_MKOSTEMP''@|
$(GNULIB_MKOSTEMP)
|g'
\
-e
's|@''GNULIB_MKOSTEMPS''@|
$(GNULIB_MKOSTEMPS)
|g'
\
...
...
@@ -1019,6 +1024,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e
's|@''GNULIB_SYSTEM_POSIX''@|
$(GNULIB_SYSTEM_POSIX)
|g'
\
-e
's|@''GNULIB_UNLOCKPT''@|
$(GNULIB_UNLOCKPT)
|g'
\
-e
's|@''GNULIB_UNSETENV''@|
$(GNULIB_UNSETENV)
|g'
\
-e
's|@''GNULIB_WCTOMB''@|
$(GNULIB_WCTOMB)
|g'
\
<
$(srcdir)
/stdlib.in.h |
\
sed
-e
's|@''HAVE__EXIT''@|
$(HAVE__EXIT)
|g'
\
-e
's|@''HAVE_ATOLL''@|
$(HAVE_ATOLL)
|g'
\
...
...
@@ -1047,6 +1053,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e
's|@''REPLACE_CALLOC''@|
$(REPLACE_CALLOC)
|g'
\
-e
's|@''REPLACE_CANONICALIZE_FILE_NAME''@|
$(REPLACE_CANONICALIZE_FILE_NAME)
|g'
\
-e
's|@''REPLACE_MALLOC''@|
$(REPLACE_MALLOC)
|g'
\
-e
's|@''REPLACE_MBTOWC''@|
$(REPLACE_MBTOWC)
|g'
\
-e
's|@''REPLACE_MKSTEMP''@|
$(REPLACE_MKSTEMP)
|g'
\
-e
's|@''REPLACE_PUTENV''@|
$(REPLACE_PUTENV)
|g'
\
-e
's|@''REPLACE_REALLOC''@|
$(REPLACE_REALLOC)
|g'
\
...
...
@@ -1054,6 +1061,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e
's|@''REPLACE_SETENV''@|
$(REPLACE_SETENV)
|g'
\
-e
's|@''REPLACE_STRTOD''@|
$(REPLACE_STRTOD)
|g'
\
-e
's|@''REPLACE_UNSETENV''@|
$(REPLACE_UNSETENV)
|g'
\
-e
's|@''REPLACE_WCTOMB''@|
$(REPLACE_WCTOMB)
|g'
\
-e
'/definitions of _GL_FUNCDECL_RPL/r
$(CXXDEFS_H)
'
\
-e
'/definition of _GL_ARG_NONNULL/r
$(ARG_NONNULL_H)
'
\
-e
'/definition of _GL_WARN_ON_USE/r
$(WARN_ON_USE_H)
'
;
\
...
...
lib/getopt_int.h
View file @
9411886d
...
...
@@ -108,7 +108,7 @@ struct _getopt_data
#if defined _LIBC && defined USE_NONOPTION_FLAGS
int
__nonoption_flags_max_len
;
int
__nonoption_flags_len
;
#
endif
#endif
};
/* The initializer is necessary to set OPTIND and OPTERR to their
...
...
lib/gnulib.mk
View file @
9411886d
...
...
@@ -267,6 +267,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e
's|@''GNULIB_GETSUBOPT''@|
$(GNULIB_GETSUBOPT)
|g'
\
-e
's|@''GNULIB_GRANTPT''@|
$(GNULIB_GRANTPT)
|g'
\
-e
's|@''GNULIB_MALLOC_POSIX''@|
$(GNULIB_MALLOC_POSIX)
|g'
\
-e
's|@''GNULIB_MBTOWC''@|
$(GNULIB_MBTOWC)
|g'
\
-e
's|@''GNULIB_MKDTEMP''@|
$(GNULIB_MKDTEMP)
|g'
\
-e
's|@''GNULIB_MKOSTEMP''@|
$(GNULIB_MKOSTEMP)
|g'
\
-e
's|@''GNULIB_MKOSTEMPS''@|
$(GNULIB_MKOSTEMPS)
|g'
\
...
...
@@ -285,6 +286,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e
's|@''GNULIB_SYSTEM_POSIX''@|
$(GNULIB_SYSTEM_POSIX)
|g'
\
-e
's|@''GNULIB_UNLOCKPT''@|
$(GNULIB_UNLOCKPT)
|g'
\
-e
's|@''GNULIB_UNSETENV''@|
$(GNULIB_UNSETENV)
|g'
\
-e
's|@''GNULIB_WCTOMB''@|
$(GNULIB_WCTOMB)
|g'
\
<
$(srcdir)
/stdlib.in.h |
\
sed
-e
's|@''HAVE__EXIT''@|
$(HAVE__EXIT)
|g'
\
-e
's|@''HAVE_ATOLL''@|
$(HAVE_ATOLL)
|g'
\
...
...
@@ -313,6 +315,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e
's|@''REPLACE_CALLOC''@|
$(REPLACE_CALLOC)
|g'
\
-e
's|@''REPLACE_CANONICALIZE_FILE_NAME''@|
$(REPLACE_CANONICALIZE_FILE_NAME)
|g'
\
-e
's|@''REPLACE_MALLOC''@|
$(REPLACE_MALLOC)
|g'
\
-e
's|@''REPLACE_MBTOWC''@|
$(REPLACE_MBTOWC)
|g'
\
-e
's|@''REPLACE_MKSTEMP''@|
$(REPLACE_MKSTEMP)
|g'
\
-e
's|@''REPLACE_PUTENV''@|
$(REPLACE_PUTENV)
|g'
\
-e
's|@''REPLACE_REALLOC''@|
$(REPLACE_REALLOC)
|g'
\
...
...
@@ -320,6 +323,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e
's|@''REPLACE_SETENV''@|
$(REPLACE_SETENV)
|g'
\
-e
's|@''REPLACE_STRTOD''@|
$(REPLACE_STRTOD)
|g'
\
-e
's|@''REPLACE_UNSETENV''@|
$(REPLACE_UNSETENV)
|g'
\
-e
's|@''REPLACE_WCTOMB''@|
$(REPLACE_WCTOMB)
|g'
\
-e
'/definitions of _GL_FUNCDECL_RPL/r
$(CXXDEFS_H)
'
\
-e
'/definition of _GL_ARG_NONNULL/r
$(ARG_NONNULL_H)
'
\
-e
'/definition of _GL_WARN_ON_USE/r
$(WARN_ON_USE_H)
'
;
\
...
...
lib/stdlib.in.h
View file @
9411886d
...
...
@@ -274,6 +274,21 @@ _GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - "
"use gnulib module malloc-posix for portability"
);
#endif
/* Convert a multibyte character to a wide character. */
#if @GNULIB_MBTOWC@
# if @REPLACE_MBTOWC@
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# undef mbtowc
# define mbtowc rpl_mbtowc
# endif
_GL_FUNCDECL_RPL
(
mbtowc
,
int
,
(
wchar_t
*
pwc
,
const
char
*
s
,
size_t
n
));
_GL_CXXALIAS_RPL
(
mbtowc
,
int
,
(
wchar_t
*
pwc
,
const
char
*
s
,
size_t
n
));
# else
_GL_CXXALIAS_SYS
(
mbtowc
,
int
,
(
wchar_t
*
pwc
,
const
char
*
s
,
size_t
n
));
# endif
_GL_CXXALIASWARN
(
mbtowc
);
#endif
#if @GNULIB_MKDTEMP@
/* Create a unique temporary directory from TEMPLATE.
The last six characters of TEMPLATE must be "XXXXXX";
...
...
@@ -723,6 +738,21 @@ _GL_WARN_ON_USE (unsetenv, "unsetenv is unportable - "
# endif
#endif
/* Convert a wide character to a multibyte character. */
#if @GNULIB_WCTOMB@
# if @REPLACE_WCTOMB@
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# undef wctomb
# define wctomb rpl_wctomb
# endif
_GL_FUNCDECL_RPL
(
wctomb
,
int
,
(
char
*
s
,
wchar_t
wc
));
_GL_CXXALIAS_RPL
(
wctomb
,
int
,
(
char
*
s
,
wchar_t
wc
));
# else
_GL_CXXALIAS_SYS
(
wctomb
,
int
,
(
char
*
s
,
wchar_t
wc
));
# endif
_GL_CXXALIASWARN
(
wctomb
);
#endif
#endif
/* _GL_STDLIB_H */
#endif
/* _GL_STDLIB_H */
...
...
m4/stdlib_h.m4
View file @
9411886d
# stdlib_h.m4 serial 3
6
# stdlib_h.m4 serial 3
7
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
...
...
@@ -44,6 +44,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
GNULIB_GETSUBOPT=0; AC_SUBST([GNULIB_GETSUBOPT])
GNULIB_GRANTPT=0; AC_SUBST([GNULIB_GRANTPT])
GNULIB_MALLOC_POSIX=0; AC_SUBST([GNULIB_MALLOC_POSIX])
GNULIB_MBTOWC=0; AC_SUBST([GNULIB_MBTOWC])
GNULIB_MKDTEMP=0; AC_SUBST([GNULIB_MKDTEMP])
GNULIB_MKOSTEMP=0; AC_SUBST([GNULIB_MKOSTEMP])
GNULIB_MKOSTEMPS=0; AC_SUBST([GNULIB_MKOSTEMPS])
...
...
@@ -62,6 +63,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
GNULIB_SYSTEM_POSIX=0; AC_SUBST([GNULIB_SYSTEM_POSIX])
GNULIB_UNLOCKPT=0; AC_SUBST([GNULIB_UNLOCKPT])
GNULIB_UNSETENV=0; AC_SUBST([GNULIB_UNSETENV])
GNULIB_WCTOMB=0; AC_SUBST([GNULIB_WCTOMB])
dnl Assume proper GNU behavior unless another module says otherwise.
HAVE__EXIT=1; AC_SUBST([HAVE__EXIT])
HAVE_ATOLL=1; AC_SUBST([HAVE_ATOLL])
...
...
@@ -91,6 +93,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
REPLACE_CALLOC=0; AC_SUBST([REPLACE_CALLOC])
REPLACE_CANONICALIZE_FILE_NAME=0; AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME])
REPLACE_MALLOC=0; AC_SUBST([REPLACE_MALLOC])
REPLACE_MBTOWC=0; AC_SUBST([REPLACE_MBTOWC])
REPLACE_MKSTEMP=0; AC_SUBST([REPLACE_MKSTEMP])
REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV])
REPLACE_REALLOC=0; AC_SUBST([REPLACE_REALLOC])
...
...
@@ -98,4 +101,5 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
REPLACE_SETENV=0; AC_SUBST([REPLACE_SETENV])
REPLACE_STRTOD=0; AC_SUBST([REPLACE_STRTOD])
REPLACE_UNSETENV=0; AC_SUBST([REPLACE_UNSETENV])
REPLACE_WCTOMB=0; AC_SUBST([REPLACE_WCTOMB])
])
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment