[Emacs-diffs] Changes to emacs/configure.in

[Stefan Monnier]

Index: emacs/configure.in
diff -c emacs/configure.in:1.383 emacs/configure.in:1.384
*** emacs/configure.in:1.383    Thu Mar 10 17:22:50 2005
--- emacs/configure.in  Wed Mar 16 22:21:31 2005
***************
*** 3,9 ****
  dnl   autoconf
  dnl in the directory containing this script.
  dnl
! dnl  Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004
  dnl  Free Software Foundation, Inc.
  dnl
  dnl  This file is part of GNU Emacs.
--- 3,9 ----
  dnl   autoconf
  dnl in the directory containing this script.
  dnl
! dnl  Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005
  dnl  Free Software Foundation, Inc.
  dnl
  dnl  This file is part of GNU Emacs.
***************
*** 2080,2108 ****
  fi
  
  if test "${USE_X_TOOLKIT}" = "MOTIF"; then
-   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>],
-     [int x = 5;],
-     emacs_cv_lesstif=yes, emacs_cv_lesstif=no)])
-   if test $emacs_cv_lesstif = yes; then
-     # 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"
-   else
-     CFLAGS=$OLD_CFLAGS
-     CPPFLAGS=$OLD_CPPFLAGS
-   fi
    AC_CACHE_CHECK(for Motif version 2.1, emacs_cv_motif_version_2_1,
    [AC_TRY_COMPILE([#include <Xm/Xm.h>],
      [#if XmVERSION > 2 || (XmVERSION == 2 && XmREVISION >= 1)
--- 2080,2085 ----
***************
*** 2121,2126 ****
--- 2098,2127 ----
        AC_DEFINE(HAVE_LIBXP, 1,
                [Define to 1 if you have the Xp library (-lXp).])
      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.
+     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>],
+       [int x = 5;],
+       emacs_cv_lesstif=yes, emacs_cv_lesstif=no)])
+     if test $emacs_cv_lesstif = yes; then
+       # 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"
+     else
+       CFLAGS=$OLD_CFLAGS
+       CPPFLAGS=$OLD_CPPFLAGS
+     fi
    fi
  fi