From 24d097620485a56ef9a7089e493c378ab8bc7cde Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Mon, 24 Apr 2006 11:48:16 +0000 Subject: Remove WITHOUT_JAVA knob, since it has not been maintained well. PR: 94449 (related) --- editors/openoffice.org-2.0-devel/files/Makefile.knobs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'editors/openoffice.org-2.0-devel/files') diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.knobs b/editors/openoffice.org-2.0-devel/files/Makefile.knobs index 7cd35078b44b..5645c9a1a859 100644 --- a/editors/openoffice.org-2.0-devel/files/Makefile.knobs +++ b/editors/openoffice.org-2.0-devel/files/Makefile.knobs @@ -2,15 +2,11 @@ # Whom: Maho Nakata # $FreeBSD$ -.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ) +.if !defined(WITH_GNUGCJ) CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant -.endif -.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ) +else CONFIGURE_ARGS+= --with-jdk-home="${WRKDIR}/gnugcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}" .endif -.if defined(WITHOUT_JAVA) -CONFIGURE_ARGS+= --without-java -.endif .if defined(WITH_KDE) CONFIGURE_ARGS+= --enable-kde QTDIR="${QT_PREFIX}" @@ -92,12 +88,6 @@ pre-fetch: @${ECHO} "st sv sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN" @${ECHO} "zh-TW zu" @${ECHO} "Default: en-US" -#XXX currently broken -#.if !defined(WITHOUT_JAVA) -# @${ECHO} -# @${ECHO} "You can compile OOo without Java support with" -# @${ECHO} "make -DWITHOUT_JAVA" -#.endif .if !defined(WITH_GNUGCJ) @${ECHO} @${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with" -- cgit v1.2.3