aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2012-09-13 08:27:21 +0200
committerJan Djärv2012-09-13 08:27:21 +0200
commit2c484e7585ab899ecea4caddf54b468556f3239d (patch)
tree25a2bc48fae3c784494b3670247f3358574bc6fd
parent1352271a4d2ad5b0b4394af0cf97adab00d13a56 (diff)
downloademacs-2c484e7585ab899ecea4caddf54b468556f3239d.tar.gz
emacs-2c484e7585ab899ecea4caddf54b468556f3239d.zip
* configure.ac: Reorder Xaw3d messages.
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 96cb4b2b89c..07558742e86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12012-09-13 Jan Djärv <jan.h.d@swipnet.se>
2
3 * configure.ac: Reorder Xaw3d messages.
4
12012-09-13 Paul Eggert <eggert@cs.ucla.edu> 52012-09-13 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Simplify SIGIO usage (Bug#12408). 7 Simplify SIGIO usage (Bug#12408).
diff --git a/configure.ac b/configure.ac
index 3761d814364..a6395dc18c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2109,7 +2109,6 @@ HAVE_XAW3D=no
2109LUCID_LIBW= 2109LUCID_LIBW=
2110if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then 2110if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
2111 if test "$with_xaw3d" != no; then 2111 if test "$with_xaw3d" != no; then
2112 AC_MSG_CHECKING(for xaw3d)
2113 AC_CACHE_VAL(emacs_cv_xaw3d, 2112 AC_CACHE_VAL(emacs_cv_xaw3d,
2114 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ 2113 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
2115#include <X11/Intrinsic.h> 2114#include <X11/Intrinsic.h>
@@ -2122,6 +2121,7 @@ if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
2122 emacs_cv_xaw3d=no 2121 emacs_cv_xaw3d=no
2123 fi 2122 fi
2124 if test $emacs_cv_xaw3d = yes; then 2123 if test $emacs_cv_xaw3d = yes; then
2124 AC_MSG_CHECKING(for xaw3d)
2125 AC_MSG_RESULT([yes; using Lucid toolkit]) 2125 AC_MSG_RESULT([yes; using Lucid toolkit])
2126 USE_X_TOOLKIT=LUCID 2126 USE_X_TOOLKIT=LUCID
2127 HAVE_XAW3D=yes 2127 HAVE_XAW3D=yes
@@ -2129,6 +2129,7 @@ if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
2129 AC_DEFINE(HAVE_XAW3D, 1, 2129 AC_DEFINE(HAVE_XAW3D, 1,
2130 [Define to 1 if you have the Xaw3d library (-lXaw3d).]) 2130 [Define to 1 if you have the Xaw3d library (-lXaw3d).])
2131 else 2131 else
2132 AC_MSG_CHECKING(for xaw3d)
2132 AC_MSG_RESULT(no) 2133 AC_MSG_RESULT(no)
2133 AC_MSG_CHECKING(for libXaw) 2134 AC_MSG_CHECKING(for libXaw)
2134 AC_CACHE_VAL(emacs_cv_xaw, 2135 AC_CACHE_VAL(emacs_cv_xaw,