Commit b5eb356a authored by Glenn Morris's avatar Glenn Morris
Browse files

Auto-commit of generated files.

parent c6afe371
...@@ -775,6 +775,8 @@ VERSION = @VERSION@ ...@@ -775,6 +775,8 @@ VERSION = @VERSION@
VMLIMIT_OBJ = @VMLIMIT_OBJ@ VMLIMIT_OBJ = @VMLIMIT_OBJ@
W32_LIBS = @W32_LIBS@ W32_LIBS = @W32_LIBS@
W32_OBJ = @W32_OBJ@ W32_OBJ = @W32_OBJ@
W32_RES = @W32_RES@
W32_RES_LINK = @W32_RES_LINK@
WARN_CFLAGS = @WARN_CFLAGS@ WARN_CFLAGS = @WARN_CFLAGS@
WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
WERROR_CFLAGS = @WERROR_CFLAGS@ WERROR_CFLAGS = @WERROR_CFLAGS@
...@@ -782,6 +784,7 @@ WIDGET_OBJ = @WIDGET_OBJ@ ...@@ -782,6 +784,7 @@ WIDGET_OBJ = @WIDGET_OBJ@
WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
WINDOW_SYSTEM_OBJ = @WINDOW_SYSTEM_OBJ@ WINDOW_SYSTEM_OBJ = @WINDOW_SYSTEM_OBJ@
WINDRES = @WINDRES@
WINT_T_SUFFIX = @WINT_T_SUFFIX@ WINT_T_SUFFIX = @WINT_T_SUFFIX@
XFT_CFLAGS = @XFT_CFLAGS@ XFT_CFLAGS = @XFT_CFLAGS@
XFT_LIBS = @XFT_LIBS@ XFT_LIBS = @XFT_LIBS@
......
...@@ -518,6 +518,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -518,6 +518,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have inet sockets. */ /* Define to 1 if you have inet sockets. */
#undef HAVE_INET_SOCKETS #undef HAVE_INET_SOCKETS
/* Define to 1 to use inotify. */
#undef HAVE_INOTIFY
/* Define to 1 if you have the <inttypes.h> header file. */ /* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H #undef HAVE_INTTYPES_H
...@@ -913,6 +916,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -913,6 +916,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <sys/bitypes.h> header file. */ /* Define to 1 if you have the <sys/bitypes.h> header file. */
#undef HAVE_SYS_BITYPES_H #undef HAVE_SYS_BITYPES_H
/* Define to 1 if you have the <sys/inotify.h> header file. */
#undef HAVE_SYS_INOTIFY_H
/* Define to 1 if you have the <sys/inttypes.h> header file. */ /* Define to 1 if you have the <sys/inttypes.h> header file. */
#undef HAVE_SYS_INTTYPES_H #undef HAVE_SYS_INTTYPES_H
......
...@@ -1226,8 +1226,11 @@ LIB_PTHREAD ...@@ -1226,8 +1226,11 @@ LIB_PTHREAD
VMLIMIT_OBJ VMLIMIT_OBJ
GMALLOC_OBJ GMALLOC_OBJ
HAVE_XSERVER HAVE_XSERVER
W32_RES_LINK
W32_RES
W32_LIBS W32_LIBS
W32_OBJ W32_OBJ
WINDRES
LIB_STANDARD LIB_STANDARD
NS_OBJC_OBJ NS_OBJC_OBJ
NS_OBJ NS_OBJ
...@@ -1393,6 +1396,7 @@ with_gconf ...@@ -1393,6 +1396,7 @@ with_gconf
with_gsettings with_gsettings
with_selinux with_selinux
with_gnutls with_gnutls
with_inotify
with_makeinfo with_makeinfo
with_compress_info with_compress_info
with_pkg_config_prog with_pkg_config_prog
...@@ -2115,6 +2119,7 @@ Optional Packages: ...@@ -2115,6 +2119,7 @@ Optional Packages:
--without-gsettings don't compile with GSettings support --without-gsettings don't compile with GSettings support
--without-selinux don't compile with SELinux support --without-selinux don't compile with SELinux support
--without-gnutls don't use -lgnutls for SSL/TLS support --without-gnutls don't use -lgnutls for SSL/TLS support
--without-inotify don't compile with inotify (file-watch) support
--without-makeinfo don't require makeinfo for building manuals --without-makeinfo don't require makeinfo for building manuals
--without-compress-info don't compress the installed Info pages --without-compress-info don't compress the installed Info pages
--with-pkg-config-prog=FILENAME --with-pkg-config-prog=FILENAME
...@@ -4177,6 +4182,14 @@ else ...@@ -4177,6 +4182,14 @@ else
fi fi
   
   
# Check whether --with-inotify was given.
if test "${with_inotify+set}" = set; then :
withval=$with_inotify;
else
with_inotify=$with_features
fi
## For the times when you want to build Emacs but don't have ## For the times when you want to build Emacs but don't have
## a suitable makeinfo, and can live without the manuals. ## a suitable makeinfo, and can live without the manuals.
   
