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

[Richard M. Stallman]

Index: emacs/configure.in
diff -c emacs/configure.in:1.303 emacs/configure.in:1.304
*** emacs/configure.in:1.303    Wed Jul 24 15:43:02 2002
--- emacs/configure.in  Thu Sep  5 18:58:05 2002
***************
*** 1200,1215 ****
    CC="$CC $NON_GCC_TEST_OPTIONS"
  fi
  
- if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x
- then
-   ac_link="$ac_link $GCC_LINK_TEST_OPTIONS"
- fi
- 
- if test x$GCC = x && test "x$NON_GCC_LINK_TEST_OPTIONS" != x
- then
-   ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS"
- fi
- 
  #### Some other nice autoconf tests.  If you add a test here which
  #### should make an entry in src/config.h, don't forget to add an
  #### #undef clause to src/config.h.in for autoconf to modify.
--- 1200,1205 ----
***************
*** 1223,1228 ****
--- 1213,1230 ----
    AC_PROG_RANLIB
  fi
  
+ dnl Add our options to ac_link now, after it is set up.
+ 
+ if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x
+ then
+   ac_link="$ac_link $GCC_LINK_TEST_OPTIONS"
+ fi
+ 
+ if test x$GCC = x && test "x$NON_GCC_LINK_TEST_OPTIONS" != x
+ then
+   ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS"
+ fi
+ 
  dnl checks for Unix variants
  AC_AIX
  
***************
*** 1817,1822 ****
--- 1819,1832 ----
  fi
  
  if test "${USE_X_TOOLKIT}" = "MOTIF"; then
+   AC_CACHE_CHECK(for LessTif where some systems put it,
+   [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
+     CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS"
+     LDFLAGS="-L/usr/X11R6/LessTif/Motif1.2/lib $LDFLAGS"
+   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)