[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101859: Regenerate configure, src/co
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101859: Regenerate configure, src/config.in. |
Date: |
Fri, 08 Oct 2010 18:59:50 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101859
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-08 18:59:50 -0700
message:
Regenerate configure, src/config.in.
modified:
configure
src/config.in
=== modified file 'configure'
--- a/configure 2010-09-29 18:52:34 +0000
+++ b/configure 2010-10-09 01:59:50 +0000
@@ -8058,7 +8058,6 @@
main ()
{
char *data, *data2, *data3;
- const char *cdata2;
int i, pagesize;
int fd, fd2;
@@ -8083,10 +8082,10 @@
fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
if (fd2 < 0)
return 4;
- cdata2 = "";
- if (write (fd2, cdata2, 1) != 1)
+ data2 = "";
+ if (write (fd2, data2, 1) != 1)
return 5;
- data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2,
0L);
+ data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
if (data2 == MAP_FAILED)
return 6;
for (i = 0; i < pagesize; ++i)
@@ -9509,7 +9508,8 @@
fi
if test "${HAVE_GNUTLS}" = "yes"; then
- $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h
+
+$as_echo "#define HAVE_GNUTLS 1" >>confdefs.h
fi
fi
@@ -15017,7 +15017,7 @@
test "${exec_prefix}" != NONE &&
exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`
-ac_config_files="$ac_config_files 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"
+ac_config_files="$ac_config_files 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
doc/emacs/emacsver.texi"
ac_config_commands="$ac_config_commands default"
@@ -15726,6 +15726,7 @@
"lwlib/Makefile") CONFIG_FILES="$CONFIG_FILES lwlib/Makefile" ;;
"lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;;
"leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;;
+ "doc/emacs/emacsver.texi") CONFIG_FILES="$CONFIG_FILES
doc/emacs/emacsver.texi" ;;
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
=== modified file 'src/config.in'
--- a/src/config.in 2010-10-03 15:39:21 +0000
+++ b/src/config.in 2010-10-09 01:59:50 +0000
@@ -255,7 +255,7 @@
/* Define to 1 if you have a gif (or ungif) library. */
#undef HAVE_GIF
-/* Define if we have the GNU TLS library. */
+/* Define if using GnuTLS. */
#undef HAVE_GNUTLS
/* Define to 1 if you have the gpm library (-lgpm). */
@@ -408,6 +408,9 @@
/* Define to 1 if you have the `Xext' library (-lXext). */
#undef HAVE_LIBXEXT
+/* Define to 1 if you have the libxml library (-lxml2). */
+#undef HAVE_LIBXML2
+
/* Define to 1 if you have the `Xmu' library (-lXmu). */
#undef HAVE_LIBXMU
@@ -816,9 +819,6 @@
/* Define to 1 if you have the SM library (-lSM). */
#undef HAVE_X_SM
-/* Define to 1 if you have the libxml2 library (-lxml2). */
-#undef HAVE_LIBXML2
-
/* Define to 1 if you want to use the X window system. */
#undef HAVE_X_WINDOWS
@@ -1097,12 +1097,6 @@
#include config_opsysfile
#include config_machfile
-#if HAVE_GNUTLS
-#define LIBGNUTLS $(LIBGNUTLS_LIBS)
-#else /* not HAVE_GNUTLS */
-#define LIBGNUTLS
-#endif /* not HAVE_GNUTLS */
-
/* Set up some defines, C and LD flags for NeXTstep interface on GNUstep.
(There is probably a better place to do this, but right now the Cocoa
side does this in s/darwin.h and we cannot
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101859: Regenerate configure, src/config.in.,
Glenn Morris <=