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

List:       kde-core-devel
Subject:    Patch: Finding dcopidlng
From:       Cornelius Schumacher <schumacher () kde ! org>
Date:       2003-10-19 15:49:11
[Download RAW message or body]

Could somebody with sufficient karma please submit this patch? It adds 
support for finding dcopidlng, if it isn't installed in the PATH. 
Without this patch compiling KMail to a secondary prefix fails.

-- 
Cornelius Schumacher <schumacher@kde.org>
["dcopidlng.diff" (text/x-diff)]

? dcopidlng.diff
Index: acinclude.m4.in
===================================================================
RCS file: /home/kde/kde-common/admin/acinclude.m4.in,v
retrieving revision 2.415
diff -u -3 -d -p -r2.415 acinclude.m4.in
--- acinclude.m4.in	17 Oct 2003 07:59:52 -0000	2.415
+++ acinclude.m4.in	19 Oct 2003 11:24:54 -0000
@@ -549,6 +549,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
         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(dcopidlng, DCOPIDLNG, \
                [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], \
[KDE_MISSING_PROG_ERROR(dcopidl2cpp)])  if test "$build_arts" != "no"; then
           KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], \
[KDE_MISSING_ARTS_ERROR(mcopidl)]) @@ -582,13 +583,14 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
 	    fi
         fi
 
-        DCOP_DEPENDENCIES='$(DCOPIDL)'
+        DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
         if test -n "$kde32ornewer"; then
             KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
             AC_SUBST(KCONFIG_COMPILER)
             AC_SUBST(KCFG_DEPENDENCIES)
         fi
         AC_SUBST(DCOPIDL)
+        AC_SUBST(DCOPIDLNG)
         AC_SUBST(DCOPIDL2CPP)
         AC_SUBST(DCOP_DEPENDENCIES)
         AC_SUBST(MCOPIDL)
Index: am_edit
===================================================================
RCS file: /home/kde/kde-common/admin/am_edit,v
retrieving revision 1.403
diff -u -3 -d -p -r1.403 am_edit
--- am_edit	18 Oct 2003 20:40:59 -0000	1.403
+++ am_edit	19 Oct 2003 11:24:55 -0000
@@ -1261,7 +1261,7 @@ sub tag_IDLFILES ()
             if ($allidls !~ /$source\_kidl/) {
                 
                 $use_ng = ($MakefileData =~ /\n$source\_DCOPIDLNG\s*=\s*(\S+)\n/);
-                $dcopidl =  $use_ng ? "dcopidlng" : "\$(DCOPIDL)";
+                $dcopidl =  $use_ng ? "\$(DCOPIDLNG)" : "\$(DCOPIDL)";
 
                 $dep_lines .= "$source.kidl: $sourcedir$source.h \
                \$(DCOP_DEPENDENCIES)\n";
                 $dep_lines .= "\t$dcopidl $sourcedir$source.h > $source.kidl || ( rm \
-f $source.kidl ; false )\n";



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