From 6104b2bc9b58a43e42e1606f8602d2c104c2841a Mon Sep 17 00:00:00 2001
From: Fritz Elfert <felfert@to.com>
Date: Sun, 25 Mar 2001 03:42:13 +0000
Subject: Started kpsion doc

---
 conf/m4/kde/AC_BASE_PATH_KDE.m4       | 10 --------
 conf/m4/kde/AC_CREATE_KFSSTND.m4      |  2 ++
 conf/m4/kde/KDE_MISSING_PROG_ERROR.m4 |  6 +++++
 conf/m4/kde/KDE_SUBST_PROGRAMS.m4     | 46 +++++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 10 deletions(-)
 create mode 100644 conf/m4/kde/KDE_MISSING_PROG_ERROR.m4
 create mode 100644 conf/m4/kde/KDE_SUBST_PROGRAMS.m4

(limited to 'conf/m4/kde')

diff --git a/conf/m4/kde/AC_BASE_PATH_KDE.m4 b/conf/m4/kde/AC_BASE_PATH_KDE.m4
index 0430f83..3878d1c 100644
--- a/conf/m4/kde/AC_BASE_PATH_KDE.m4
+++ b/conf/m4/kde/AC_BASE_PATH_KDE.m4
@@ -128,14 +128,4 @@ AC_SUBST(all_libraries)
 
 AC_SUBST(AUTODIRS)
 
-if test -z "$DCOPIDL"; then
-  DCOPIDL='$(kde_bindir)/dcopidl'
-fi
-if test -z "$DCOPIDL2CPP"; then
-  DCOPIDL2CPP='$(kde_bindir)/dcopidl2cpp'
-fi
-DCOP_DEPENDENCIES='$(DCOPIDL)'
-AC_SUBST(DCOPIDL)
-AC_SUBST(DCOPIDL2CPP)
-AC_SUBST(DCOP_DEPENDENCIES)
 ])
diff --git a/conf/m4/kde/AC_CREATE_KFSSTND.m4 b/conf/m4/kde/AC_CREATE_KFSSTND.m4
index a771332..c4fa251 100644
--- a/conf/m4/kde/AC_CREATE_KFSSTND.m4
+++ b/conf/m4/kde/AC_CREATE_KFSSTND.m4
@@ -91,4 +91,6 @@ fi
 
 bindir=$kde_bindir
 
+KDE_SUBST_PROGRAMS
+
 ])
diff --git a/conf/m4/kde/KDE_MISSING_PROG_ERROR.m4 b/conf/m4/kde/KDE_MISSING_PROG_ERROR.m4
new file mode 100644
index 0000000..e8b1d53
--- /dev/null
+++ b/conf/m4/kde/KDE_MISSING_PROG_ERROR.m4
@@ -0,0 +1,6 @@
+AC_DEFUN(KDE_MISSING_PROG_ERROR,
+[
+    AC_MSG_ERROR([The important program $1 was not found!
+Please check whether you installed KDE correctly.
+])
+])
diff --git a/conf/m4/kde/KDE_SUBST_PROGRAMS.m4 b/conf/m4/kde/KDE_SUBST_PROGRAMS.m4
new file mode 100644
index 0000000..e32facc
--- /dev/null
+++ b/conf/m4/kde/KDE_SUBST_PROGRAMS.m4
@@ -0,0 +1,46 @@
+AC_DEFUN(KDE_SUBST_PROGRAMS,
+[AC_REQUIRE([AC_CREATE_KFSSTND])dnl
+
+        kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde2/bin /usr/kde/bin /usr/local/kde/bin"
+        if test -n "$KDEDIRS"; then
+           kde_save_IFS=$IFS
+           IFS=:
+           for dir in $KDEDIRS; do
+                kde_default_bindirs="$dir/bin $kde_default_bindirs "
+           done
+           IFS=$kde_save_IFS
+        fi
+        kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"
+        KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
+        KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
+        KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(mcopidl)])
+        KDE_FIND_PATH(kdb2html, KDB2HTML, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kdb2html)])
+        KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(artsc-config)])
+        KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)])
+
+        DCOP_DEPENDENCIES='$(DCOPIDL)'
+        AC_SUBST(DCOPIDL)
+        AC_SUBST(DCOPIDL2CPP)
+        AC_SUBST(DCOP_DEPENDENCIES)
+        AC_SUBST(MCOPIDL)
+        AC_SUBST(KDB2HTML)
+        AC_SUBST(ARTSCCONFIG)
+        AC_SUBST(KDECONFIG)
+
+        if test -x "$KDECONFIG"; then # it can be "compiled"
+          kde_libs_prefix=`$KDECONFIG --prefix`
+          if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
+               AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+                          This means it has been moved since you installed it.
+                          This won't work. Please recompile kdelibs for the new prefix.
+                          ])
+           fi
+           kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
+        else
+           kde_libs_prefix='$(prefix)'
+           kde_libs_htmldir='$(kde_htmldir)'
+        fi
+        AC_SUBST(kde_libs_prefix)
+        AC_SUBST(kde_libs_htmldir)
+])dnl
+
-- 
cgit v1.2.3