[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeutils/kmilo
From:       "Barry O'Donovan" <barry.odonovan () kdemail ! net>
Date:       2005-02-16 16:50:10
Message-ID: 20050216165010.E9DBD1D2FE () office ! kde ! org
[Download RAW message or body]

CVS commit by barry: 


Fix bug 99360 (http://bugs.kde.org/show_bug.cgi?id=99360).

The Dell I8k module of KMilo is only meant to be compiled on Linux systems 
as it requires the delli8k Kernel module to read special Dell keys.

Thanks to Steve for opening this bug report.

BUGS:99360
CCMAIL:stevee@zuken.co.uk
CCMAIL:staikos@kde.org


  M +6 -1      Makefile.am   1.13
  M +15 -0     configure.in.in   1.8


--- kdeutils/kmilo/Makefile.am  #1.12:1.13
@@ -11,3 +11,8 @@
 endif
 
-SUBDIRS=kmilod $(POWERBOOK_SUBDIR) $(POWERBOOK2_SUBDIR) $(KVAIO_SUBDIR) generic \
thinkpad asus delli8k +if include_kmilo_delli8k
+KDELLI8k_SUBDIR=delli8k
+endif
+
+
+SUBDIRS=kmilod $(POWERBOOK_SUBDIR) $(POWERBOOK2_SUBDIR) $(KVAIO_SUBDIR) generic \
thinkpad asus $(KDELLI8k_SUBDIR)

--- kdeutils/kmilo/configure.in.in  #1.7:1.8
@@ -27,4 +27,19 @@
 AM_CONDITIONAL(include_kmilo_powerbook, test x$have_pbbipc = xtrue)
 AM_CONDITIONAL(include_kmilo_pbb, test x$have_pbb = xtrue)
+
+dnl -----------------------------------------------------------------------
+dnl Check if Dell I8K module should be compiled (Linux systems only)
+AC_MSG_CHECKING([if dellI8k KMilo module should be compiled])
+case "$host" in
+  *-*-linux*) kmilo_delli8k_compile=yes; UNAME='Linux' ;;
+  *) kmilo_delli8k_compile=no; UNAME='' ;;
+esac
+
+AC_MSG_RESULT($kmilo_delli8k_compile)
+AM_CONDITIONAL(include_kmilo_delli8k, test x$kmilo_delli8k_compile = xyes)
+dnl -----------------------------------------------------------------------
+
+
+
 AC_CHECK_HEADER(linux/sonypi.h, [have_sonypi=true])
 AM_CONDITIONAL(include_kmilo_kvaio, test x$have_sonypi = xtrue)


[prev in list] [next in list] [prev in thread] [next in thread]