...@@ -9683,6 +9696,8 @@ CPPFLAGS="$tmp_CPPFLAGS" ...@@ -9683,6 +9696,8 @@ CPPFLAGS="$tmp_CPPFLAGS"
HAVE_W32=no HAVE_W32=no
W32_OBJ= W32_OBJ=
W32_LIBS= W32_LIBS=
W32_RES=
W32_RES_LINK=
if test "${with_w32}" != no; then if test "${with_w32}" != no; then
if test "${opsys}" != "cygwin"; then if test "${opsys}" != "cygwin"; then
as_fn_error "Using w32 with an autotools build is only supported for Cygwin." "$LINENO" 5 as_fn_error "Using w32 with an autotools build is only supported for Cygwin." "$LINENO" 5
...@@ -9699,14 +9714,112 @@ fi ...@@ -9699,14 +9714,112 @@ fi
   
$as_echo "#define HAVE_NTGUI 1" >>confdefs.h $as_echo "#define HAVE_NTGUI 1" >>confdefs.h
   
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
set dummy ${ac_tool_prefix}windres; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_WINDRES+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$WINDRES"; then
ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
WINDRES=$ac_cv_prog_WINDRES
if test -n "$WINDRES"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
$as_echo "$WINDRES" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
fi
if test -z "$ac_cv_prog_WINDRES"; then
ac_ct_WINDRES=$WINDRES
# Extract the first word of "windres", so it can be a program name with args.
set dummy windres; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_WINDRES"; then
ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_WINDRES="windres"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
if test -n "$ac_ct_WINDRES"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
$as_echo "$ac_ct_WINDRES" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "x$ac_ct_WINDRES" = x; then
WINDRES="as_fn_error "No resource compiler found." "$LINENO" 5"
else
case $cross_compiling:$ac_tool_warned in
yes:)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
WINDRES=$ac_ct_WINDRES
fi
else
WINDRES="$ac_cv_prog_WINDRES"
fi
W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o" W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o"
W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o" W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o"
W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32" W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool" W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
W32_RES="emacs.res"
# Tell the linker that emacs.res is an object (which we compile from
# the rc file), not a linker script.
W32_RES_LINK="-Wl,-bpe-i386 -Wl,emacs.res"
fi fi
   
   
   
if test "${HAVE_W32}" = "yes"; then if test "${HAVE_W32}" = "yes"; then
window_system=w32 window_system=w32
with_xft=no with_xft=no
...@@ -11349,6 +11462,33 @@ fi ...@@ -11349,6 +11462,33 @@ fi
   
   
   
if test "${with_inotify}" = "yes"; then
for ac_header in sys/inotify.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
if test "x$ac_cv_header_sys_inotify_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_INOTIFY_H 1
_ACEOF
fi
done
if test "$ac_cv_header_sys_inotify_h" = yes ; then
ac_fn_c_check_func "$LINENO" "inotify_init1" "ac_cv_func_inotify_init1"
if test "x$ac_cv_func_inotify_init1" = x""yes; then :
fi
fi
fi
if test "$ac_cv_func_inotify_init1" = yes; then
$as_echo "#define HAVE_INOTIFY 1" >>confdefs.h
fi
HAVE_XAW3D=no HAVE_XAW3D=no
LUCID_LIBW= LUCID_LIBW=
if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment