[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master e93d9e0f5d 1/2: Don’t mishandle preset emacs_cv_lesstif
From: |
Paul Eggert |
Subject: |
master e93d9e0f5d 1/2: Don’t mishandle preset emacs_cv_lesstif |
Date: |
Tue, 5 Jul 2022 01:06:19 -0400 (EDT) |
branch: master
commit e93d9e0f5da6e04aaa263dee8501e0ebe16f0a3e
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>
Don’t mishandle preset emacs_cv_lesstif
* configure.ac: Restore CFLAGS etc. correctly even when
emacs_cv_lesstif is already set on the command line.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a016d464f3..3afe2e0114 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3378,7 +3378,6 @@ Motif version prior to 2.1.
REAL_CPPFLAGS="-I/usr/include/openmotif $REAL_CPPFLAGS"
fi
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
# that might be in CFLAGS temporarily.
# We put this in CPPFLAGS where it precedes the other -I options.
@@ -3386,6 +3385,7 @@ Motif version prior to 2.1.
OLD_CFLAGS=$CFLAGS
CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS"
CFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CFLAGS"
+ AC_CACHE_CHECK(for LessTif where some systems put it, emacs_cv_lesstif,
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include
</usr/X11R6/LessTif/Motif1.2/include/Xm/Xm.h>]],
[[int x = 5;]])],
emacs_cv_lesstif=yes, emacs_cv_lesstif=no)])