Commit 9811b1cf authored by Richard M. Stallman's avatar Richard M. Stallman

Fix the LessTif-directory-finder for real.

parent 5967d963
2002-09-19 Richard M. Stallman <rms@gnu.org>
* configure.in: Fix the LessTif-directory-finder for real.
2002-09-14 Richard M. Stallman <rms@gnu.org> 2002-09-14 Richard M. Stallman <rms@gnu.org>
* Makefile.in (maybe_bootstrap): Test for complete absence * Makefile.in (maybe_bootstrap): Test for complete absence
......
...@@ -1659,8 +1659,9 @@ else ...@@ -1659,8 +1659,9 @@ else
fi fi
AC_MSG_RESULT($HAVE_XFREE386) AC_MSG_RESULT($HAVE_XFREE386)
# Change CFLAGS temporarily so that C_SWITCH_X_SITE gets used # Change CFLAGS and CPPFLAGS temporarily so that C_SWITCH_X_SITE gets
# for the tests that follow. We set it back to REAL_CFLAGS later on. # used for the tests that follow. We set them back to REAL_CFLAGS and
# REAL_CPPFLAGS later on.
REAL_CPPFLAGS="$CPPFLAGS" REAL_CPPFLAGS="$CPPFLAGS"
...@@ -1831,12 +1832,27 @@ fi ...@@ -1831,12 +1832,27 @@ fi
if test "${USE_X_TOOLKIT}" = "MOTIF"; then if test "${USE_X_TOOLKIT}" = "MOTIF"; then
AC_CACHE_CHECK(for LessTif where some systems put it, emacs_cv_lesstif, 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.
OLD_CPPFLAGS=$CPPFLAGS
OLD_CFLAGS=$CFLAGS
CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS"
CFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CFLAGS"
[AC_TRY_COMPILE([#include </usr/X11R6/LessTif/Motif1.2/include/Xm/Xm.h>], [AC_TRY_COMPILE([#include </usr/X11R6/LessTif/Motif1.2/include/Xm/Xm.h>],
[int x = 5;], [int x = 5;],
emacs_cv_lesstif=yes, emacs_cv_lesstif=no)]) emacs_cv_lesstif=yes, emacs_cv_lesstif=no)])
if test $emacs_cv_lesstif = yes; then if test $emacs_cv_lesstif = yes; then
CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS" # Make sure this -I option remains in CPPFLAGS after it is set
# back to REAL_CPPFLAGS.
# There is no need to change REAL_CFLAGS, because REAL_CFLAGS does not
# have those other -I options anyway. Ultimately, having this
# directory ultimately in CPPFLAGS will be enough.
REAL_CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $REAL_CPPFLAGS"
LDFLAGS="-L/usr/X11R6/LessTif/Motif1.2/lib $LDFLAGS" LDFLAGS="-L/usr/X11R6/LessTif/Motif1.2/lib $LDFLAGS"
else
CFLAGS=$OLD_CFLAGS
CPPFLAGS=$OLD_CPPFLAGS
fi fi
AC_CACHE_CHECK(for Motif version 2.1, emacs_cv_motif_version_2_1, AC_CACHE_CHECK(for Motif version 2.1, emacs_cv_motif_version_2_1,
[AC_TRY_COMPILE([#include <Xm/Xm.h>], [AC_TRY_COMPILE([#include <Xm/Xm.h>],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment