--- sourceforge.net/trunk/rdesktop/configure.ac	2005/04/02 18:15:40	876
+++ sourceforge.net/trunk/rdesktop/configure.ac	2006/10/01 13:57:34	1278
@@ -1,4 +1,4 @@
-AC_INIT(rdesktop, 1.4.0)
+AC_INIT(rdesktop, 1.5.0)
 
 AC_CONFIG_SRCDIR([rdesktop.c])
 
@@ -22,7 +22,8 @@
 AC_CHECK_HEADER(sys/strtio.h, AC_DEFINE(HAVE_SYS_STRTIO_H))
 AC_CHECK_HEADER(locale.h, AC_DEFINE(HAVE_LOCALE_H))
 AC_CHECK_HEADER(langinfo.h, AC_DEFINE(HAVE_LANGINFO_H))
-AC_CHECK_HEADER(iconv.h, AC_DEFINE(HAVE_ICONV_H))
+
+AC_CHECK_TOOL(STRIP, strip, :)
 
 rpath=""
 
@@ -143,42 +144,99 @@
     [
     CFLAGS="$CFLAGS -I$withval/include"
     CPPFLAGS="$CPPFLAGS -I$withval/include"
-    LIBS="$LIBS -L$withval/lib"
+    LDFLAGS="$LDFLAGS -L$withval/lib"
+    rpath="$rpath:$withval/lib"
+    ]
+)
+
+AC_ARG_WITH(libsamplerate,
+    [  --with-libsamplerate=DIR look for libsamplerate at DIR/include, DIR/lib],
+    [
+    CFLAGS="$CFLAGS -I$withval/include"
+    CPPFLAGS="$CPPFLAGS -I$withval/include"
+    LDFLAGS="$LDFLAGS -L$withval/lib"
     rpath="$rpath:$withval/lib"
     ]
 )
 
+AC_CHECK_HEADER(samplerate.h,
+    [
+    LIBS="$LIBS -lsamplerate"
+    AC_DEFINE(HAVE_LIBSAMPLERATE)
+    ]
+)
+
 sound="yes"
 AC_ARG_WITH(sound,
-    [  --with-sound            select sound system ("oss", "sgi", "sun" or "libao") ],
+    [  --with-sound            select sound system ("oss", "sgi", "sun", "alsa" or "libao") ],
     [ 
     sound="$withval" 
     ])
 if test "$sound" = yes; then
-    AC_CHECK_HEADER(ao/ao.h, [sound=libao])
-    AC_CHECK_HEADER(sys/soundcard.h, [sound=oss])
-    AC_CHECK_HEADER(dmedia/audio.h, [sound=sgi])
-    AC_CHECK_HEADER(sys/audioio.h, [sound=sun])
+    AC_CHECK_HEADER(ao/ao.h,
+	[
+	sound=auto
+	SOUNDOBJ="$SOUNDOBJ rdpsnd_libao.o"
+	LIBS="$LIBS -lao"
+	AC_DEFINE(RDPSND_LIBAO)
+	])
+    AC_CHECK_HEADER(sys/soundcard.h,
+	[
+	sound=auto
+	SOUNDOBJ="$SOUNDOBJ rdpsnd_oss.o"
+	AC_DEFINE(RDPSND_OSS)
+	])
+    AC_CHECK_HEADER(dmedia/audio.h,
+	[
+	sound=auto
+	SOUNDOBJ="$SOUNDOBJ rdpsnd_sgi.o"
+	LIBS="$LIBS -laudio"
+	AC_DEFINE(RDPSND_SGI)
+	])
+    AC_CHECK_HEADER(sys/audioio.h,
+	[
+	sound=auto
+	SOUNDOBJ="$SOUNDOBJ rdpsnd_sun.o"
+	AC_DEFINE(RDPSND_SUN)
+	])
+    AC_CHECK_HEADER(alsa/asoundlib.h,
+	[
+	sound=auto
+	SOUNDOBJ="$SOUNDOBJ rdpsnd_alsa.o"
+	LIBS="$LIBS -lasound"
+	AC_DEFINE(RDPSND_ALSA)
+	])
 fi
+
 if test "$sound" = no; then
     break
+elif test "$sound" = auto; then
+    SOUNDOBJ="$SOUNDOBJ rdpsnd.o rdpsnd_dsp.o"
+    AC_DEFINE(WITH_RDPSND)
 elif test "$sound" = oss; then
-    SOUNDOBJ="rdpsnd.o rdpsnd_oss.o"
+    SOUNDOBJ="rdpsnd.o rdpsnd_dsp.o rdpsnd_oss.o"
     AC_DEFINE(WITH_RDPSND)
 elif test "$sound" = sgi; then
-    SOUNDOBJ="rdpsnd.o rdpsnd_sgi.o"
+    SOUNDOBJ="rdpsnd.o rdpsnd_dsp.o rdpsnd_sgi.o"
     LDFLAGS="$LDFLAGS -laudio"
+elif test "$sound" = yes; then
+    SOUNDOBJ="$SOUNDOBJ rdpsnd.o rdpsnd_dsp.o"
     AC_DEFINE(WITH_RDPSND)
 elif test "$sound" = sun; then
-    SOUNDOBJ="rdpsnd.o rdpsnd_sun.o"
+    SOUNDOBJ="rdpsnd.o rdpsnd_dsp.o rdpsnd_sun.o"
     AC_DEFINE(WITH_RDPSND)
 elif test "$sound" = libao; then
-    SOUNDOBJ="rdpsnd.o rdpsnd_libao.o"
+    SOUNDOBJ="rdpsnd.o rdpsnd_dsp.o rdpsnd_libao.o"
     LDFLAGS="$LDFLAGS -lao"
+    AC_DEFINE(RDPSND_SUN)
+elif test "$sound" = alsa; then
+    SOUNDOBJ="rdpsnd.o rdpsnd_dsp.o rdpsnd_alsa.o"
+    LDFLAGS="$LDFLAGS -lasound"
     AC_DEFINE(WITH_RDPSND)
+    AC_DEFINE(RDPSND_ALSA)
 else
    AC_MSG_WARN([sound support disabled])
-   AC_MSG_WARN([Currently supported systems are Open Sound System (oss), SGI AL (sgi), Sun/BSD (sun) and libao])
+   AC_MSG_WARN([Currently supported systems are Open Sound System (oss), SGI AL (sgi), Sun/BSD (sun), ALSA (alsa) and libao])
 fi
 AC_SUBST(SOUNDOBJ)
 
@@ -285,6 +343,7 @@
       if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
     done
    ])
+  AC_CHECK_HEADER(iconv.h, AC_DEFINE(HAVE_ICONV_H))
 
   AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
     am_cv_func_iconv="no, consider installing GNU libiconv"
@@ -619,7 +678,12 @@
 AC_CHECK_MEMBERS([struct statfs.f_namelen],,,[$statxfs_includes])
 AC_CHECK_MEMBERS([struct statvfs.f_namelen],,,[$statxfs_includes])
 
+#
+# Large file support
+#
+AC_SYS_LARGEFILE
 
+#
 # mntent
 #
 AC_CHECK_HEADER(mntent.h, AC_DEFINE(HAVE_MNTENT_H))
@@ -630,7 +694,12 @@
 #
 AC_ARG_WITH(ipv6,
     [  --with-ipv6             enable IPv6-support],
-    [ AC_DEFINE(IPv6) ])
+    [ 
+        if test $withval != "no";
+        then
+	    AC_DEFINE(IPv6,1)
+	fi
+    ])
 
 
 #
@@ -638,19 +707,48 @@
 #
 AC_ARG_WITH(debug,
     [  --with-debug            enable protocol debugging output],
-    [ AC_DEFINE(WITH_DEBUG) ])
+    [
+        if test $withval != "no";
+        then 
+            AC_DEFINE(WITH_DEBUG,1)
+	fi
+    ])
 
 AC_ARG_WITH(debug-kbd,
     [  --with-debug-kbd        enable debugging of keyboard handling],
-    [ AC_DEFINE(WITH_DEBUG_KBD) ])
+    [
+        if test $withval != "no";
+        then 
+            AC_DEFINE(WITH_DEBUG_KBD,1)
+	fi
+    ])
 
 AC_ARG_WITH(debug-rdp5,
     [  --with-debug-rdp5       enable debugging of RDP5 code],
-    [ AC_DEFINE(WITH_DEBUG_RDP5) ])
+    [
+        if test $withval != "no";
+        then 
+            AC_DEFINE(WITH_DEBUG_RDP5,1)
+	fi
+    ])
 
 AC_ARG_WITH(debug-clipboard,
     [  --with-debug-clipboard  enable debugging of clipboard code],
-    [ AC_DEFINE(WITH_DEBUG_CLIPBOARD) ])
+    [
+        if test $withval != "no";
+        then 
+            AC_DEFINE(WITH_DEBUG_CLIPBOARD,1)
+	fi
+    ])
+
+AC_ARG_WITH(debug-channel,
+    [  --with-debug-channel  enable debugging of virtual channel code],
+    [
+        if test $withval != "no";
+        then 
+            AC_DEFINE(WITH_DEBUG_CHANNEL,1)
+	fi
+    ])
 
 
 #