Mercurial > emacs

comparison configure.in @ 60654:25e9a2bb0d17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't let a special LessTif/Motif1.2 install shadow the main Lesstif/Motif-2.1 libs and includes.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Wed, 16 Mar 2005 22:21:31 +0000
parents 57a0edbfdba7
children ee35f03204fe c22274b1aa9b 30ad2795fdab
comparison
equal deleted inserted replaced
60653:daacc07136fb 60654:25e9a2bb0d17
1 dnl Autoconf script for GNU Emacs 1 dnl Autoconf script for GNU Emacs
2 dnl To rebuild the `configure' script from this, execute the command 2 dnl To rebuild the `configure' script from this, execute the command
3 dnl autoconf 3 dnl autoconf
4 dnl in the directory containing this script. 4 dnl in the directory containing this script.
5 dnl 5 dnl
6 dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004 6 dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005
7 dnl Free Software Foundation, Inc. 7 dnl Free Software Foundation, Inc.
8 dnl 8 dnl
9 dnl This file is part of GNU Emacs. 9 dnl This file is part of GNU Emacs.
10 dnl 10 dnl
11 dnl GNU Emacs is free software; you can redistribute it and/or modify 11 dnl GNU Emacs is free software; you can redistribute it and/or modify
2078 AC_CHECK_LIB(Xext, XShapeQueryExtension) 2078 AC_CHECK_LIB(Xext, XShapeQueryExtension)
2079 fi 2079 fi
2080 fi 2080 fi
2081 2081
2082 if test "${USE_X_TOOLKIT}" = "MOTIF"; then 2082 if test "${USE_X_TOOLKIT}" = "MOTIF"; then
2083 AC_CACHE_CHECK(for LessTif where some systems put it, emacs_cv_lesstif,
2084 # We put this in CFLAGS temporarily to precede other -I options
2085 # that might be in CFLAGS temporarily.
2086 # We put this in CPPFLAGS where it precedes the other -I options.
2087 OLD_CPPFLAGS=$CPPFLAGS
2088 OLD_CFLAGS=$CFLAGS
2089 CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS"
2090 CFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CFLAGS"
2091 [AC_TRY_COMPILE([#include </usr/X11R6/LessTif/Motif1.2/include/Xm/Xm.h>],
2092 [int x = 5;],
2093 emacs_cv_lesstif=yes, emacs_cv_lesstif=no)])
2094 if test $emacs_cv_lesstif = yes; then
2095 # Make sure this -I option remains in CPPFLAGS after it is set
2096 # back to REAL_CPPFLAGS.
2097 # There is no need to change REAL_CFLAGS, because REAL_CFLAGS does not
2098 # have those other -I options anyway. Ultimately, having this
2099 # directory ultimately in CPPFLAGS will be enough.
2100 REAL_CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $REAL_CPPFLAGS"
2101 LDFLAGS="-L/usr/X11R6/LessTif/Motif1.2/lib $LDFLAGS"
2102 else
2103 CFLAGS=$OLD_CFLAGS
2104 CPPFLAGS=$OLD_CPPFLAGS
2105 fi
2106 AC_CACHE_CHECK(for Motif version 2.1, emacs_cv_motif_version_2_1, 2083 AC_CACHE_CHECK(for Motif version 2.1, emacs_cv_motif_version_2_1,
2107 [AC_TRY_COMPILE([#include <Xm/Xm.h>], 2084 [AC_TRY_COMPILE([#include <Xm/Xm.h>],
2108 [#if XmVERSION > 2 || (XmVERSION == 2 && XmREVISION >= 1) 2085 [#if XmVERSION > 2 || (XmVERSION == 2 && XmREVISION >= 1)
2109 int x = 5; 2086 int x = 5;
2110 #else 2087 #else
2118 [Define to 1 if you have Motif 2.1 or newer.]) 2095 [Define to 1 if you have Motif 2.1 or newer.])
2119 AC_CHECK_LIB(Xp, XpCreateContext, HAVE_LIBXP=yes) 2096 AC_CHECK_LIB(Xp, XpCreateContext, HAVE_LIBXP=yes)
2120 if test ${HAVE_LIBXP} = yes; then 2097 if test ${HAVE_LIBXP} = yes; then
2121 AC_DEFINE(HAVE_LIBXP, 1, 2098 AC_DEFINE(HAVE_LIBXP, 1,
2122 [Define to 1 if you have the Xp library (-lXp).]) 2099 [Define to 1 if you have the Xp library (-lXp).])
2100 fi
2101 else
2102 AC_CACHE_CHECK(for LessTif where some systems put it, emacs_cv_lesstif,
2103 # We put this in CFLAGS temporarily to precede other -I options
2104 # that might be in CFLAGS temporarily.
2105 # We put this in CPPFLAGS where it precedes the other -I options.
2106 OLD_CPPFLAGS=$CPPFLAGS
2107 OLD_CFLAGS=$CFLAGS
2108 CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS"
2109 CFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CFLAGS"
2110 [AC_TRY_COMPILE([#include </usr/X11R6/LessTif/Motif1.2/include/Xm/Xm.h>],
2111 [int x = 5;],
2112 emacs_cv_lesstif=yes, emacs_cv_lesstif=no)])
2113 if test $emacs_cv_lesstif = yes; then
2114 # Make sure this -I option remains in CPPFLAGS after it is set
2115 # back to REAL_CPPFLAGS.
2116 # There is no need to change REAL_CFLAGS, because REAL_CFLAGS does not
2117 # have those other -I options anyway. Ultimately, having this
2118 # directory ultimately in CPPFLAGS will be enough.
2119 REAL_CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $REAL_CPPFLAGS"
2120 LDFLAGS="-L/usr/X11R6/LessTif/Motif1.2/lib $LDFLAGS"
2121 else
2122 CFLAGS=$OLD_CFLAGS
2123 CPPFLAGS=$OLD_CPPFLAGS
2123 fi 2124 fi
2124 fi 2125 fi
2125 fi 2126 fi
2126 2127
2127 ### Is -lXaw3d available? 2128 ### Is -lXaw3d available?