diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-20 22:34:48 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-20 22:34:48 -0700 |
commit | 6e5fa6bfce1362c2ebf049fcfa1e6f2a4762ccef (patch) | |
tree | f7ff137da14c352412ee3dc3fbcaf1316428fd97 /configure.in | |
parent | 81e56e612dab7d80485c640068531710a713d205 (diff) | |
parent | 77185bdf91d42fb19c02af0f51ce63280ce911a0 (diff) | |
download | emacs-6e5fa6bfce1362c2ebf049fcfa1e6f2a4762ccef.tar.gz |
Merge from trunk and from gnulib stdio.
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 11b7ad4db05..faf14fc6bb3 100644 --- a/configure.in +++ b/configure.in @@ -229,7 +229,7 @@ AC_ARG_ENABLE(maintainer-mode, [enable make rules and dependencies not useful (and sometimes confusing) to the casual installer])], USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) + USE_MAINTAINER_MODE=yes) if test $USE_MAINTAINER_MODE = yes; then MAINT= else @@ -2256,7 +2256,7 @@ if test "${HAVE_X11}" = "yes"; then dnl if -lfreetype is not specified. dnl The following is needed to set FREETYPE_LIBS. PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, - HAVE_FREETYPE=no) + HAVE_FREETYPE=no) test "$HAVE_FREETYPE" = "no" && AC_MSG_ERROR(libxft requires libfreetype) fi |