Reworked configuration:

  - Splitted up acinclude.m4
  - Added m4 macros, needed for KDE stuff

1 files changed, 32 insertions, 6 deletions

diff --git a/configure.in b/configure.in
index 90e2b5f..7157287 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,7 @@
 AC_REVISION($Revision$)dnl revision of this configure.in script
 
-AC_INIT(acinclude.m4)
+AC_CONFIG_AUX_DIR(conf)
+AC_INIT(Makefile.am)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(include/config.h)
 AM_INIT_AUTOMAKE(plptools, 0.7)
@@ -13,7 +14,7 @@ dnl checks for programs
 AC_AIX
 AC_PROG_MAKE_SET
 AC_PROG_CXX
-AC_CHECK_COMPILERS
+PLP_CHECK_COMPILERS
 AC_PROG_AWK
 AC_PATH_PROG(SED,sed)
 
@@ -30,6 +31,9 @@ dnl
 dnl -> Commented out for now because i have gcc on Solaris, no Sun cc.
 dnl If somebody complains, (s)he should send me some cc output and i
 dnl can add a correct check to AC_CHECK_COMPILERS (where it belongs).
+dnl Apart from that, Sun's compiler is crap anyway: It doesn't compile
+dnl valid c++ code correctly.
+dnl
 dnl   -Fritz
 dnl
 dnl test "$GCC" = yes && CFLAGS="-O2 -Wall"
@@ -61,7 +65,7 @@ AC_ARG_ENABLE(readline,
 	fi
 )
 if test "x$ac_enable_readline" = "xyes" ; then
-	AC_CHECK_READLINE
+	PLP_CHECK_READLINE
 fi
 
 ac_enable_history=yes
@@ -99,7 +103,7 @@ AC_ARG_ENABLE(mnttab,
 )
 if test "x$ac_enable_mnttab" = "xyes" ; then
        AC_MSG_CHECKING(for mount table)
-       AC_FIND_FILE(/etc/mnttab /etc/mtab, MTAB)
+       PLP_FIND_FILE(/etc/mnttab /etc/mtab, MTAB)
        AC_MSG_RESULT($MTAB)
        test "$MTAB" = "NO" && AC_DEFINE_UNQUOTED(DONT_UPDATE_MTAB)
        AC_DEFINE_UNQUOTED(MTAB_PATH,"$MTAB")
@@ -123,13 +127,15 @@ AC_CHECK_HEADERS(sys/ioctl.h sys/errno.h sys/ttold.h stdlib.h)
 
 dnl special options for customization
 
+PLP_HELP_MSG([Options for overriding builtin defaults:])
+
 AC_ARG_WITH(serial,
     [  --with-serial=DEV       override default serial line],
     [  DDEV="$withval"
       AC_MSG_RESULT(Overriding serial line: $DDEV)
     ],
     [ AC_MSG_CHECKING(for default serial line)
-      AC_FIND_CDEV(/dev/psion /dev/tty0p0 /dev/tty00 /dev/ttyS0 /dev/term/a /dev/ttyfa /dev/ttya /dev/tty0 /dev/ttyf1 /dev/cuaa1, DDEV)
+      PLP_FIND_CDEV(/dev/psion /dev/tty0p0 /dev/tty00 /dev/ttyS0 /dev/term/a /dev/ttyfa /dev/ttya /dev/tty0 /dev/ttyf1 /dev/cuaa1, DDEV)
       AC_MSG_RESULT($DDEV)
       test "$DDEV" = "NO" && AC_MSG_ERROR(NO serial lines. Use --with-serial.)
     ]
@@ -173,7 +179,7 @@ AC_ARG_WITH(basedir,
     [  --with-basedir=DIR      override default Psion directory [\\\\]],
     [ DBASEDIR="$withval"
       AC_MSG_RESULT(Overriding directory: $DBASEDIR) ],
-    [ DBASEDIR="\\\\"
+    [ DBASEDIR='\\'
       AC_MSG_RESULT(Using default Psion directory: $DBASEDIR)
     ]
 )
@@ -190,6 +196,23 @@ AC_ARG_WITH(mountdir,
 AC_DEFINE_UNQUOTED(DMOUNTPOINT,"$DMOUNTPOINT")
 AC_SUBST(DMOUNTPOINT)
 
+dnl KDE stuff
+PLP_HELP_MSG([Options for activating sub packages:])
+ac_enable_kde=no
+AM_CONDITIONAL(BUILD_KDE, false)
+AC_ARG_ENABLE(kde,
+	[  --enable-kde            build KDE2 stuff [no]],
+	if test "$enableval" = "yes" ; then
+		AC_MSG_RESULT([Will build KDE2 stuff])
+		ac_enable_kde=yes
+	fi
+)
+PLP_HELP_MSG([Options, only needed when building KDE2 stuff:])
+if test "x$ac_enable_kde" = "xyes" ; then
+	AC_PATH_KDE
+	AC_CHECK_KDEMAXPATHLEN
+	AM_CONDITIONAL(BUILD_KDE, true)
+fi
 
 AC_OUTPUT(
 	Makefile
@@ -197,6 +220,9 @@ AC_OUTPUT(
 	ncpd/Makefile
 	plpftp/Makefile
 	plpnfsd/Makefile
+	kde2/Makefile
+	kde2/kioslave/Makefile
+	plpbackup/Makefile
 	doc/Makefile
 	doc/api/Makefile
 	include/config.h