Regenerate.
This commit is contained in:
Chong Yidong
parent
687b2aa364
commit
dba7bae083
1 changed files with 85 additions and 144 deletions
229
configure
vendored
229
configure
vendored
|
|
@ -412,10 +412,10 @@ else
|
|||
fi
|
||||
|
||||
test \$exitcode = 0") || {
|
||||
echo Please tell bug-autoconf@gnu.org about your system,
|
||||
echo including any error possibly output before this message.
|
||||
echo This can help us improve future autoconf versions.
|
||||
echo Configuration will now proceed without shell functions.
|
||||
echo No shell found that supports shell functions.
|
||||
echo Please tell autoconf@gnu.org about your system,
|
||||
echo including any error possibly output before this
|
||||
echo message
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -12098,11 +12098,79 @@ _ACEOF
|
|||
fi
|
||||
fi
|
||||
|
||||
HAVE_XAW3D=no
|
||||
if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
|
||||
if test x"${HAVE_X11R5}" = xyes; then
|
||||
{ echo "$as_me:$LINENO: checking X11 version 5 with Xaw" >&5
|
||||
echo $ECHO_N "checking X11 version 5 with Xaw... $ECHO_C" >&6; }
|
||||
if test "${emacs_cv_x11_version_5_with_xaw+set}" = set; then
|
||||
if test x"${HAVE_X11R5}" != xyes; then
|
||||
USE_X_TOOLKIT=none
|
||||
else
|
||||
{ echo "$as_me:$LINENO: checking for xaw3d" >&5
|
||||
echo $ECHO_N "checking for xaw3d... $ECHO_C" >&6; }
|
||||
if test "${emacs_cv_xaw3d+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <X11/Intrinsic.h>
|
||||
#include <X11/Xaw3d/Simple.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_link") 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); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest$ac_exeext &&
|
||||
$as_test_x conftest$ac_exeext; then
|
||||
emacs_cv_xaw3d=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
emacs_cv_xaw3d=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
|
||||
if test $emacs_cv_xaw3d = yes; then
|
||||
{ echo "$as_me:$LINENO: result: yes; using Lucid toolkit" >&5
|
||||
echo "${ECHO_T}yes; using Lucid toolkit" >&6; }
|
||||
USE_X_TOOLKIT=LUCID
|
||||
HAVE_XAW3D=yes
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_XAW3D 1
|
||||
_ACEOF
|
||||
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
{ echo "$as_me:$LINENO: checking for libXaw" >&5
|
||||
echo $ECHO_N "checking for libXaw... $ECHO_C" >&6; }
|
||||
if test "${emacs_cv_xaw+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
|
|
@ -12140,35 +12208,32 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|||
test ! -s conftest.err
|
||||
} && test -s conftest$ac_exeext &&
|
||||
$as_test_x conftest$ac_exeext; then
|
||||
emacs_cv_x11_version_5_with_xaw=yes
|
||||
emacs_cv_xaw=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
emacs_cv_x11_version_5_with_xaw=no
|
||||
emacs_cv_xaw=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
|
||||
if test $emacs_cv_x11_version_5_with_xaw = yes; then
|
||||
{ echo "$as_me:$LINENO: result: 5 or newer, with Xaw; use toolkit by default" >&5
|
||||
echo "${ECHO_T}5 or newer, with Xaw; use toolkit by default" >&6; }
|
||||
USE_X_TOOLKIT=LUCID
|
||||
else
|
||||
if test x"${USE_X_TOOLKIT}" = xLUCID; then
|
||||
if test $emacs_cv_xaw = yes; then
|
||||
{ echo "$as_me:$LINENO: result: yes; using Lucid toolkit" >&5
|
||||
echo "${ECHO_T}yes; using Lucid toolkit" >&6; }
|
||||
USE_X_TOOLKIT=LUCID
|
||||
elif test x"${USE_X_TOOLKIT}" = xLUCID; then
|
||||
{ { echo "$as_me:$LINENO: error: Lucid toolkit requires X11/Xaw include files" >&5
|
||||
echo "$as_me: error: Lucid toolkit requires X11/Xaw include files" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: before 5 or no Xaw; do not use toolkit by default" >&5
|
||||
echo "${ECHO_T}before 5 or no Xaw; do not use toolkit by default" >&6; }
|
||||
{ echo "$as_me:$LINENO: result: no; do not use toolkit by default" >&5
|
||||
echo "${ECHO_T}no; do not use toolkit by default" >&6; }
|
||||
USE_X_TOOLKIT=none
|
||||
fi
|
||||
fi
|
||||
else
|
||||
USE_X_TOOLKIT=none
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -12605,130 +12670,6 @@ echo "${ECHO_T}$emacs_cv_lesstif" >&6; }
|
|||
fi
|
||||
fi
|
||||
|
||||
### Is -lXaw3d available?
|
||||
HAVE_XAW3D=no
|
||||
if test "${HAVE_X11}" = "yes"; then
|
||||
if test "${USE_X_TOOLKIT}" != "none" && test "${with_toolkit_scroll_bars}" != "no"; then
|
||||
{ echo "$as_me:$LINENO: checking for X11/Xaw3d/Scrollbar.h" >&5
|
||||
echo $ECHO_N "checking for X11/Xaw3d/Scrollbar.h... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_header_X11_Xaw3d_Scrollbar_h+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <X11/Xaw3d/Scrollbar.h>
|
||||
_ACEOF
|
||||
if { (ac_try="$ac_cpp conftest.$ac_ext"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
||||
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
}; then
|
||||
ac_cv_header_X11_Xaw3d_Scrollbar_h=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_header_X11_Xaw3d_Scrollbar_h=no
|
||||
fi
|
||||
|
||||
rm -f conftest.err conftest.$ac_ext
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw3d_Scrollbar_h" >&5
|
||||
echo "${ECHO_T}$ac_cv_header_X11_Xaw3d_Scrollbar_h" >&6; }
|
||||
if test $ac_cv_header_X11_Xaw3d_Scrollbar_h = yes; then
|
||||
{ echo "$as_me:$LINENO: checking for XawScrollbarSetThumb in -lXaw3d" >&5
|
||||
echo $ECHO_N "checking for XawScrollbarSetThumb in -lXaw3d... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_lib_Xaw3d_XawScrollbarSetThumb+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lXaw3d $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char XawScrollbarSetThumb ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return XawScrollbarSetThumb ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_link") 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); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest$ac_exeext &&
|
||||
$as_test_x conftest$ac_exeext; then
|
||||
ac_cv_lib_Xaw3d_XawScrollbarSetThumb=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_lib_Xaw3d_XawScrollbarSetThumb=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&6; }
|
||||
if test $ac_cv_lib_Xaw3d_XawScrollbarSetThumb = yes; then
|
||||
HAVE_XAW3D=yes
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
if test "${HAVE_XAW3D}" = "yes"; then
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_XAW3D 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
USE_TOOLKIT_SCROLL_BARS=no
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue