mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-24 07:20:37 +00:00
Don't let a special LessTif/Motif1.2 install
shadow the main Lesstif/Motif-2.1 libs and includes.
This commit is contained in:
Stefan Monnier
parent
d5161e8c9b
commit
4693dbc99d
@ -1,3 +1,8 @@
|
||||
2005-03-16 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
* configure.in <Motif>: Don't let a special LessTif/Motif1.2 install
|
||||
shadow the main Lesstif/Motif-2.1 libs and includes.
|
||||
|
||||
2005-03-10 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
|
||||
|
||||
* configure.in: Only add XASSERTS to cppflags.
|
||||
|
||||
145
configure
vendored
145
configure
vendored
@ -10680,78 +10680,6 @@ fi
|
||||
fi
|
||||
|
||||
if test "${USE_X_TOOLKIT}" = "MOTIF"; then
|
||||
echo "$as_me:$LINENO: checking for LessTif where some systems put it" >&5
|
||||
echo $ECHO_N "checking for LessTif where some systems put it... $ECHO_C" >&6
|
||||
if test "${emacs_cv_lesstif+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
# 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"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include </usr/X11R6/LessTif/Motif1.2/include/Xm/Xm.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
int x = 5;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
emacs_cv_lesstif=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
emacs_cv_lesstif=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $emacs_cv_lesstif" >&5
|
||||
echo "${ECHO_T}$emacs_cv_lesstif" >&6
|
||||
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
|
||||
echo "$as_me:$LINENO: checking for Motif version 2.1" >&5
|
||||
echo $ECHO_N "checking for Motif version 2.1... $ECHO_C" >&6
|
||||
if test "${emacs_cv_motif_version_2_1+set}" = set; then
|
||||
@ -10892,6 +10820,79 @@ cat >>confdefs.h <<\_ACEOF
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
else
|
||||
echo "$as_me:$LINENO: checking for LessTif where some systems put it" >&5
|
||||
echo $ECHO_N "checking for LessTif where some systems put it... $ECHO_C" >&6
|
||||
if test "${emacs_cv_lesstif+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
# 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"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include </usr/X11R6/LessTif/Motif1.2/include/Xm/Xm.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
int x = 5;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
emacs_cv_lesstif=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
emacs_cv_lesstif=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $emacs_cv_lesstif" >&5
|
||||
echo "${ECHO_T}$emacs_cv_lesstif" >&6
|
||||
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
|
||||
|
||||
|
||||
49
configure.in
49
configure.in
@ -3,7 +3,7 @@ dnl To rebuild the `configure' script from this, execute the command
|
||||
dnl autoconf
|
||||
dnl in the directory containing this script.
|
||||
dnl
|
||||
dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004
|
||||
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,29 +2080,6 @@ if test "${HAVE_X11}" = "yes"; then
|
||||
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)
|
||||
@ -2121,6 +2098,30 @@ Motif version prior to 2.1.
|
||||
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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user