#This patch was developed both in-house and from outside. We plan to submit it

#upstream, but do not yet have a target date for doing so

#

# HG changeset patch

# Parent  714ac8a9d237c16e4c1d4c0d6b836fd6f2442b4f

libibverbs solaris specific changes

diff -r 714ac8a9d237 Makefile.am

--- a/Makefile.am	Wed Oct 14 12:54:37 2015 -0700

+++ b/Makefile.am	Mon Feb 01 09:10:21 2016 -0800

@@ -11,7 +11,7 @@

 src_libibverbs_la_SOURCES = src/cmd.c src/compat-1_0.c src/device.c src/init.c \

 			    src/marshall.c src/memory.c src/sysfs.c src/verbs.c \

-			    src/enum_strs.c

+			    src/enum_strs.c src/solaris_compatibility.c

 src_libibverbs_la_LDFLAGS = -version-info 1 -export-dynamic \

     $(libibverbs_version_script)

 src_libibverbs_la_DEPENDENCIES = $(srcdir)/src/libibverbs.map

@@ -40,7 +40,7 @@

 libibverbsinclude_HEADERS = include/infiniband/arch.h include/infiniband/driver.h \

     include/infiniband/kern-abi.h include/infiniband/opcode.h include/infiniband/verbs.h \

-    include/infiniband/sa-kern-abi.h include/infiniband/sa.h include/infiniband/marshall.h

+    include/infiniband/sa-kern-abi.h include/infiniband/sa.h include/infiniband/marshall.h include/infiniband/ofa_solaris.h

 man_MANS = man/ibv_asyncwatch.1 man/ibv_devices.1 man/ibv_devinfo.1	\

     man/ibv_rc_pingpong.1 man/ibv_uc_pingpong.1 man/ibv_ud_pingpong.1	\

@@ -67,6 +67,7 @@

 EXTRA_DIST = include/infiniband/driver.h include/infiniband/kern-abi.h \

     include/infiniband/opcode.h include/infiniband/verbs.h include/infiniband/marshall.h \

+    include/infiniband/ofa_solaris.h \

     include/infiniband/sa-kern-abi.h include/infiniband/sa.h \

     src/ibverbs.h examples/pingpong.h \

     src/libibverbs.map libibverbs.spec.in $(man_MANS)

diff -r 714ac8a9d237 Makefile.in

--- a/Makefile.in	Wed Oct 14 12:54:37 2015 -0700

+++ b/Makefile.in	Mon Feb 01 09:10:21 2016 -0800

@@ -1,7 +1,7 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.15 from Makefile.am.

 # @configure_input@

-# Copyright (C) 1994-2013 Free Software Foundation, Inc.

+# Copyright (C) 1994-2014 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -17,7 +17,17 @@

 VPATH = @srcdir@

-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'

+am__is_gnu_make = { \

+  if test -z '$(MAKELEVEL)'; then \

+    false; \

+  elif test -n '$(MAKE_HOST)'; then \

+    true; \

+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \

+    true; \

+  else \

+    false; \

+  fi; \

+}

 am__make_running_with_option = \

   case $${target_option-} in \

       ?) ;; \

@@ -88,17 +98,6 @@

 	examples/ibv_srq_pingpong$(EXEEXT) \

 	examples/ibv_xsrq_pingpong$(EXEEXT)

 subdir = .

-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \

-	$(top_srcdir)/configure $(am__configure_deps) \

-	$(srcdir)/config.h.in $(srcdir)/libibverbs.spec.in \

-	$(top_srcdir)/config/depcomp $(libibverbsinclude_HEADERS) \

-	AUTHORS COPYING ChangeLog README config/compile \

-	config/config.guess config/config.sub config/depcomp \

-	config/install-sh config/missing config/ltmain.sh \

-	$(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \

-	$(top_srcdir)/config/config.sub \

-	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \

-	$(top_srcdir)/config/missing

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/config/libtool.m4 \

 	$(top_srcdir)/config/ltoptions.m4 \

@@ -107,6 +106,9 @@

 	$(top_srcdir)/config/lt~obsolete.m4 $(top_srcdir)/configure.ac

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \

+	$(am__configure_deps) $(libibverbsinclude_HEADERS) \

+	$(am__DIST_COMMON)

 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

  configure.lineno config.status.lineno

 mkinstalldirs = $(install_sh) -d

@@ -152,7 +154,8 @@

 	src/src_libibverbs_la-marshall.lo \

 	src/src_libibverbs_la-memory.lo src/src_libibverbs_la-sysfs.lo \

 	src/src_libibverbs_la-verbs.lo \

-	src/src_libibverbs_la-enum_strs.lo

+	src/src_libibverbs_la-enum_strs.lo \

+	src/src_libibverbs_la-solaris_compatibility.lo

 src_libibverbs_la_OBJECTS = $(am_src_libibverbs_la_OBJECTS)

 AM_V_lt = $(am__v_lt_@AM_V@)

 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)

@@ -288,6 +291,15 @@

 CTAGS = ctags

 CSCOPE = cscope

 AM_RECURSIVE_TARGETS = cscope

+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \

+	$(srcdir)/libibverbs.spec.in $(top_srcdir)/config/compile \

+	$(top_srcdir)/config/config.guess \

+	$(top_srcdir)/config/config.sub $(top_srcdir)/config/depcomp \

+	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \

+	$(top_srcdir)/config/missing AUTHORS COPYING ChangeLog README \

+	config/compile config/config.guess config/config.sub \

+	config/depcomp config/install-sh config/ltmain.sh \

+	config/missing

 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

 distdir = $(PACKAGE)-$(VERSION)

 top_distdir = $(distdir)

@@ -428,7 +440,7 @@

 libibverbs_version_script = @LIBIBVERBS_VERSION_SCRIPT@

 src_libibverbs_la_SOURCES = src/cmd.c src/compat-1_0.c src/device.c src/init.c \

 			    src/marshall.c src/memory.c src/sysfs.c src/verbs.c \

-			    src/enum_strs.c

+			    src/enum_strs.c src/solaris_compatibility.c

 src_libibverbs_la_LDFLAGS = -version-info 1 -export-dynamic \

     $(libibverbs_version_script)

@@ -453,7 +465,7 @@

 libibverbsincludedir = $(includedir)/infiniband

 libibverbsinclude_HEADERS = include/infiniband/arch.h include/infiniband/driver.h \

     include/infiniband/kern-abi.h include/infiniband/opcode.h include/infiniband/verbs.h \

-    include/infiniband/sa-kern-abi.h include/infiniband/sa.h include/infiniband/marshall.h

+    include/infiniband/sa-kern-abi.h include/infiniband/sa.h include/infiniband/marshall.h include/infiniband/ofa_solaris.h

 man_MANS = man/ibv_asyncwatch.1 man/ibv_devices.1 man/ibv_devinfo.1	\

     man/ibv_rc_pingpong.1 man/ibv_uc_pingpong.1 man/ibv_ud_pingpong.1	\

@@ -480,6 +492,7 @@

 EXTRA_DIST = include/infiniband/driver.h include/infiniband/kern-abi.h \

     include/infiniband/opcode.h include/infiniband/verbs.h include/infiniband/marshall.h \

+    include/infiniband/ofa_solaris.h \

     include/infiniband/sa-kern-abi.h include/infiniband/sa.h \

     src/ibverbs.h examples/pingpong.h \

     src/libibverbs.map libibverbs.spec.in $(man_MANS)

@@ -504,7 +517,6 @@

 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \

 	$(am__cd) $(top_srcdir) && \

 	  $(AUTOMAKE) --foreign Makefile

-.PRECIOUS: Makefile

 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

 	@case '$?' in \

 	  *config.status*) \

@@ -599,6 +611,8 @@

 	src/$(DEPDIR)/$(am__dirstamp)

 src/src_libibverbs_la-enum_strs.lo: src/$(am__dirstamp) \

 	src/$(DEPDIR)/$(am__dirstamp)

+src/src_libibverbs_la-solaris_compatibility.lo: src/$(am__dirstamp) \

+	src/$(DEPDIR)/$(am__dirstamp)

 src/libibverbs.la: $(src_libibverbs_la_OBJECTS) $(src_libibverbs_la_DEPENDENCIES) $(EXTRA_src_libibverbs_la_DEPENDENCIES) src/$(am__dirstamp)

 	$(AM_V_CCLD)$(src_libibverbs_la_LINK) -rpath $(libdir) $(src_libibverbs_la_OBJECTS) $(src_libibverbs_la_LIBADD) $(LIBS)

@@ -733,6 +747,7 @@

 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libibverbs_la-init.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libibverbs_la-marshall.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libibverbs_la-memory.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libibverbs_la-solaris_compatibility.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libibverbs_la-sysfs.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libibverbs_la-verbs.Plo@am__quote@

@@ -823,6 +838,13 @@

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libibverbs_la_CFLAGS) $(CFLAGS) -c -o src/src_libibverbs_la-enum_strs.lo `test -f 'src/enum_strs.c' || echo '$(srcdir)/'`src/enum_strs.c

