From 09a57b79de50d30de28d1eb08643be2e3dd2a910 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 3 Feb 2009 10:28:40 -0800 Subject: [PATCH] Refresh autogen products --- configure | 28 ++++++++++++++++++---------- zfs_config.h.in | 3 +++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 71df0983d9..0ee1cd6f59 100755 --- a/configure +++ b/configure @@ -19160,6 +19160,20 @@ echo "${ECHO_T}$splsymvers" >&6 + echo "$as_me:$LINENO: checking zfs license" >&5 +echo $ECHO_N "checking zfs license... $ECHO_C" >&6 + license=`grep MODULE_LICENSE module/zfs/zfs_ioctl.c | cut -f2 -d'"'` + echo "$as_me:$LINENO: result: $license" >&5 +echo "${ECHO_T}$license" >&6 + if test "$license" = GPL; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GPL_ONLY_SYMBOLS 1 +_ACEOF + + fi + + TOPDIR=`/bin/pwd` BUILDDIR=$TOPDIR @@ -19502,8 +19516,8 @@ fi - echo "$as_me:$LINENO: checking checking for ioctl()" >&5 -echo $ECHO_N "checking checking for ioctl()... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for ioctl()" >&5 +echo $ECHO_N "checking for ioctl()... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -19908,8 +19922,8 @@ fi - echo "$as_me:$LINENO: checking checking for ioctl()" >&5 -echo $ECHO_N "checking checking for ioctl()... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for ioctl()" >&5 +echo $ECHO_N "checking for ioctl()... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20030,12 +20044,6 @@ echo "$as_me: error: Bad value \"$zfsconfig\" for --with-config, - echo "$as_me:$LINENO: checking license" >&5 -echo $ECHO_N "checking license... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: CDDL" >&5 -echo "${ECHO_T}CDDL" >&6 - - echo "$as_me:$LINENO: checking whether debugging is enabled" >&5 echo $ECHO_N "checking whether debugging is enabled... $ECHO_C" >&6 # Check whether --enable-debug or --disable-debug was given. diff --git a/zfs_config.h.in b/zfs_config.h.in index 0dc794a322..f9f770b9ca 100644 --- a/zfs_config.h.in +++ b/zfs_config.h.in @@ -6,6 +6,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H +/* Define to 1 if module is licensed under the GPL */ +#undef HAVE_GPL_ONLY_SYMBOLS + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H