Cleanly handle --with-linux=NONE option when used to generate source

rpms.  These should not be fatal because we actually don't need them
until we build the source rpm.  When doing mock builds this is
important because these dependent rpms will only be installed if
they are specificed in the source rpms spec file.

diff --git a/config/spl-build.m4 b/config/spl-build.m4
index 134831978a4ef26d1fdda39f44c523d9ff735c79..eee9a783f7d56c67dce43c29d14f3176d4aeaad1 100644 (file)
--- a/config/spl-build.m4
+++ b/config/spl-build.m4
@@ -67,11 +67,16 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
 ])
 
 AC_DEFUN([SPL_AC_MODULE_SYMVERS], [
+       modpost=$LINUX/scripts/Makefile.modpost
        AC_MSG_CHECKING([kernel file name for module symbols])
-       if grep -q Modules.symvers $LINUX/scripts/Makefile.modpost; then
-               LINUX_SYMBOLS=Modules.symvers
+       if test -f "$modpost"; then
+               if grep -q Modules.symvers $modpost; then
+                       LINUX_SYMBOLS=Modules.symvers
+               else
+                       LINUX_SYMBOLS=Module.symvers
+               fi
        else
-               LINUX_SYMBOLS=Module.symvers
+               LINUX_SYMBOLS=NONE
        fi
        AC_MSG_RESULT($LINUX_SYMBOLS)
        AC_SUBST(LINUX_SYMBOLS)

diff --git a/configure b/configure
index 3c75a96ad1a538a0c9f61129407cfaae5a2f4b77..93713e5a4245081d4121297727c36630c5392ca3 100755 (executable)
--- a/configure
+++ b/configure
@@ -19051,12 +19051,17 @@ echo "${ECHO_T}$kernsrcver" >&6
 
 
 
+       modpost=$LINUX/scripts/Makefile.modpost
        echo "$as_me:$LINENO: checking kernel file name for module symbols" >&5
 echo $ECHO_N "checking kernel file name for module symbols... $ECHO_C" >&6
-       if grep -q Modules.symvers $LINUX/scripts/Makefile.modpost; then
-               LINUX_SYMBOLS=Modules.symvers
+       if test -f "$modpost"; then
+               if grep -q Modules.symvers $modpost; then
+                       LINUX_SYMBOLS=Modules.symvers
+               else
+                       LINUX_SYMBOLS=Module.symvers
+               fi
        else
-               LINUX_SYMBOLS=Module.symvers
+               LINUX_SYMBOLS=NONE
        fi
        echo "$as_me:$LINENO: result: $LINUX_SYMBOLS" >&5
 echo "${ECHO_T}$LINUX_SYMBOLS" >&6
@@ -21437,12 +21442,17 @@ echo "${ECHO_T}$kernsrcver" >&6
 
 
 
+       modpost=$LINUX/scripts/Makefile.modpost
        echo "$as_me:$LINENO: checking kernel file name for module symbols" >&5
 echo $ECHO_N "checking kernel file name for module symbols... $ECHO_C" >&6
-       if grep -q Modules.symvers $LINUX/scripts/Makefile.modpost; then
-               LINUX_SYMBOLS=Modules.symvers
+       if test -f "$modpost"; then
+               if grep -q Modules.symvers $modpost; then
+                       LINUX_SYMBOLS=Modules.symvers
+               else
+                       LINUX_SYMBOLS=Module.symvers
+               fi
        else
-               LINUX_SYMBOLS=Module.symvers
+               LINUX_SYMBOLS=NONE
        fi
        echo "$as_me:$LINENO: result: $LINUX_SYMBOLS" >&5
 echo "${ECHO_T}$LINUX_SYMBOLS" >&6