--- sourceforge.net/trunk/rdesktop/configure.ac	2004/12/13 12:41:20	802
+++ sourceforge.net/trunk/rdesktop/configure.ac	2005/03/13 13:58:23	858
@@ -1,4 +1,4 @@
-AC_INIT(rdesktop, 1.3.1)
+AC_INIT(rdesktop, 1.4.0)
 
 AC_CONFIG_SRCDIR([rdesktop.c])
 
@@ -20,6 +20,9 @@
 AC_CHECK_HEADER(sys/modem.h, AC_DEFINE(HAVE_SYS_MODEM_H))
 AC_CHECK_HEADER(sys/filio.h, AC_DEFINE(HAVE_SYS_FILIO_H))
 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))
 
 rpath=""
 
@@ -135,13 +138,24 @@
 #
 # sound
 #
+AC_ARG_WITH(libao,
+    [  --with-libao=DIR        look for libao at DIR/include, DIR/lib],
+    [
+    CFLAGS="$CFLAGS -I$withval/include"
+    CPPFLAGS="$CPPFLAGS -I$withval/include"
+    LIBS="$LIBS -L$withval/lib"
+    rpath="$rpath:$withval/lib"
+    ]
+)
+
 sound="yes"
 AC_ARG_WITH(sound,
-    [  --with-sound            select sound system ("oss", "sgi" or "sun") ],
+    [  --with-sound            select sound system ("oss", "sgi", "sun" 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])
@@ -158,9 +172,13 @@
 elif test "$sound" = sun; then
     SOUNDOBJ="rdpsnd.o rdpsnd_sun.o"
     AC_DEFINE(WITH_RDPSND)
+elif test "$sound" = libao; then
+    SOUNDOBJ="rdpsnd.o rdpsnd_libao.o"
+    LDFLAGS="$LDFLAGS -lao"
+    AC_DEFINE(WITH_RDPSND)
 else
-   AC_MSG_WARN([sound support disabled (no sys/soundcard.h or sys/audioio.h)])
-   AC_MSG_WARN([Currently supported systems are Open Sound System (oss), SGI AL (sgi) and Sun/BSD (sun)])
+   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])
 fi
 AC_SUBST(SOUNDOBJ)
 
@@ -247,6 +265,82 @@
 
 UTILS_FUNC_DIRFD
 
+#
+# iconv
+#
+
+dnl This macros shamelessly stolen from
+dnl http://gcc.gnu.org/ml/gcc-bugs/2001-06/msg01398.html.
+dnl Written by Bruno Haible.
+
+AC_DEFUN([UTILS_FUNC_ICONV],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+
+  AC_ARG_WITH([libiconv-prefix],
+[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
+    for dir in `echo "$withval" | tr : ' '`; do
+      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
+      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+    done
+   ])
+
+  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
+      am_cv_func_iconv=yes)
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS -liconv"
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
+        am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes)
+      LIBS="$am_save_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL(am_cv_proto_iconv, [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([$]{ac_t:-
+         }[$]am_cv_proto_iconv)
+    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+      [Define as const if the declaration of iconv() needs const.])
+  fi
+  LIBICONV=
+  if test "$am_cv_lib_iconv" = yes; then
+    LIBICONV="-liconv"
+  fi
+  AC_SUBST(LIBICONV)
+])
+
+UTILS_FUNC_ICONV
+LIBS="$LIBS $LIBICONV"
 
 #
 # IPv6