From 0f55a32e46cfe9243f2318b9a5087bfa2458ec5e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 4 Jun 2013 06:17:52 -0400 Subject: [PATCH] Auto-commit of generated files. --- autogen/Makefile.in | 4 + autogen/config.in | 13 ++-- autogen/configure | 179 +++++++++++++++++++++++++++++++++++++++----- 3 files changed, 171 insertions(+), 25 deletions(-) diff --git a/autogen/Makefile.in b/autogen/Makefile.in index 140a3558951..99805dd1fe8 100644 --- a/autogen/Makefile.in +++ b/autogen/Makefile.in @@ -437,6 +437,8 @@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_LIBS = @GCONF_LIBS@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ GETOPT_H = @GETOPT_H@ +GFILENOTIFY_CFLAGS = @GFILENOTIFY_CFLAGS@ +GFILENOTIFY_LIBS = @GFILENOTIFY_LIBS@ GMALLOC_OBJ = @GMALLOC_OBJ@ GNULIB_ALPHASORT = @GNULIB_ALPHASORT@ GNULIB_ATOLL = @GNULIB_ATOLL@ @@ -941,6 +943,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ +NOTIFY_OBJ = @NOTIFY_OBJ@ NS_OBJ = @NS_OBJ@ NS_OBJC_OBJ = @NS_OBJC_OBJ@ NTDIR = @NTDIR@ @@ -1132,6 +1135,7 @@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XARGS_LIMIT = @XARGS_LIMIT@ XFT_CFLAGS = @XFT_CFLAGS@ XFT_LIBS = @XFT_LIBS@ +XGSELOBJ = @XGSELOBJ@ XINERAMA_CFLAGS = @XINERAMA_CFLAGS@ XINERAMA_LIBS = @XINERAMA_LIBS@ XMENU_OBJ = @XMENU_OBJ@ diff --git a/autogen/config.in b/autogen/config.in index a25d43cc4cb..cbbcd19aa04 100644 --- a/autogen/config.in +++ b/autogen/config.in @@ -132,7 +132,7 @@ along with GNU Emacs. If not, see . */ #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ # define _FORTIFY_SOURCE 2 #endif - + /* Define to 1 if futimesat mishandles a NULL file name. */ #undef FUTIMESAT_NULL_BUG @@ -547,12 +547,15 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the `get_current_dir_name' function. */ #undef HAVE_GET_CURRENT_DIR_NAME -/* Define to 1 to use glib's notify. */ +/* Define to 1 if using GFile. */ #undef HAVE_GFILENOTIFY /* Define to 1 if you have a gif (or ungif) library. */ #undef HAVE_GIF +/* Define to 1 if GLib is linked in. */ +#undef HAVE_GLIB + /* Define if using GnuTLS. */ #undef HAVE_GNUTLS @@ -1036,9 +1039,6 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_BITYPES_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_INOTIFY_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_INTTYPES_H @@ -1502,7 +1502,7 @@ along with GNU Emacs. If not, see . */ /* Define to nonzero if you want access control list support. */ #undef USE_ACL -/* Define to 1 if if using file notifications. */ +/* Define to 1 if using file notifications. */ #undef USE_FILE_NOTIFY /* Define to 1 if using GTK. */ @@ -1845,3 +1845,4 @@ Local Variables: mode: c End: */ + diff --git a/autogen/configure b/autogen/configure index f7a67c56fef..628a856f672 100755 --- a/autogen/configure +++ b/autogen/configure @@ -1288,6 +1288,7 @@ canonical configuration version copyright +XGSELOBJ KRB4LIB DESLIB KRB5LIB @@ -1325,6 +1326,9 @@ FONTCONFIG_LIBS FONTCONFIG_CFLAGS LIBXMU LIBXTR6 +NOTIFY_OBJ +GFILENOTIFY_LIBS +GFILENOTIFY_CFLAGS LIBGNUTLS_LIBS LIBGNUTLS_CFLAGS LIBSELINUX_LIBS @@ -1529,7 +1533,7 @@ with_gconf with_gsettings with_selinux with_gnutls -with_inotify +with_file_notification with_makeinfo with_compress_info with_pkg_config_prog @@ -2257,7 +2261,9 @@ Optional Packages: --without-gsettings don't compile with GSettings support --without-selinux don't compile with SELinux support --without-gnutls don't use -lgnutls for SSL/TLS support - --without-inotify don't compile with inotify (file-watch) support + --with-file-notification=LIB + use a file notification library (LIB one of: yes, + gfile, inotify, w32, no) --without-makeinfo don't require makeinfo for building manuals --without-compress-info don't compress the installed Info pages --with-pkg-config-prog=FILENAME @@ -4332,11 +4338,24 @@ else fi -# Check whether --with-inotify was given. -if test "${with_inotify+set}" = set; then : - withval=$with_inotify; + +# Check whether --with-file-notification was given. +if test "${with_file_notification+set}" = set; then : + withval=$with_file_notification; case "${withval}" in + y | ye | yes ) val=yes ;; + n | no ) val=no ;; + g | gf | gfi | gfil | gfile ) val=gfile ;; + i | in | ino | inot | inoti | inotif | inotify ) val=inotify ;; + w | w3 | w32 ) val=w32 ;; + * ) as_fn_error "\`--with-file-notification=$withval' is invalid; +this option's value should be \`yes', \`no', \`gfile', \`inotify' or \`w32'. +\`yes' is a synonym for \`w32' on MS-Windows, and for \`gfile' otherwise." "$LINENO" 5 + ;; + esac + with_file_notification=$val + else - with_inotify=$with_features + with_file_notification=yes fi @@ -10236,7 +10255,6 @@ fi W32_RES_LINK="-Wl,emacs.res" else W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32inevt.o w32proc.o" - W32_OBJ="$W32_OBJ w32notify.o" W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32" W32_LIBS="$W32_LIBS -lmpr -lwinspool -lole32 -lcomctl32 -lusp10" W32_RES_LINK="\$(EMACSRES)" @@ -12007,33 +12025,123 @@ 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" +NOTIFY_OBJ= +NOTIFY_SUMMARY=no + +if test "${with_file_notification}" = "yes"; then + if test "${opsys}" = "mingw32"; then + with_file_notification=w32 + else + with_file_notification=gfile + fi +fi + +if test "${with_file_notification}" = "gfile"; then + + succeeded=no + + if test "$PKG_CONFIG" = "no" ; then + HAVE_GFILENOTIFY=no + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if "$PKG_CONFIG" --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 >= 2.24" >&5 +$as_echo_n "checking for gio-2.0 >= 2.24... " >&6; } + + if "$PKG_CONFIG" --exists "gio-2.0 >= 2.24" 2>&5 && + GFILENOTIFY_CFLAGS=`"$PKG_CONFIG" --cflags "gio-2.0 >= 2.24" 2>&5` && + GFILENOTIFY_LIBS=`"$PKG_CONFIG" --libs "gio-2.0 >= 2.24" 2>&5`; then + edit_cflags=" + s,///*,/,g + s/^/ / + s/ -I/ $isystem/g + s/^ // + " + GFILENOTIFY_CFLAGS=`$as_echo "$GFILENOTIFY_CFLAGS" | sed -e "$edit_cflags"` + GFILENOTIFY_LIBS=`$as_echo "$GFILENOTIFY_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$GFILENOTIFY_CFLAGS' LIBS='$GFILENOTIFY_LIBS'" >&5 +$as_echo "yes CFLAGS='$GFILENOTIFY_CFLAGS' LIBS='$GFILENOTIFY_LIBS'" >&6; } + succeeded=yes + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + GFILENOTIFY_CFLAGS="" + GFILENOTIFY_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. Do it in a subshell + ## to capture any diagnostics in invoking pkg-config. + GFILENOTIFY_PKG_ERRORS=`("$PKG_CONFIG" --print-errors "gio-2.0 >= 2.24") 2>&1` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + HAVE_GFILENOTIFY=yes + else + HAVE_GFILENOTIFY=no + fi + + if test "$HAVE_GFILENOTIFY" = "yes"; then + +$as_echo "#define HAVE_GFILENOTIFY 1" >>confdefs.h + + NOTIFY_OBJ=gfilenotify.o + NOTIFY_SUMMARY="yes -lgio (gfile)" + fi +fi +if test "${with_file_notification}" = "inotify"; then + 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" + 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 + if test "$ac_cv_func_inotify_init1" = yes; then + +$as_echo "#define HAVE_INOTIFY 1" >>confdefs.h + + NOTIFY_OBJ=inotify.o + NOTIFY_SUMMARY="yes -lglibc (inotify)" + fi + fi +fi +if test "${with_file_notification}" = "w32"; then + ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" +if test "x$ac_cv_header_windows_h" = x""yes; then : + +fi + + + if test "$ac_cv_header_windows_h" = yes ; then + +$as_echo "#define HAVE_W32NOTIFY 1" >>confdefs.h + + NOTIFY_OBJ=w32notify.o + NOTIFY_SUMMARY="yes (w32)" fi fi -if test "$ac_cv_func_inotify_init1" = yes; then +if test -n "$NOTIFY_OBJ"; then -$as_echo "#define HAVE_INOTIFY 1" >>confdefs.h +$as_echo "#define USE_FILE_NOTIFY 1" >>confdefs.h fi + + + HAVE_XAW3D=no LUCID_LIBW= if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then @@ -16061,6 +16169,38 @@ fi done +XGSELOBJ= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GLib is linked in" >&5 +$as_echo_n "checking whether GLib is linked in... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +int +main () +{ +g_print ("Hello world"); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + links_glib=yes +else + links_glib=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $links_glib" >&5 +$as_echo "$links_glib" >&6; } +if test "${links_glib}" = "yes"; then + +$as_echo "#define HAVE_GLIB 1" >>confdefs.h + + XGSELOBJ=xgselect.o +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 $as_echo_n "checking for nl_langinfo and CODESET... " >&6; } if test "${emacs_cv_langinfo_codeset+set}" = set; then : @@ -17025,7 +17165,7 @@ if test "${HAVE_X_WINDOWS}" = "yes" ; then $as_echo "#define HAVE_X_WINDOWS 1" >>confdefs.h XMENU_OBJ=xmenu.o - XOBJ="xterm.o xfns.o xselect.o xrdb.o xsmfns.o xsettings.o xgselect.o" + XOBJ="xterm.o xfns.o xselect.o xrdb.o xsmfns.o xsettings.o" FONT_OBJ=xfont.o if test "$HAVE_XFT" = "yes"; then FONT_OBJ="$FONT_OBJ ftfont.o xftfont.o ftxfont.o" @@ -28413,6 +28553,7 @@ echo " Does Emacs use -lgpm? ${HAVE_GPM}" echo " Does Emacs use -ldbus? ${HAVE_DBUS}" echo " Does Emacs use -lgconf? ${HAVE_GCONF}" echo " Does Emacs use GSettings? ${HAVE_GSETTINGS}" +echo " Does Emacs use a file notification library? ${NOTIFY_SUMMARY}" echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}" echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}" echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}" -- 2.39.2