Mercurial > emacs
comparison configure.in @ 47249:7c7faeac1188
Look for LessTif in /usr/X11R6/LessTif/ before Motif.
Handle $GCC_LINK_TEST_OPTIONS and
$NON_GCC_LINK_TEST_OPTIONS after the AC_PROG_... macros.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Thu, 05 Sep 2002 22:58:05 +0000 |
parents | 03209f3ee750 |
children | e85548b04ce6 |
comparison
equal
deleted
inserted
replaced
47248:9c12d7725697 | 47249:7c7faeac1188 |
---|---|
1198 if test x$GCC = x && test "x$NON_GCC_TEST_OPTIONS" != x | 1198 if test x$GCC = x && test "x$NON_GCC_TEST_OPTIONS" != x |
1199 then | 1199 then |
1200 CC="$CC $NON_GCC_TEST_OPTIONS" | 1200 CC="$CC $NON_GCC_TEST_OPTIONS" |
1201 fi | 1201 fi |
1202 | 1202 |
1203 if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x | |
1204 then | |
1205 ac_link="$ac_link $GCC_LINK_TEST_OPTIONS" | |
1206 fi | |
1207 | |
1208 if test x$GCC = x && test "x$NON_GCC_LINK_TEST_OPTIONS" != x | |
1209 then | |
1210 ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS" | |
1211 fi | |
1212 | |
1213 #### Some other nice autoconf tests. If you add a test here which | 1203 #### Some other nice autoconf tests. If you add a test here which |
1214 #### should make an entry in src/config.h, don't forget to add an | 1204 #### should make an entry in src/config.h, don't forget to add an |
1215 #### #undef clause to src/config.h.in for autoconf to modify. | 1205 #### #undef clause to src/config.h.in for autoconf to modify. |
1216 | 1206 |
1217 dnl checks for programs | 1207 dnl checks for programs |
1219 AC_PROG_CPP | 1209 AC_PROG_CPP |
1220 AC_PROG_INSTALL | 1210 AC_PROG_INSTALL |
1221 AC_PROG_YACC | 1211 AC_PROG_YACC |
1222 if test "x$RANLIB" = x; then | 1212 if test "x$RANLIB" = x; then |
1223 AC_PROG_RANLIB | 1213 AC_PROG_RANLIB |
1214 fi | |
1215 | |
1216 dnl Add our options to ac_link now, after it is set up. | |
1217 | |
1218 if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x | |
1219 then | |
1220 ac_link="$ac_link $GCC_LINK_TEST_OPTIONS" | |
1221 fi | |
1222 | |
1223 if test x$GCC = x && test "x$NON_GCC_LINK_TEST_OPTIONS" != x | |
1224 then | |
1225 ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS" | |
1224 fi | 1226 fi |
1225 | 1227 |
1226 dnl checks for Unix variants | 1228 dnl checks for Unix variants |
1227 AC_AIX | 1229 AC_AIX |
1228 | 1230 |
1815 AC_CHECK_LIB(Xext, XShapeQueryExtension) | 1817 AC_CHECK_LIB(Xext, XShapeQueryExtension) |
1816 fi | 1818 fi |
1817 fi | 1819 fi |
1818 | 1820 |
1819 if test "${USE_X_TOOLKIT}" = "MOTIF"; then | 1821 if test "${USE_X_TOOLKIT}" = "MOTIF"; then |
1822 AC_CACHE_CHECK(for LessTif where some systems put it, | |
1823 [AC_TRY_COMPILE([#include </usr/X11R6/LessTif/Motif1.2/include/Xm/Xm.h>], | |
1824 [int x = 5;], | |
1825 emacs_cv_lesstif=yes, emacs_cv_lesstif=no) | |
1826 if test $emacs_cv_lesstif = yes; then | |
1827 CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS" | |
1828 LDFLAGS="-L/usr/X11R6/LessTif/Motif1.2/lib $LDFLAGS" | |
1829 fi | |
1820 AC_CACHE_CHECK(for Motif version 2.1, emacs_cv_motif_version_2_1, | 1830 AC_CACHE_CHECK(for Motif version 2.1, emacs_cv_motif_version_2_1, |
1821 [AC_TRY_COMPILE([#include <Xm/Xm.h>], | 1831 [AC_TRY_COMPILE([#include <Xm/Xm.h>], |
1822 [#if XmVERSION > 2 || (XmVERSION == 2 && XmREVISION >= 1) | 1832 [#if XmVERSION > 2 || (XmVERSION == 2 && XmREVISION >= 1) |
1823 int x = 5; | 1833 int x = 5; |
1824 #else | 1834 #else |