CVS gsasl/lib

[gsasl-commit]

Update of /home/cvs/gsasl/lib
In directory dopio:/tmp/cvs-serv21859

Modified Files:
        configure.ac 
Log Message:
Fix libidn test.


--- /home/cvs/gsasl/lib/configure.ac    2005/10/23 15:34:35     1.68
+++ /home/cvs/gsasl/lib/configure.ac    2005/10/23 15:46:16     1.69
@@ -268,26 +268,21 @@
 # Check for libidn
 AC_ARG_WITH(stringprep,
   AS_HELP_STRING([--without-stringprep], [disable non-ASCII support]),
-       stringprep=$withval, stringprep=yes)
+  stringprep=$withval, stringprep=yes)
 if test "$stringprep" != "no"; then
-  AC_LIB_LINKFLAGS_BODY([idn])
-  save_CPPFLAGS="$CPPFLAGS"
-  save_LIBS="$LIBS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCIDN])
-  LIBS="$LIBS $LIBIDN"
-  AC_CHECK_HEADER(stringprep.h,, stringprep=no)
-  AC_CHECK_FUNC(stringprep_check_version,, stringprep=no)
-  AC_CHECK_FUNCS(pr29_8z)
-  AC_CHECK_HEADERS(pr29.h)
-  CPPFLAGS="$save_CPPFLAGS"
-  LIBS="$save_LIBS"
-fi
-if test "$stringprep" != "no"; then
-  AC_DEFINE(WITH_STRINGPREP, 1,
-       [Define to 1 if you want to use string preparation from Libidn.])
-else
-  stringprep=no
-  AC_MSG_WARN([Libidn not found.  Stringprep disabled.])
+  AC_LIB_HAVE_LINKFLAGS(idn,, [#include <stringprep.h>],
+      [stringprep_check_version (0);])
+  if test "$ac_cv_libidn" != yes; then
+    stringprep=no
+    AC_MSG_WARN([GNU Libidn not found.  Stringprep disabled.])
+  else
+    stringprep=yes
+    save_LIBS="$LIBS"
+    LIBS="$LIBS $LIBIDN"
+    AC_CHECK_FUNCS(pr29_8z)
+    AC_CHECK_HEADERS(pr29.h)
+    LIBS="$save_LIBS"
+  fi
 fi
 AC_MSG_CHECKING([if non-ASCII support via Libidn should be built])
 AC_MSG_RESULT($stringprep)