From 8ea5f2d92ff7d9d3c243e76c67ed99f25c2bdae2 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Mon, 26 Apr 2010 20:32:39 -0700
Subject: [PATCH] Remove some AC_DEFINEs that are now unused.

* configure.in (HAVE_MOTIF_2_1, HAVE_LIBXP): Remove unused AC_DEFINEs,
replaced by LIBXP.

* configure, src/config.in: Regenerate.
---
 ChangeLog     |  3 +++
 configure     | 16 +---------------
 configure.in  | 10 +---------
 src/config.in |  6 ------
 4 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 61a5bf19416..2a70a00484a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-04-27  Glenn Morris  <rgm@gnu.org>
 
+	* configure.in (HAVE_MOTIF_2_1, HAVE_LIBXP): Remove unused AC_DEFINEs,
+	replaced by LIBXP.
+
 	* configure.in (--with-crt-dir): Doc fix (now valid for all platforms).
 	(CRT_DIR): On (powerpc64|sparc64)-*-linux-gnu*, default to /usr/lib64.
 	On hpux10-20, default to /lib.
diff --git a/configure b/configure
index 9bbc94e7fb8..cf4b43fd09a 100755
--- a/configure
+++ b/configure
@@ -13315,12 +13315,6 @@ fi
 $as_echo "$emacs_cv_motif_version_2_1" >&6; }
   HAVE_MOTIF_2_1=$emacs_cv_motif_version_2_1
   if test $emacs_cv_motif_version_2_1 = yes; then
-    HAVE_LIBXP=no
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MOTIF_2_1 1
-_ACEOF
-
     { $as_echo "$as_me:$LINENO: checking for XpCreateContext in -lXp" >&5
 $as_echo_n "checking for XpCreateContext in -lXp... " >&6; }
 if test "${ac_cv_lib_Xp_XpCreateContext+set}" = set; then
@@ -13387,17 +13381,9 @@ fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpCreateContext" >&5
 $as_echo "$ac_cv_lib_Xp_XpCreateContext" >&6; }
 if test $ac_cv_lib_Xp_XpCreateContext = yes; then
-  HAVE_LIBXP=yes
+  LIBXP=-lXp
 fi
 
-    if test ${HAVE_LIBXP} = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBXP 1
-_ACEOF
-
-      LIBXP=-lXp
-    fi
   else
     { $as_echo "$as_me:$LINENO: checking for LessTif where some systems put it" >&5
 $as_echo_n "checking for LessTif where some systems put it... " >&6; }
diff --git a/configure.in b/configure.in
index 20f335a52cf..fa0d0b3fccd 100644
--- a/configure.in
+++ b/configure.in
@@ -1890,15 +1890,7 @@ Motif version prior to 2.1.
     emacs_cv_motif_version_2_1=yes, emacs_cv_motif_version_2_1=no)])
   HAVE_MOTIF_2_1=$emacs_cv_motif_version_2_1
   if test $emacs_cv_motif_version_2_1 = yes; then
-    HAVE_LIBXP=no
-    AC_DEFINE(HAVE_MOTIF_2_1, 1,
-	      [Define to 1 if you have Motif 2.1 or newer.])
-    AC_CHECK_LIB(Xp, XpCreateContext, HAVE_LIBXP=yes)
-    if test ${HAVE_LIBXP} = yes; then
-      AC_DEFINE(HAVE_LIBXP, 1,
-		[Define to 1 if you have the Xp library (-lXp).])
-      LIBXP=-lXp
-    fi
+    AC_CHECK_LIB(Xp, XpCreateContext, LIBXP=-lXp)
   else
     AC_CACHE_CHECK(for LessTif where some systems put it, emacs_cv_lesstif,
     # We put this in CFLAGS temporarily to precede other -I options
diff --git a/src/config.in b/src/config.in
index 654f32346ec..25b45f8ca97 100644
--- a/src/config.in
+++ b/src/config.in
@@ -405,9 +405,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `Xmu' library (-lXmu). */
 #undef HAVE_LIBXMU
 
-/* Define to 1 if you have the Xp library (-lXp). */
-#undef HAVE_LIBXP
-
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
@@ -488,9 +485,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have a working `mmap' system call. */
 #undef HAVE_MMAP
 
-/* Define to 1 if you have Motif 2.1 or newer. */
-#undef HAVE_MOTIF_2_1
-
 /* Define to 1 if you have the `mremap' function. */
 #undef HAVE_MREMAP
 
-- 
2.39.2