From e93d9e0f5da6e04aaa263dee8501e0ebe16f0a3e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 4 Jul 2022 23:23:59 -0500 Subject: [PATCH] =?utf8?q?Don=E2=80=99t=20mishandle=20preset=20emacs=5Fcv?= =?utf8?q?=5Flesstif?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * 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 a016d464f34..3afe2e01140 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 ]], [[int x = 5;]])], emacs_cv_lesstif=yes, emacs_cv_lesstif=no)]) -- 2.39.5