< prev index next >

common/autoconf/libraries.m4

Print this page

        

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  Oracle designates this

@@ -168,10 +168,20 @@
   AC_CHECK_LIB(dl, dlopen)
   LIBDL="$LIBS"
   AC_SUBST(LIBDL)
   LIBS="$save_LIBS"
 
+  # The iconv library
+  ICONV_LIBS=-liconv
+  if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then
+    ICONV_CFLAGS="-I/usr/local/include"
+  else
+    ICONV_CFLAGS=
+  fi
+  AC_SUBST(ICONV_LIBS)
+  AC_SUBST(ICONV_CFLAGS)
+
   # Deprecated libraries, keep the flags for backwards compatibility
   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
     BASIC_DEPRECATED_ARG_WITH([dxsdk])
     BASIC_DEPRECATED_ARG_WITH([dxsdk-lib])
     BASIC_DEPRECATED_ARG_WITH([dxsdk-include])
< prev index next >