Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/top' into top

This commit is contained in:
Brian Behlendorf 2009-02-03 10:29:22 -08:00
parent 7c0ec50745 09a57b79de
commit d48cc8b51c
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
configure vendored
View File

@ -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.

3
zfs_config.h.in
View File

@ -6,6 +6,9 @@
/* Define to 1 if you have the <dlfcn.h> 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 <inttypes.h> header file. */
#undef HAVE_INTTYPES_H