aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-06-07 06:18:29 -0400
committerGlenn Morris2011-06-07 06:18:29 -0400
commit0442dc7f7b592a37bd097ca450a02870f1155096 (patch)
tree879e5caa8b69a2d73291d750958d308d381766a3
parentabde8f8c7b14b0a851dc0dec23e7444550a148cf (diff)
downloademacs-0442dc7f7b592a37bd097ca450a02870f1155096.tar.gz
emacs-0442dc7f7b592a37bd097ca450a02870f1155096.zip
Auto-commit of generated files.
-rw-r--r--autogen/config.in17
-rwxr-xr-xautogen/configure16
2 files changed, 33 insertions, 0 deletions
diff --git a/autogen/config.in b/autogen/config.in
index 24650ae7084..b3e14609845 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -1101,6 +1101,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1101 'wchar_t'. */ 1101 'wchar_t'. */
1102#undef WCHAR_T_SUFFIX 1102#undef WCHAR_T_SUFFIX
1103 1103
1104/* Use long long for EMACS_INT if available. */
1105#undef WIDE_EMACS_INT
1106
1104/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 1107/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
1105 'wint_t'. */ 1108 'wint_t'. */
1106#undef WINT_T_SUFFIX 1109#undef WINT_T_SUFFIX
@@ -1261,6 +1264,20 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1261 is a misnomer outside of parameter lists. */ 1264 is a misnomer outside of parameter lists. */
1262#define _UNUSED_PARAMETER_ _GL_UNUSED 1265#define _UNUSED_PARAMETER_ _GL_UNUSED
1263 1266
1267/* The __pure__ attribute was added in gcc 2.96. */
1268#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
1269# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
1270#else
1271# define _GL_ATTRIBUTE_PURE /* empty */
1272#endif
1273
1274/* The __const__ attribute was added in gcc 2.95. */
1275#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
1276# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
1277#else
1278# define _GL_ATTRIBUTE_CONST /* empty */
1279#endif
1280
1264 1281
1265/* Define as a macro for copying va_list variables. */ 1282/* Define as a macro for copying va_list variables. */
1266#undef va_copy 1283#undef va_copy
diff --git a/autogen/configure b/autogen/configure
index 534566359ee..63d0d9ee394 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -1249,6 +1249,7 @@ with_mailhost
1249with_sound 1249with_sound
1250with_sync_input 1250with_sync_input
1251with_x_toolkit 1251with_x_toolkit
1252with_wide_int
1252with_xpm 1253with_xpm
1253with_jpeg 1254with_jpeg
1254with_tiff 1255with_tiff
@@ -1962,6 +1963,7 @@ Optional Packages:
1962 --without-sync-input process async input synchronously 1963 --without-sync-input process async input synchronously
1963 --with-x-toolkit=KIT use an X toolkit (KIT one of: yes or gtk, gtk3, 1964 --with-x-toolkit=KIT use an X toolkit (KIT one of: yes or gtk, gtk3,
1964 lucid or athena, motif, no) 1965 lucid or athena, motif, no)
1966 --with-wide-int prefer wide Emacs integers (typically 62-bit)
1965 --without-xpm don't compile with XPM image support 1967 --without-xpm don't compile with XPM image support
1966 --without-jpeg don't compile with JPEG image support 1968 --without-jpeg don't compile with JPEG image support
1967 --without-tiff don't compile with TIFF image support 1969 --without-tiff don't compile with TIFF image support
@@ -3823,6 +3825,20 @@ fi
3823 3825
3824 3826
3825 3827
3828# Check whether --with-wide-int was given.
3829if test "${with_wide_int+set}" = set; then :
3830 withval=$with_wide_int;
3831else
3832 with_wide_int=no
3833fi
3834
3835if test "$with_wide_int" = yes; then
3836
3837$as_echo "#define WIDE_EMACS_INT 1" >>confdefs.h
3838
3839fi
3840
3841
3826# Check whether --with-xpm was given. 3842# Check whether --with-xpm was given.
3827if test "${with_xpm+set}" = set; then : 3843if test "${with_xpm+set}" = set; then :
3828 withval=$with_xpm; 3844 withval=$with_xpm;