+src/src_libibverbs_la-solaris_compatibility.lo: src/solaris_compatibility.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libibverbs_la_CFLAGS) $(CFLAGS) -MT src/src_libibverbs_la-solaris_compatibility.lo -MD -MP -MF src/$(DEPDIR)/src_libibverbs_la-solaris_compatibility.Tpo -c -o src/src_libibverbs_la-solaris_compatibility.lo `test -f 'src/solaris_compatibility.c' || echo '$(srcdir)/'`src/solaris_compatibility.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libibverbs_la-solaris_compatibility.Tpo src/$(DEPDIR)/src_libibverbs_la-solaris_compatibility.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/solaris_compatibility.c' object='src/src_libibverbs_la-solaris_compatibility.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libibverbs_la_CFLAGS) $(CFLAGS) -c -o src/src_libibverbs_la-solaris_compatibility.lo `test -f 'src/solaris_compatibility.c' || echo '$(srcdir)/'`src/solaris_compatibility.c

+

 mostlyclean-libtool:

 	-rm -f *.lo

@@ -1059,15 +1081,15 @@

 	$(am__post_remove_distdir)

 dist-tarZ: distdir

-	@echo WARNING: "Support for shar distribution archives is" \

-	               "deprecated." >&2

+	@echo WARNING: "Support for distribution archives compressed with" \

+		       "legacy program 'compress' is deprecated." >&2

 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2

 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z

 	$(am__post_remove_distdir)

 dist-shar: distdir

-	@echo WARNING: "Support for distribution archives compressed with" \

-		       "legacy program 'compress' is deprecated." >&2

+	@echo WARNING: "Support for shar distribution archives is" \

+	               "deprecated." >&2

 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2

 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz

 	$(am__post_remove_distdir)

@@ -1103,17 +1125,17 @@

 	esac

 	chmod -R a-w $(distdir)

 	chmod u+w $(distdir)

-	mkdir $(distdir)/_build $(distdir)/_inst

+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst

 	chmod a-w $(distdir)

 	test -d $(distdir)/_build || exit 0; \

 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \

 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \

 	  && am__cwd=`pwd` \

-	  && $(am__cd) $(distdir)/_build \

-	  && ../configure \

+	  && $(am__cd) $(distdir)/_build/sub \

+	  && ../../configure \

 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \

 	    $(DISTCHECK_CONFIGURE_FLAGS) \

-	    --srcdir=.. --prefix="$$dc_install_base" \

+	    --srcdir=../.. --prefix="$$dc_install_base" \

 	  && $(MAKE) $(AM_MAKEFLAGS) \

 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \

 	  && $(MAKE) $(AM_MAKEFLAGS) check \

@@ -1312,6 +1334,8 @@

 	uninstall-libibverbsincludeHEADERS uninstall-man \

 	uninstall-man1 uninstall-man3

+.PRECIOUS: Makefile

+

 dist-hook: libibverbs.spec

 	cp libibverbs.spec $(distdir)

diff -r 714ac8a9d237 aclocal.m4

--- a/aclocal.m4	Wed Oct 14 12:54:37 2015 -0700

+++ b/aclocal.m4	Mon Feb 01 09:10:21 2016 -0800

@@ -1,6 +1,6 @@

-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-

+# generated automatically by aclocal 1.15 -*- Autoconf -*-

-# Copyright (C) 1996-2013 Free Software Foundation, Inc.

+# Copyright (C) 1996-2014 Free Software Foundation, Inc.

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -20,7 +20,7 @@

 If you have problems, you may need to regenerate the build system entirely.

 To do so, use the procedure documented by the package, typically 'autoreconf'.])])

-# Copyright (C) 2002-2013 Free Software Foundation, Inc.

+# Copyright (C) 2002-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -32,10 +32,10 @@

 # generated from the m4 files accompanying Automake X.Y.

 # (This private macro should not be called outside this file.)

 AC_DEFUN([AM_AUTOMAKE_VERSION],

-[am__api_version='1.14'

+[am__api_version='1.15'

 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

 dnl require some minimum version.  Point them to the right macro.

-m4_if([$1], [1.14.1], [],

+m4_if([$1], [1.15], [],

       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

 ])

@@ -51,14 +51,14 @@

 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.

 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

-[AM_AUTOMAKE_VERSION([1.14.1])dnl

+[AM_AUTOMAKE_VERSION([1.15])dnl

 m4_ifndef([AC_AUTOCONF_VERSION],

   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-

-# Copyright (C) 2001-2013 Free Software Foundation, Inc.

+# Copyright (C) 2001-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -103,15 +103,14 @@

 # configured tree to be moved without reconfiguration.

 AC_DEFUN([AM_AUX_DIR_EXPAND],

-[dnl Rely on autoconf to set up CDPATH properly.

-AC_PREREQ([2.50])dnl

-# expand $ac_aux_dir to an absolute path

-am_aux_dir=`cd $ac_aux_dir && pwd`

+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl

+# Expand $ac_aux_dir to an absolute path.

+am_aux_dir=`cd "$ac_aux_dir" && pwd`

 ])

 # AM_CONDITIONAL                                            -*- Autoconf -*-

-# Copyright (C) 1997-2013 Free Software Foundation, Inc.

+# Copyright (C) 1997-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -142,7 +141,7 @@

 Usually this means the macro was only invoked conditionally.]])

 fi])])

