--- sourceforge.net/trunk/rdesktop/configure.ac	2005/04/02 17:31:27	873
+++ sourceforge.net/trunk/rdesktop/configure.ac	2005/12/27 09:20:33	1034
@@ -1,4 +1,4 @@
-AC_INIT(rdesktop, 1.4.0)
+AC_INIT(rdesktop, 1.4.1)
 
 AC_CONFIG_SRCDIR([rdesktop.c])
 
@@ -22,8 +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_HEADER(unistd.h, AC_DEFINE(HAVE_UNISTD_H))
+
+AC_CHECK_TOOL(STRIP, strip, :)
 
 rpath=""
 
@@ -286,6 +286,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"
@@ -397,7 +398,15 @@
 AC_CHECK_HEADERS(sys/statvfs.h)
 AC_CHECK_HEADERS(sys/statfs.h)
 AC_CHECK_HEADERS(sys/param.h)
-AC_CHECK_HEADERS(sys/mount.h)
+
+mount_includes="\
+  $ac_includes_default
+  #if HAVE_SYS_PARAM_H
+  # include <sys/param.h>
+  #endif
+  "
+
+AC_CHECK_HEADERS(sys/mount.h,,,[$mount_includes])
 
 #################################################
 # these tests are taken from the GNU fileutils package
@@ -623,7 +632,12 @@
 #
 AC_ARG_WITH(ipv6,
     [  --with-ipv6             enable IPv6-support],
-    [ AC_DEFINE(IPv6) ])
+    [ 
+        if test $withval != "no";
+        then
+	    AC_DEFINE(IPv6,1)
+	fi
+    ])
 
 
 #
@@ -631,19 +645,39 @@
 #
 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
+    ])
 
 
 #