aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2010-10-08 18:59:50 -0700
committerGlenn Morris2010-10-08 18:59:50 -0700
commit613c83fc9f8ebf1c6f489bc2ae06c9194966c216 (patch)
tree93926077db4e0a305ac552b862941e66a60e98d3 /src
parent6e90e2a8df5bc5d2badc7fe3ad3f28808c35e62a (diff)
downloademacs-613c83fc9f8ebf1c6f489bc2ae06c9194966c216.tar.gz
emacs-613c83fc9f8ebf1c6f489bc2ae06c9194966c216.zip
Regenerate configure, src/config.in.
Diffstat (limited to 'src')
-rw-r--r--src/config.in14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/config.in b/src/config.in
index a09ebeabcec..add2ac73d55 100644
--- a/src/config.in
+++ b/src/config.in
@@ -255,7 +255,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
255/* Define to 1 if you have a gif (or ungif) library. */ 255/* Define to 1 if you have a gif (or ungif) library. */
256#undef HAVE_GIF 256#undef HAVE_GIF
257 257
258/* Define if we have the GNU TLS library. */ 258/* Define if using GnuTLS. */
259#undef HAVE_GNUTLS 259#undef HAVE_GNUTLS
260 260
261/* Define to 1 if you have the gpm library (-lgpm). */ 261/* Define to 1 if you have the gpm library (-lgpm). */
@@ -408,6 +408,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
408/* Define to 1 if you have the `Xext' library (-lXext). */ 408/* Define to 1 if you have the `Xext' library (-lXext). */
409#undef HAVE_LIBXEXT 409#undef HAVE_LIBXEXT
410 410
411/* Define to 1 if you have the libxml library (-lxml2). */
412#undef HAVE_LIBXML2
413
411/* Define to 1 if you have the `Xmu' library (-lXmu). */ 414/* Define to 1 if you have the `Xmu' library (-lXmu). */
412#undef HAVE_LIBXMU 415#undef HAVE_LIBXMU
413 416
@@ -816,9 +819,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
816/* Define to 1 if you have the SM library (-lSM). */ 819/* Define to 1 if you have the SM library (-lSM). */
817#undef HAVE_X_SM 820#undef HAVE_X_SM
818 821
819/* Define to 1 if you have the libxml2 library (-lxml2). */
820#undef HAVE_LIBXML2
821
822/* Define to 1 if you want to use the X window system. */ 822/* Define to 1 if you want to use the X window system. */
823#undef HAVE_X_WINDOWS 823#undef HAVE_X_WINDOWS
824 824
@@ -1097,12 +1097,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1097#include config_opsysfile 1097#include config_opsysfile
1098#include config_machfile 1098#include config_machfile
1099 1099
1100#if HAVE_GNUTLS
1101#define LIBGNUTLS $(LIBGNUTLS_LIBS)
1102#else /* not HAVE_GNUTLS */
1103#define LIBGNUTLS
1104#endif /* not HAVE_GNUTLS */
1105
1106/* Set up some defines, C and LD flags for NeXTstep interface on GNUstep. 1100/* Set up some defines, C and LD flags for NeXTstep interface on GNUstep.
1107 (There is probably a better place to do this, but right now the Cocoa 1101 (There is probably a better place to do this, but right now the Cocoa
1108 side does this in s/darwin.h and we cannot 1102 side does this in s/darwin.h and we cannot