From kde-commits Mon May 17 14:58:02 2004 From: Luciano Montanaro Date: Mon, 17 May 2004 14:58:02 +0000 To: kde-commits Subject: kdenox Message-Id: <20040517145802.0E74815BF () office ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=108480588802823 CVS commit by montanaro: Reverted the dcopidl inclusion. M +9 -6 configure.in.in 1.55 M +9 -6 konq-embed/prepare_kde_src 1.73 R konq-embed/kdesrc/dcop/Makefile.am 1.1 --- kdenox/configure.in.in #1.54:1.55 @@ -68,10 +68,13 @@ sys/sockio.h paths.h malloc.h limits.h strings.h string.h sys/stat.h ) -DCOPIDL2CPP="compiled" -DCOPIDL="compiled" - -AC_SUBST(DCOPIDL, '$(top_builddir)/konq-embed/kdesrc/dcop/dcopidl/dcopidl') -AC_SUBST(DCOPIDL2CPP, - '$(top_builddir)/konq-embed/kdesrc/dcop/dcopidl2cpp/dcopidl2cpp') +# XXX compiling the needed tools would be great, but it is quite a difficult +# thing to do when cross compiling. +# +# DCOPIDL2CPP="compiled" +# DCOPIDL="compiled" +# +# AC_SUBST(DCOPIDL, '$(top_builddir)/konq-embed/kdesrc/dcop/dcopidl/dcopidl') +# AC_SUBST(DCOPIDL2CPP, +# '$(top_builddir)/konq-embed/kdesrc/dcop/dcopidl2cpp/dcopidl2cpp') dnl Checks for typedefs, structures, and compiler characteristics. --- kdenox/konq-embed/prepare_kde_src #1.72:1.73 @@ -245,11 +245,14 @@ cp -p $src/kutils/kfinddialog.h $dst/kutils/kfinddialog.h -mkdir $dst/dcop/dcopidl -mkdir $dst/dcop/dcopidl2cpp -cp -p $src/dcop/dcopidl/*.{cpp,h,cc,ll,yy} $dst/dcop/dcopidl -cp -p $src/dcop/dcopidl/Makefile.am $dst/dcop/dcopidl +# XXX Try to make this work in some reliable way. +# This part is quite difficult to handle correctly. +# +#mkdir $dst/dcop/dcopidl +#mkdir $dst/dcop/dcopidl2cpp +#cp -p $src/dcop/dcopidl/*.{cpp,h,cc,ll,yy} $dst/dcop/dcopidl +#cp -p $src/dcop/dcopidl/Makefile.am $dst/dcop/dcopidl -cp -p $src/dcop/dcopidli2cpp/*.{cpp,h} $dst/dcop/dcopidl2cpp -cp -p $src/dcop/dcopidl2cpp/Makefile.am $dst/dcop/dcopidl2cpp +#cp -p $src/dcop/dcopidli2cpp/*.{cpp,h} $dst/dcop/dcopidl2cpp +#cp -p $src/dcop/dcopidl2cpp/Makefile.am $dst/dcop/dcopidl2cpp for i in ./kdesrc/khtml/rendering/Makefile.am \