procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from mainline.

Browse source
This commit is contained in:
Paul Eggert 2011-02-24 23:36:37 -08:00
commit 4394ee0474
3 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
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(),

26
configure vendored
View file

@ -19761,7 +19761,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
@ -20546,7 +20554,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
@ -21276,21 +21286,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
@ -21330,3 +21339,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

2
lib/getopt_int.h
View file

@ -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