DHA kernel module is not build by default now.

CVS patchset: 1993
CVS date: 2002/06/03 11:58:53

2 files changed, 40 insertions, 24 deletions

diff --git a/configure.in b/configure.in
index 881db77d9..ba8735c7b 100644
--- a/configure.in
+++ b/configure.in
@@ -451,6 +451,8 @@ dnl Vidix/libdha
 dnl
 AC_ARG_ENABLE(vidix, [  --disable-vidix         Do not build vidix support],
 	      check_vidix=no, check_vidix=yes)
+AC_ARG_ENABLE(dha-kmod, [  --enable-dha-kmod       Build DHA kernel module],
+	      ,,enable_dha_kmod="yes")
 
 enable_vidix="no"
 
@@ -463,13 +465,25 @@ if test x"$check_vidix" = "xyes"; then
       ;;
     *-freebsd*)
       enable_vidix="yes"
+      enable_dha_kmod="no"
+      ;;
+    *)
+      enable_dha_kmod="no"
       ;;
   esac
 fi
 AC_MSG_RESULT($enable_vidix)
 
+AC_MSG_CHECKING(for DHA linux kernel module build)
+if test x"$enable_dha_kmod" = "xyes"; then
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
+
 AM_CONDITIONAL(HAVE_VIDIX, test x"$enable_vidix" = "xyes")
 AM_CONDITIONAL(HAVE_LINUX, test x"$enable_linux" = "xyes")
+AM_CONDITIONAL(BUILD_DHA_KMOD, test x"$enable_dha_kmod" = "xyes")
 AC_CHECK_PROG(MKNOD, mknod, mknod, no)
 AC_CHECK_PROG(DEPMOD, depmod, depmod, no)
 
@@ -1089,7 +1103,11 @@ if test x"$have_dxr3" = "xyes"; then
   fi
 fi
 if test x"$enable_vidix" = "xyes"; then
-  echo "   - vidix"
+  if test x"$enable_dha_kmod" = "xyes"; then
+    echo "   - vidix (dhahelper)"
+  else
+    echo "   - vidix"
+  fi
 fi
 echo ""
 
diff --git a/src/video_out/libdha/kernelhelper/Makefile.am b/src/video_out/libdha/kernelhelper/Makefile.am
index ffbddaee3..db3e26032 100644
--- a/src/video_out/libdha/kernelhelper/Makefile.am
+++ b/src/video_out/libdha/kernelhelper/Makefile.am
@@ -9,8 +9,10 @@ moddir = /lib/modules/$(KVERSION)/misc
 KCOMPILE = $(CC) $(CFLAGS) $(INCLUDES) $(LINUX_INCLUDE)
 
 if HAVE_LINUX
+if BUILD_DHA_KMOD
 KERNEL_MODULE = dhahelper.o
 endif
+endif
 
 noinst_HEADERS = dhahelper.h
 
@@ -26,32 +28,28 @@ nodes:
 all: $(KERNEL_MODULE)
 
 install-exec-local: $(KERNEL_MODULE)
-if HAVE_LINUX
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(moddir)
-	@list='$(KERNEL_MODULE)'; \
-	for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "$(INSTALL) -o root -g root -m 644 $$p $(DESTDIR)$(moddir)/$$p"; \
-	    $(INSTALL) -o root -g root -m 644 $$p $(DESTDIR)$(moddir)/$$p; \
-	  else :; fi; \
-	done; \
-	$(DEPMOD) -a
-	if test ! -c /dev/dhahelper; then \
-	  $(MAKE) nodes; \
-	fi
-endif
+@BUILD_DHA_KMOD_TRUE@	@$(NORMAL_INSTALL)
+@BUILD_DHA_KMOD_TRUE@	$(mkinstalldirs) $(DESTDIR)$(moddir)
+@BUILD_DHA_KMOD_TRUE@	@list='$(KERNEL_MODULE)'; \
+@BUILD_DHA_KMOD_TRUE@	for p in $$list; do \
+@BUILD_DHA_KMOD_TRUE@	  if test -f $$p; then \
+@BUILD_DHA_KMOD_TRUE@	    echo "$(INSTALL) -o root -g root -m 644 $$p $(DESTDIR)$(moddir)/$$p"; \
+@BUILD_DHA_KMOD_TRUE@	    $(INSTALL) -o root -g root -m 644 $$p $(DESTDIR)$(moddir)/$$p; \
+@BUILD_DHA_KMOD_TRUE@	  else :; fi; \
+@BUILD_DHA_KMOD_TRUE@	done; \
+@BUILD_DHA_KMOD_TRUE@	$(DEPMOD) -a
+@BUILD_DHA_KMOD_TRUE@	if test ! -c /dev/dhahelper; then \
+@BUILD_DHA_KMOD_TRUE@	  $(MAKE) nodes; \
+@BUILD_DHA_KMOD_TRUE@	fi
 
 
 uninstall-local:
-if HAVE_LINUX
-	@$(NORMAL_UNINSTALL)
-	@list='$(KERNEL_MODULE)'; \
-	for p in $$list; do \
-	  echo "rm -f $(DESTDIR)$(moddir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	  rm -f $(DESTDIR)$(moddir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-	done
-endif
+@BUILD_DHA_KMOD_TRUE@	@$(NORMAL_UNINSTALL)
+@BUILD_DHA_KMOD_TRUE@	@list='$(KERNEL_MODULE)'; \
+@BUILD_DHA_KMOD_TRUE@	for p in $$list; do \
+@BUILD_DHA_KMOD_TRUE@	  echo "rm -f $(DESTDIR)$(moddir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+@BUILD_DHA_KMOD_TRUE@	  rm -f $(DESTDIR)$(moddir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+@BUILD_DHA_KMOD_TRUE@	done
 
 debug:
 install-debug: install