diff options
| author | Glenn Morris | 2011-05-19 02:28:27 -0400 |
|---|---|---|
| committer | Glenn Morris | 2011-05-19 02:28:27 -0400 |
| commit | d573f59acf8e4703ee27322280b9dfce2ef5a53f (patch) | |
| tree | aa17e8a5bf1ff9b2a968d2e656b8d3dfc77bdc04 | |
| parent | d1f21341e13d897c6aa152b1b454b38e02c09b5c (diff) | |
| download | emacs-d573f59acf8e4703ee27322280b9dfce2ef5a53f.tar.gz emacs-d573f59acf8e4703ee27322280b9dfce2ef5a53f.zip | |
Auto-commit of generated files.
| -rw-r--r-- | autogen/Makefile.in | 4 | ||||
| -rwxr-xr-x | autogen/configure | 22 |
2 files changed, 0 insertions, 26 deletions
diff --git a/autogen/Makefile.in b/autogen/Makefile.in index b8b06d5ffd5..daff172c567 100644 --- a/autogen/Makefile.in +++ b/autogen/Makefile.in | |||
| @@ -481,7 +481,6 @@ MAINT = @MAINT@ | |||
| 481 | MAKEINFO = @MAKEINFO@ | 481 | MAKEINFO = @MAKEINFO@ |
| 482 | MKDEPDIR = @MKDEPDIR@ | 482 | MKDEPDIR = @MKDEPDIR@ |
| 483 | MKDIR_P = @MKDIR_P@ | 483 | MKDIR_P = @MKDIR_P@ |
| 484 | MOUSE_SUPPORT = @MOUSE_SUPPORT@ | ||
| 485 | M_FILE = @M_FILE@ | 484 | M_FILE = @M_FILE@ |
| 486 | NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ | 485 | NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ |
| 487 | NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ | 486 | NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ |
| @@ -505,7 +504,6 @@ NEXT_TIME_H = @NEXT_TIME_H@ | |||
| 505 | NEXT_UNISTD_H = @NEXT_UNISTD_H@ | 504 | NEXT_UNISTD_H = @NEXT_UNISTD_H@ |
| 506 | NS_OBJ = @NS_OBJ@ | 505 | NS_OBJ = @NS_OBJ@ |
| 507 | NS_OBJC_OBJ = @NS_OBJC_OBJ@ | 506 | NS_OBJC_OBJ = @NS_OBJC_OBJ@ |
| 508 | NS_SUPPORT = @NS_SUPPORT@ | ||
| 509 | OBJEXT = @OBJEXT@ | 507 | OBJEXT = @OBJEXT@ |
| 510 | OLDXMENU = @OLDXMENU@ | 508 | OLDXMENU = @OLDXMENU@ |
| 511 | OLDXMENU_DEPS = @OLDXMENU_DEPS@ | 509 | OLDXMENU_DEPS = @OLDXMENU_DEPS@ |
| @@ -632,7 +630,6 @@ TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ | |||
| 632 | TERMCAP_OBJ = @TERMCAP_OBJ@ | 630 | TERMCAP_OBJ = @TERMCAP_OBJ@ |
| 633 | TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ | 631 | TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ |
| 634 | TOOLKIT_LIBW = @TOOLKIT_LIBW@ | 632 | TOOLKIT_LIBW = @TOOLKIT_LIBW@ |
| 635 | TOOLTIP_SUPPORT = @TOOLTIP_SUPPORT@ | ||
| 636 | UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ | 633 | UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ |
| 637 | UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ | 634 | UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ |
| 638 | UNEXEC_OBJ = @UNEXEC_OBJ@ | 635 | UNEXEC_OBJ = @UNEXEC_OBJ@ |
| @@ -642,7 +639,6 @@ VERSION = @VERSION@ | |||
| 642 | VMLIMIT_OBJ = @VMLIMIT_OBJ@ | 639 | VMLIMIT_OBJ = @VMLIMIT_OBJ@ |
| 643 | WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ | 640 | WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ |
| 644 | WIDGET_OBJ = @WIDGET_OBJ@ | 641 | WIDGET_OBJ = @WIDGET_OBJ@ |
| 645 | WINDOW_SUPPORT = @WINDOW_SUPPORT@ | ||
| 646 | WINT_T_SUFFIX = @WINT_T_SUFFIX@ | 642 | WINT_T_SUFFIX = @WINT_T_SUFFIX@ |
| 647 | XFT_CFLAGS = @XFT_CFLAGS@ | 643 | XFT_CFLAGS = @XFT_CFLAGS@ |
| 648 | XFT_LIBS = @XFT_LIBS@ | 644 | XFT_LIBS = @XFT_LIBS@ |
diff --git a/autogen/configure b/autogen/configure index b3051c9558e..d6f4e5c512c 100755 --- a/autogen/configure +++ b/autogen/configure | |||
| @@ -603,9 +603,6 @@ am__EXEEXT_FALSE | |||
| 603 | am__EXEEXT_TRUE | 603 | am__EXEEXT_TRUE |
| 604 | LTLIBOBJS | 604 | LTLIBOBJS |
| 605 | LIBOBJS | 605 | LIBOBJS |
| 606 | WINDOW_SUPPORT | ||
| 607 | TOOLTIP_SUPPORT | ||
| 608 | MOUSE_SUPPORT | ||
| 609 | LIB_GCC | 606 | LIB_GCC |
| 610 | LD_FIRSTFLAG | 607 | LD_FIRSTFLAG |
| 611 | LD_SWITCH_SYSTEM_TEMACS | 608 | LD_SWITCH_SYSTEM_TEMACS |
| @@ -1118,7 +1115,6 @@ VMLIMIT_OBJ | |||
| 1118 | GMALLOC_OBJ | 1115 | GMALLOC_OBJ |
| 1119 | HAVE_XSERVER | 1116 | HAVE_XSERVER |
| 1120 | LIB_STANDARD | 1117 | LIB_STANDARD |
| 1121 | NS_SUPPORT | ||
| 1122 | NS_OBJC_OBJ | 1118 | NS_OBJC_OBJ |
| 1123 | NS_OBJ | 1119 | NS_OBJ |
| 1124 | TEMACS_LDFLAGS2 | 1120 | TEMACS_LDFLAGS2 |
| @@ -9460,7 +9456,6 @@ fi | |||
| 9460 | ns_frag=/dev/null | 9456 | ns_frag=/dev/null |
| 9461 | NS_OBJ= | 9457 | NS_OBJ= |
| 9462 | NS_OBJC_OBJ= | 9458 | NS_OBJC_OBJ= |
| 9463 | NS_SUPPORT= | ||
| 9464 | if test "${HAVE_NS}" = yes; then | 9459 | if test "${HAVE_NS}" = yes; then |
| 9465 | window_system=nextstep | 9460 | window_system=nextstep |
| 9466 | with_xft=no | 9461 | with_xft=no |
| @@ -9473,7 +9468,6 @@ if test "${HAVE_NS}" = yes; then | |||
| 9473 | ns_frag=$srcdir/src/ns.mk | 9468 | ns_frag=$srcdir/src/ns.mk |
| 9474 | NS_OBJ="fontset.o fringe.o image.o" | 9469 | NS_OBJ="fontset.o fringe.o image.o" |
| 9475 | NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o" | 9470 | NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o" |
| 9476 | NS_SUPPORT="\${lispsource}/emacs-lisp/easymenu.elc \${lispsource}/term/ns-win.elc" | ||
| 9477 | fi | 9471 | fi |
| 9478 | CFLAGS="$tmp_CFLAGS" | 9472 | CFLAGS="$tmp_CFLAGS" |
| 9479 | CPPFLAGS="$tmp_CPPFLAGS" | 9473 | CPPFLAGS="$tmp_CPPFLAGS" |
| @@ -9482,7 +9476,6 @@ CPPFLAGS="$tmp_CPPFLAGS" | |||
| 9482 | 9476 | ||
| 9483 | 9477 | ||
| 9484 | 9478 | ||
| 9485 | |||
| 9486 | case "${window_system}" in | 9479 | case "${window_system}" in |
| 9487 | x11 ) | 9480 | x11 ) |
| 9488 | HAVE_X_WINDOWS=yes | 9481 | HAVE_X_WINDOWS=yes |
| @@ -12929,7 +12922,6 @@ fi | |||
| 12929 | ### Use -lgpm if available, unless `--with-gpm=no'. | 12922 | ### Use -lgpm if available, unless `--with-gpm=no'. |
| 12930 | HAVE_GPM=no | 12923 | HAVE_GPM=no |
| 12931 | LIBGPM= | 12924 | LIBGPM= |
| 12932 | MOUSE_SUPPORT= | ||
| 12933 | if test "${with_gpm}" != "no"; then | 12925 | if test "${with_gpm}" != "no"; then |
| 12934 | ac_fn_c_check_header_mongrel "$LINENO" "gpm.h" "ac_cv_header_gpm_h" "$ac_includes_default" | 12926 | ac_fn_c_check_header_mongrel "$LINENO" "gpm.h" "ac_cv_header_gpm_h" "$ac_includes_default" |
| 12935 | if test "x$ac_cv_header_gpm_h" = x""yes; then : | 12927 | if test "x$ac_cv_header_gpm_h" = x""yes; then : |
| @@ -12982,8 +12974,6 @@ fi | |||
| 12982 | $as_echo "#define HAVE_GPM 1" >>confdefs.h | 12974 | $as_echo "#define HAVE_GPM 1" >>confdefs.h |
| 12983 | 12975 | ||
| 12984 | LIBGPM=-lgpm | 12976 | LIBGPM=-lgpm |
| 12985 | ## May be reset below. | ||
| 12986 | MOUSE_SUPPORT="\$(GPM_MOUSE_SUPPORT)" | ||
| 12987 | fi | 12977 | fi |
| 12988 | fi | 12978 | fi |
| 12989 | 12979 | ||
| @@ -20810,8 +20800,6 @@ if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then | |||
| 20810 | fi | 20800 | fi |
| 20811 | 20801 | ||
| 20812 | 20802 | ||
| 20813 | TOOLTIP_SUPPORT= | ||
| 20814 | WINDOW_SUPPORT= | ||
| 20815 | ## If we're using X11/GNUstep, define some consequences. | 20803 | ## If we're using X11/GNUstep, define some consequences. |
| 20816 | if test "$HAVE_X_WINDOWS" = "yes" || test "$HAVE_NS" = "yes"; then | 20804 | if test "$HAVE_X_WINDOWS" = "yes" || test "$HAVE_NS" = "yes"; then |
| 20817 | 20805 | ||
| @@ -20820,21 +20808,11 @@ $as_echo "#define HAVE_WINDOW_SYSTEM 1" >>confdefs.h | |||
| 20820 | 20808 | ||
| 20821 | $as_echo "#define HAVE_MOUSE 1" >>confdefs.h | 20809 | $as_echo "#define HAVE_MOUSE 1" >>confdefs.h |
| 20822 | 20810 | ||
| 20823 | MOUSE_SUPPORT="\$(REAL_MOUSE_SUPPORT)" | ||
| 20824 | TOOLTIP_SUPPORT="\${lispsource}/mouse.elc" | ||
| 20825 | |||
| 20826 | WINDOW_SUPPORT="\$(BASE_WINDOW_SUPPORT)" | ||
| 20827 | test "$HAVE_X_WINDOWS" = "yes" && \ | ||
| 20828 | WINDOW_SUPPORT="$WINDOW_SUPPORT \$(X_WINDOW_SUPPORT)" | ||
| 20829 | |||
| 20830 | fi | 20811 | fi |
| 20831 | 20812 | ||
| 20832 | 20813 | ||
| 20833 | 20814 | ||
| 20834 | 20815 | ||
| 20835 | |||
| 20836 | |||
| 20837 | |||
| 20838 | #### Report on what we decided to do. | 20816 | #### Report on what we decided to do. |
| 20839 | #### Report GTK as a toolkit, even if it doesn't use Xt. | 20817 | #### Report GTK as a toolkit, even if it doesn't use Xt. |
| 20840 | #### It makes printing result more understandable as using GTK sets | 20818 | #### It makes printing result more understandable as using GTK sets |