comparison configure.in @ 25267:3bb9959ad6cd

Add --with-toolkit-scroll-bars. If "no", use Emacs' scroll bars, even if configured for Motif or when Xaw3d is available.
author Gerd Moellmann <gerd@gnu.org>
date Sun, 15 Aug 1999 22:00:50 +0000
parents cf628ae92f06
children fbe05e67b94d
comparison
equal deleted inserted replaced
25266:1bae87a16cdf 25267:3bb9959ad6cd
76 [ --with-gif use -lungif for displaying GIF images]) 76 [ --with-gif use -lungif for displaying GIF images])
77 AC_ARG_WITH(png, 77 AC_ARG_WITH(png,
78 [ --with-png use -lpng for displaying PNG images]) 78 [ --with-png use -lpng for displaying PNG images])
79 AC_ARG_WITH(sound, 79 AC_ARG_WITH(sound,
80 [ --with-sound native sound support for GNU/Linux and free BSDs]) 80 [ --with-sound native sound support for GNU/Linux and free BSDs])
81 AC_ARG_WITH(toolkit-scroll-bars,
82 [ --with-toolkit-scroll-bars use Motif or Xaw3d scroll bars])
81 83
82 #### Make srcdir absolute, if it isn't already. It's important to 84 #### Make srcdir absolute, if it isn't already. It's important to
83 #### avoid running the path through pwd unnecessary, since pwd can 85 #### avoid running the path through pwd unnecessary, since pwd can
84 #### give you automounter prefixes, which can go away. We do all this 86 #### give you automounter prefixes, which can go away. We do all this
85 #### so Emacs can find its files when run uninstalled. 87 #### so Emacs can find its files when run uninstalled.
1666 fi 1668 fi
1667 1669
1668 X_TOOLKIT_TYPE=$USE_X_TOOLKIT 1670 X_TOOLKIT_TYPE=$USE_X_TOOLKIT
1669 1671
1670 dnl Use toolkit scroll bars if configured for X toolkit and either 1672 dnl Use toolkit scroll bars if configured for X toolkit and either
1671 dnl using Motif or Xaw3d is available. 1673 dnl using Motif or Xaw3d is available, and unless
1672 1674 dnl --with-toolkit-scroll-bars=no was specified.
1673 if test "${USE_X_TOOLKIT}" != "none"; then 1675
1674 if test "${USE_X_TOOLKIT}" = "MOTIF"; then 1676 USE_TOOLKIT_SCROLL_BARS=no
1675 AC_DEFINE(USE_TOOLKIT_SCROLL_BARS) 1677 if test "${with_toolkit_scroll_bars}" != "no"; then
1676 HAVE_XAW3D=no 1678 if test "${USE_X_TOOLKIT}" != "none"; then
1677 elif test "${HAVE_XAW3D}" = "yes"; then 1679 if test "${USE_X_TOOLKIT}" = "MOTIF"; then
1678 AC_DEFINE(USE_TOOLKIT_SCROLL_BARS) 1680 AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
1681 HAVE_XAW3D=no
1682 USE_TOOLKIT_SCROLL_BARS=yes
1683 elif test "${HAVE_XAW3D}" = "yes"; then
1684 AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
1685 USE_TOOLKIT_SCROLL_BARS=yes
1686 fi
1679 fi 1687 fi
1680 fi 1688 fi
1681 1689
1682 if test "${USE_X_TOOLKIT}" != "none"; then 1690 if test "${USE_X_TOOLKIT}" != "none"; then
1683 AC_MSG_CHECKING(X11 toolkit version) 1691 AC_MSG_CHECKING(X11 toolkit version)
1958 echo " Does Emacs use -lXpm? ${HAVE_XPM}" 1966 echo " Does Emacs use -lXpm? ${HAVE_XPM}"
1959 echo " Does Emacs use -ljpeg? ${HAVE_JPEG}" 1967 echo " Does Emacs use -ljpeg? ${HAVE_JPEG}"
1960 echo " Does Emacs use -ltiff? ${HAVE_TIFF}" 1968 echo " Does Emacs use -ltiff? ${HAVE_TIFF}"
1961 echo " Does Emacs use -lungif? ${HAVE_GIF}" 1969 echo " Does Emacs use -lungif? ${HAVE_GIF}"
1962 echo " Does Emacs use -lpng? ${HAVE_PNG}" 1970 echo " Does Emacs use -lpng? ${HAVE_PNG}"
1971 echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
1963 echo 1972 echo
1964 1973
1965 # Remove any trailing slashes in these variables. 1974 # Remove any trailing slashes in these variables.
1966 changequote(, )dnl 1975 changequote(, )dnl
1967 test "${prefix}" != NONE && 1976 test "${prefix}" != NONE &&