Mercurial > emacs
changeset 108127:4daf18b3d6e8
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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Mon, 26 Apr 2010 20:32:39 -0700 |
| parents | fa115392c7cd |
| children | 1e7aaadc50e8 |
| files | ChangeLog configure configure.in src/config.in |
| diffstat | 4 files changed, 7 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Apr 26 20:18:39 2010 -0700 +++ b/ChangeLog Mon Apr 26 20:32:39 2010 -0700 @@ -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.
--- a/configure Mon Apr 26 20:18:39 2010 -0700 +++ b/configure Mon Apr 26 20:32:39 2010 -0700 @@ -13315,12 +13315,6 @@ $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 @@ { $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 -fi - - if test ${HAVE_LIBXP} = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBXP 1 -_ACEOF - - LIBXP=-lXp - fi + 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; }
--- a/configure.in Mon Apr 26 20:18:39 2010 -0700 +++ b/configure.in Mon Apr 26 20:32:39 2010 -0700 @@ -1890,15 +1890,7 @@ 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
--- a/src/config.in Mon Apr 26 20:18:39 2010 -0700 +++ b/src/config.in Mon Apr 26 20:32:39 2010 -0700 @@ -405,9 +405,6 @@ /* 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 @@ /* 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