#

[gnu-emacs] / configure.in

diff --git a/configure.in b/configure.in
index 056bd896cef72579d17eec92316c23bcc73b8ce6..0e10721fe6d788f5fa32909127e0226c4bde2aca 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -76,8 +76,6 @@ AC_ARG_WITH(gif,
 [  --with-gif              use -lungif for displaying GIF images])
 AC_ARG_WITH(png,
 [  --with-png              use -lpng for displaying PNG images])
-AC_ARG_WITH(sound,
-[  --with-sound            native sound support for GNU/Linux and free BSDs])
 AC_ARG_WITH(toolkit-scroll-bars,
 [  --with-toolkit-scroll-bars  use Motif or Xaw3d scroll bars])
 
@@ -1109,12 +1107,7 @@ dnl checks for Unix variants
 AC_AIX
 
 # Sound support for GNU/Linux and the free BSDs.
-if test "${with_sound}" = ""; then
-  with_sound=no
-fi
-if test "${with_sound}" != "no"; then
-  AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h)
-fi
+AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h)
 
 dnl checks for header files
 AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h termcap.h)
@@ -1575,24 +1568,6 @@ fi
 
 X_TOOLKIT_TYPE=$USE_X_TOOLKIT
 
-dnl Use toolkit scroll bars if configured for X toolkit and either
-dnl using Motif or Xaw3d is available, and unless
-dnl --with-toolkit-scroll-bars=no was specified.
-
-USE_TOOLKIT_SCROLL_BARS=no
-if test "${with_toolkit_scroll_bars}" != "no"; then
-  if test "${USE_X_TOOLKIT}" != "none"; then
-    if test "${USE_X_TOOLKIT}" = "MOTIF"; then
-      AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
-      HAVE_XAW3D=no
-      USE_TOOLKIT_SCROLL_BARS=yes
-    elif test "${HAVE_XAW3D}" = "yes"; then
-      AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
-      USE_TOOLKIT_SCROLL_BARS=yes
-    fi
-  fi
-fi
-
 if test "${USE_X_TOOLKIT}" != "none"; then
   AC_MSG_CHECKING(X11 toolkit version)
   AC_CACHE_VAL(emacs_cv_x11_toolkit_version_6,
@@ -1653,6 +1628,24 @@ if test "${HAVE_X11}" = "yes"; then
   fi
 fi
   
+dnl Use toolkit scroll bars if configured for X toolkit and either
+dnl using Motif or Xaw3d is available, and unless
+dnl --with-toolkit-scroll-bars=no was specified.
+
+USE_TOOLKIT_SCROLL_BARS=no
+if test "${with_toolkit_scroll_bars}" != "no"; then
+  if test "${USE_X_TOOLKIT}" != "none"; then
+    if test "${USE_X_TOOLKIT}" = "MOTIF"; then
+      AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
+      HAVE_XAW3D=no
+      USE_TOOLKIT_SCROLL_BARS=yes
+    elif test "${HAVE_XAW3D}" = "yes"; then
+      AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
+      USE_TOOLKIT_SCROLL_BARS=yes
+    fi
+  fi
+fi
+
 ### Use -lXpm if available, unless `--with-xpm=no'.
 HAVE_XPM=no
 if test "${HAVE_X11}" = "yes"; then
@@ -1707,7 +1700,7 @@ if test "${HAVE_X11}" = "yes"; then
     old_c_flags="${CFLAGS}"
     CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}"
     AC_CHECK_HEADER(tiffio.h,
-      AC_CHECK_LIB(tiff, TIFFGetVersion, HAVE_TIFF=yes, , -lX11))
+      AC_CHECK_LIB(tiff, TIFFGetVersion, HAVE_TIFF=yes, , -lX11 -lm))
     CFLAGS="${old_c_flags}"
   fi