summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.in.in4
-rw-r--r--doc/man/Makefile.am23
-rw-r--r--korundum/configure.in.in3
-rw-r--r--qtruby/configure.in.in3
4 files changed, 30 insertions, 3 deletions
diff --git a/configure.in.in b/configure.in.in
index 97468718..afa6b2b9 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -195,7 +195,11 @@ AC_DEFUN([KDE_CHECK_JAVA],
AC_REQUIRE([KDE_CHECK_JAVA_DIR])
if test "$kde_java_bindir" = "no"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE $1";
+ BUILD_$1=false
+ else
+ BUILD_$1=true
fi
+ AM_CONDITIONAL(BUILD_$1, ${BUILD_$1})
]
)
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index ad36d631..1f739ad7 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,4 +1,21 @@
+if BUILD_dcopjava
+ DCOPJAVA_MAN=dcopidl2java.1
+endif
+
+KJSEMBED_MAN=kjscmd.1
+
+if BUILD_korundum
+ KORUNDUM_MAN=krubyinit.1 rbtdeapi.1 rbtdesh.1
+endif
+
+if BUILD_qtjava
+ QTJAVA_MAN=juic.1
+endif
+
+if BUILD_qtruby
+ QTRUBY_MAN=qtrubyinit.1 rbqtapi.1 rbqtsh.1 rbuic.1
+endif
+
tmpdir = $(mandir)/man1
-tmp_DATA = dcopidl2java.1 juic.1 kjscmd.1 krubyinit.1 qtrubyinit.1 \
-rbqtapi.1 rbqtsh.1 rbtdeapi.1 rbtdesh.1 rbuic.1
-EXTRA_DIST=$(tmp_DATA)
+tmp_DATA = $(DCOPJAVA_MAN) $(KJSEMBED_MAN) $(KORUNDUM_MAN) $(QTJAVA_MAN) $(QTRUBY_MAN)
+EXTRA_DIST=$(DCOPJAVA_MAN) $(KJSEMBED_MAN) $(KORUNDUM_MAN) $(QTJAVA_MAN) $(QTRUBY_MAN)
diff --git a/korundum/configure.in.in b/korundum/configure.in.in
index c420adc9..f32e1473 100644
--- a/korundum/configure.in.in
+++ b/korundum/configure.in.in
@@ -2,6 +2,7 @@ AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
if test -z "RUBY_EXECUTABLE"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE korundum"
+ BUILD_korundum=false
else
RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
@@ -87,4 +88,6 @@ else
AC_SUBST(RUBY_INCLUDEDIR)
AC_SUBST(RUBY_LIBRUBYARG)
AC_SUBST(RUBY_CFLAGS)
+ BUILD_korundum=true
fi
+AM_CONDITIONAL(BUILD_korundum, $BUILD_korundum)
diff --git a/qtruby/configure.in.in b/qtruby/configure.in.in
index 84ad88ec..bc32a89d 100644
--- a/qtruby/configure.in.in
+++ b/qtruby/configure.in.in
@@ -2,6 +2,7 @@ AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
if test -z "RUBY_EXECUTABLE"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby"
+ BUILD_qtruby=false
else
RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
@@ -87,4 +88,6 @@ else
AC_SUBST(RUBY_INCLUDEDIR)
AC_SUBST(RUBY_LIBRUBYARG)
AC_SUBST(RUBY_CFLAGS)
+ BUILD_qtruby=true
fi
+AM_CONDITIONAL(BUILD_qtruby, $BUILD_qtruby)