- pcidev: enable support for Linux kernel 3.x (Debian patch by Guillem Jover)

- don't clean docbook directories if building documentation is disabled

bochs/Makefile.in

@@ -420,6 +420,11 @@ dl_docbook::
 install_docbook: build_docbook
 	cd doc/docbook; make install
 
+clean_docbook::
+	cd doc/docbook @COMMAND_SEPARATOR@
+	$(MAKE) clean
+	@CD_UP_TWO@
+
 install_man::
 	-mkdir -p $(DESTDIR)$(man1dir)
 	-mkdir -p $(DESTDIR)$(man5dir)
@@ -507,7 +512,7 @@ local-dist-clean: clean
 	@RMCOMMAND@ libtool
 	@RMCOMMAND@ ltdlconf.h
 
-all-clean: clean
+all-clean: clean @CLEAN_DOCBOOK_VAR@
 	cd iodev @COMMAND_SEPARATOR@
 	$(MAKE) clean
 	@CD_UP_ONE@
@@ -547,9 +552,6 @@ all-clean: clean
 	cd fpu @COMMAND_SEPARATOR@
 	$(MAKE) clean
 	@CD_UP_ONE@
-	cd doc/docbook @COMMAND_SEPARATOR@
-	$(MAKE) clean
-	@CD_UP_TWO@
 	cd host/linux/pcidev @COMMAND_SEPARATOR@
 	$(MAKE) clean
 	@CD_UP_THREE@

bochs/configure.in

@@ -720,12 +720,12 @@ AC_ARG_ENABLE(pcidev,
 	  		PCIDEV_MODULE_MAKE_ALL="all-kernel24"
 			KERNEL_MODULE_SUFFIX="o"
           	;;
-		2.6*)
+		2.6*|3.*)
 	  		PCIDEV_MODULE_MAKE_ALL="all-kernel26"
 			KERNEL_MODULE_SUFFIX="ko"
 		;;
 		*)
-                        AC_MSG_ERROR([Linux kernel 2.4 or 2.6 is required for PCI host device mapping])
+			AC_MSG_ERROR([Linux kernel 2.4, 2.6 or 3.x is required for PCI host device mapping])
 		;;
 	  esac
 	  KERNELDIR="/lib/modules/$linux_version/build"
@@ -1853,6 +1853,7 @@ if test $build_docbook = 1; then
   AC_MSG_RESULT(yes)
   BUILD_DOCBOOK_VAR=build_docbook
   INSTALL_DOCBOOK_VAR=install_docbook
+  CLEAN_DOCBOOK_VAR=clean_docbook
   if test "$DOCBOOK2HTML" = not_found; then
     echo "ERROR: docbook2html must be installed to build the documentation"
     exit 1
@@ -1862,6 +1863,7 @@ else
 fi
 AC_SUBST(BUILD_DOCBOOK_VAR)
 AC_SUBST(INSTALL_DOCBOOK_VAR)
+AC_SUBST(CLEAN_DOCBOOK_VAR)
 AC_SUBST(DOCBOOK2HTML)
 
 PRIMARY_TARGET='bochs'