-# Copyright (C) 1999-2013 Free Software Foundation, Inc.

+# Copyright (C) 1999-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -333,7 +332,7 @@

 # Generate code to set up dependency tracking.              -*- Autoconf -*-

-# Copyright (C) 1999-2013 Free Software Foundation, Inc.

+# Copyright (C) 1999-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -409,7 +408,7 @@

 # Do all the work for Automake.                             -*- Autoconf -*-

-# Copyright (C) 1996-2013 Free Software Foundation, Inc.

+# Copyright (C) 1996-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -499,8 +498,8 @@

 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>

 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>

 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])

-# We need awk for the "check" target.  The system "awk" is bad on

-# some platforms.

+# We need awk for the "check" target (and possibly the TAP driver).  The

+# system "awk" is bad on some platforms.

 AC_REQUIRE([AC_PROG_AWK])dnl

 AC_REQUIRE([AC_PROG_MAKE_SET])dnl

 AC_REQUIRE([AM_SET_LEADING_DOT])dnl

@@ -574,6 +573,9 @@

     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])

   fi

 fi

+dnl The trailing newline in this macro's definition is deliberate, for

+dnl backward compatibility and to allow trailing 'dnl'-style comments

+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.

 ])

 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not

@@ -603,7 +605,7 @@

 done

 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])

-# Copyright (C) 2001-2013 Free Software Foundation, Inc.

+# Copyright (C) 2001-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -614,7 +616,7 @@

 # Define $install_sh.

 AC_DEFUN([AM_PROG_INSTALL_SH],

 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

-if test x"${install_sh}" != xset; then

+if test x"${install_sh+set}" != xset; then

   case $am_aux_dir in

   *\ * | *\	*)

     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;

@@ -624,7 +626,7 @@

 fi

 AC_SUBST([install_sh])])

-# Copyright (C) 2003-2013 Free Software Foundation, Inc.

+# Copyright (C) 2003-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -645,7 +647,7 @@

 # Check to see how 'make' treats includes.	            -*- Autoconf -*-

-# Copyright (C) 2001-2013 Free Software Foundation, Inc.

+# Copyright (C) 2001-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -695,7 +697,7 @@

 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-

-# Copyright (C) 1997-2013 Free Software Foundation, Inc.

+# Copyright (C) 1997-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -734,7 +736,7 @@

 # Helper functions for option handling.                     -*- Autoconf -*-

-# Copyright (C) 2001-2013 Free Software Foundation, Inc.

+# Copyright (C) 2001-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -763,7 +765,7 @@

 AC_DEFUN([_AM_IF_OPTION],

 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])

-# Copyright (C) 1999-2013 Free Software Foundation, Inc.

+# Copyright (C) 1999-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -810,7 +812,7 @@

 # For backward compatibility.

 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])

-# Copyright (C) 2001-2013 Free Software Foundation, Inc.

+# Copyright (C) 2001-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -829,7 +831,7 @@

 # Check to make sure that the build environment is sane.    -*- Autoconf -*-

-# Copyright (C) 1996-2013 Free Software Foundation, Inc.

+# Copyright (C) 1996-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -910,7 +912,7 @@

 rm -f conftest.file

 ])

-# Copyright (C) 2009-2013 Free Software Foundation, Inc.

+# Copyright (C) 2009-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -970,7 +972,7 @@

 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl

 ])

-# Copyright (C) 2001-2013 Free Software Foundation, Inc.

+# Copyright (C) 2001-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -998,7 +1000,7 @@

 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

 AC_SUBST([INSTALL_STRIP_PROGRAM])])

-# Copyright (C) 2006-2013 Free Software Foundation, Inc.

+# Copyright (C) 2006-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -1017,7 +1019,7 @@

 # Check how to create a tarball.                            -*- Autoconf -*-

-# Copyright (C) 2004-2013 Free Software Foundation, Inc.

+# Copyright (C) 2004-2014 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

diff -r 714ac8a9d237 configure

--- a/configure	Wed Oct 14 12:54:37 2015 -0700

+++ b/configure	Mon Feb 01 09:10:21 2016 -0800

@@ -2285,7 +2285,7 @@

 ac_config_headers="$ac_config_headers config.h"

-am__api_version='1.14'

+am__api_version='1.15'

 # Find a good install program.  We prefer a C program (faster),

 # so one script is as good as another.  But avoid the broken or

diff -r 714ac8a9d237 examples/device_list.c

--- a/examples/device_list.c	Wed Oct 14 12:54:37 2015 -0700

+++ b/examples/device_list.c	Mon Feb 01 09:10:21 2016 -0800

@@ -36,16 +36,32 @@

 #include <stdio.h>

+#if !(defined(__SVR4) && defined(__sun))