[GNUnet-SVN] r18854 - gnunet

[gnunet]

Author: grothoff
Date: 2011-12-30 23:30:48 +0100 (Fri, 30 Dec 2011)
New Revision: 18854

Modified:
   gnunet/configure.ac
Log:
-add test for libunistring

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2011-12-30 22:25:33 UTC (rev 18853)
+++ gnunet/configure.ac 2011-12-30 22:30:48 UTC (rev 18854)
@@ -212,6 +212,7 @@
     LDFLAGS="$LDFLAGS -pie"
 fi])
 
+
 # Linker hardening options
 # Currently these options are ELF specific - you can't use this with MacOSX
 AC_ARG_ENABLE(linker-hardening,
@@ -367,7 +368,43 @@
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+# test for libunistring
+unistring=0
+AC_MSG_CHECKING(for libunistring)
+AC_ARG_WITH(unistring,
+   [  --with-unistring=PFX    base of libunistring installation],
+   [AC_MSG_RESULT([$with_unistring])
+    case $with_unistring in
+      no)
+        ;;
+      yes)
+        AC_CHECK_HEADERS(unistr.h,
+          AC_CHECK_LIB([unistring], [u8_check],
+            unistring=1))
+        ;;
+      *)
+        LDFLAGS="-L$with_unistring/lib $LDFLAGS"
+        CPPFLAGS="-I$with_unistring/include $CPPFLAGS"
+        AC_CHECK_HEADERS(unistr.h,
+          AC_CHECK_LIB([unistring], [u8_check],
+            EXT_LIB_PATH="-L$with_unistring/lib $EXT_LIB_PATH"
+            unistring=1))
+        ;;
+    esac
+   ],
+   [AC_MSG_RESULT([--with-unistring not specified])
+    AC_CHECK_HEADERS(unistr.h,
+     AC_CHECK_LIB([unistring], [u8_check],
+      unistring=1))])
+if test "$unistring" != 1
+then
+ AC_MSG_ERROR([GNUnet requires libunistring])
+fi
+# restore LIBS
+LIBS=$SAVE_LIBS
 
+
+
 # Checks for standard header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC