- don't clean pcidev subdirectory if support is disabled

- check for flex presence and skip lexer.c generation if absent

bochs/Makefile.in

@@ -521,7 +521,12 @@ local-dist-clean: clean
 	@RMCOMMAND@ libtool
 	@RMCOMMAND@ ltdlconf.h
 
-all-clean: clean @CLEAN_DOCBOOK_VAR@
+clean_pcidev::
+	cd host/linux/pcidev @COMMAND_SEPARATOR@
+	$(MAKE) clean
+	@CD_UP_THREE@
+
+all-clean: clean @CLEAN_DOCBOOK_VAR@ @CLEAN_PCIDEV_VAR@
 	cd iodev @COMMAND_SEPARATOR@
 	$(MAKE) clean
 	@CD_UP_ONE@
@@ -564,9 +569,6 @@ all-clean: clean @CLEAN_DOCBOOK_VAR@
 	cd fpu @COMMAND_SEPARATOR@
 	$(MAKE) clean
 	@CD_UP_ONE@
-	cd host/linux/pcidev @COMMAND_SEPARATOR@
-	$(MAKE) clean
-	@CD_UP_THREE@
 
 dist-clean: local-dist-clean
 	cd iodev @COMMAND_SEPARATOR@

bochs/bx_debug/Makefile.in

@@ -102,8 +102,8 @@ parser.c: parser.y
 	@echo '#endif  /* if BX_DEBUGGER */' >> parser.c
 	@echo '/* The #endif is appended by the makefile after running yacc. */' >> parser.c
 
-lexer.c: lexer.l
-	$(LEX) -Pbx -t $< > lexer.c
+@NOFLEX@lexer.c: lexer.l
+@NOFLEX@	$(LEX) -Pbx -t $< > lexer.c
 
 ###########################################
 # dependencies generated by

bochs/configure.in

@@ -727,6 +727,7 @@ AC_ARG_ENABLE(pcidev,
 	  INSMOD="insmod"
 	  RMMOD="rmmod"
 	  DEPMOD="depmod"
+	  CLEAN_PCIDEV_VAR=clean_pcidev
 	  AC_SUBST(KERNELDIR)
 	  AC_SUBST(LSMOD)
 	  AC_SUBST(INSMOD)
@@ -734,6 +735,7 @@ AC_ARG_ENABLE(pcidev,
 	  AC_SUBST(DEPMOD)
 	  AC_SUBST(PCIDEV_MODULE_MAKE_ALL)
 	  AC_SUBST(KERNEL_MODULE_SUFFIX)
+	  AC_SUBST(CLEAN_PCIDEV_VAR)
         ;;
         *)
           AC_MSG_ERROR([PCI host device mapping requires Linux as host])
@@ -1074,6 +1076,12 @@ AC_ARG_ENABLE(debugger,
     AC_MSG_RESULT(yes)
     AC_DEFINE(BX_DEBUGGER, 1)
     DEBUGGER_VAR='$(DEBUGGER_LIB)'
+    NOFLEX=''
+    AC_PATH_PROG(FLEX, flex, not_found)
+    if test "$FLEX" = not_found; then
+      NOFLEX='#'
+    fi
+    AC_SUBST(NOFLEX)
     bx_debugger=1
    else
     AC_MSG_RESULT(no)