Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch

configure.ac

@@ -42,6 +42,7 @@ AM_MAINTAINER_MODE
 AC_PROG_INSTALL
 AC_PROG_CC
 AC_PROG_LIBTOOL
+AM_PROG_AS
 
 zfsconfig=all
 kernelsrc=

lib/libspl/Makefile.am

@@ -3,6 +3,9 @@ include $(top_srcdir)/config/Rules.am
 DEFAULT_INCLUDES += \
 	-I${top_srcdir}/lib/libspl/include
 
+AM_CCASFLAGS = \
+	-I${top_srcdir}/lib/libspl/include
+
 lib_LTLIBRARIES = libspl.la
 
 libspl_la_SOURCES = \

lib/libspl/include/sys/trap.h

@@ -0,0 +1,29 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _SYS_TRAP_H
+#define	_SYS_TRAP_H
+
+#endif /* _SYS_TRAP_H */