diff --git a/configure b/configure index 2816c90a..2c7880a2 100755 --- a/configure +++ b/configure @@ -70,6 +70,23 @@ vars_re=$(echo $vars | sed 's/ /\\|/g') eval $(for _; do echo "$_"; done | sed -n 's/^--\('"$vars_re"'\)=\(.*\)$/\1="\2"/;T;p') +conds=" +ivy +gradle +generators +" + +for _ in $conds; do + eval "with_$_=true" +done + +conds_re=$(echo $conds | sed 's/ /\\|/g') +condvars_re=with_$(echo $conds | sed 's/ /\\|with_/g') + +eval $(for _; do echo "$_"; done | + sed -n 's/^--without-\('"$conds_re"'\)$/with_\1=false/;T;p') + + eval $(for _; do echo "$_"; done | sed -n 's/^--jvm=\([^=]*\)=\(.*\)$/jvms="${jvms}\1=\2 "/;T;p') @@ -90,5 +107,5 @@ test -z "${abrtlibdir}" && abrtlibdir="${prefix}/lib/abrt-java-connector" eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' macros.d/macros.javapackages-filesystem) -set | sed -n 's/^\('"$vars_re"'\)=/&/;T;p' >config.status +set | sed -n 's/^\('"$vars_re\\|$condvars_re"'\)=/&/;T;p' >config.status echo "jvms=\"${jvms}\"" >>config.status diff --git a/install b/install index 175f1c20..75583d8d 100755 --- a/install +++ b/install @@ -203,41 +203,42 @@ inst_data java-utils/maven_depmap.py "${javadir}-utils" inst_data target/macros.javapackages-compat "${rpmmacrodir}" -exec >files-generators +if $with_generators; then + exec >files-generators -dir "${rpmconfigdir}/fileattrs" + dir "${rpmconfigdir}/fileattrs" -inst_exec target/maven.prov "${rpmconfigdir}" maven.prov -inst_exec target/maven.req "${rpmconfigdir}" maven.req -inst_exec target/osgi.prov "${rpmconfigdir}" osgi.prov -inst_exec target/osgi.req "${rpmconfigdir}" osgi.req -inst_exec target/javadoc.req "${rpmconfigdir}" javadoc.req + inst_exec target/maven.prov "${rpmconfigdir}" maven.prov + inst_exec target/maven.req "${rpmconfigdir}" maven.req + inst_exec target/osgi.prov "${rpmconfigdir}" osgi.prov + inst_exec target/osgi.req "${rpmconfigdir}" osgi.req + inst_exec target/javadoc.req "${rpmconfigdir}" javadoc.req -inst_data target/maven.attr "${rpmconfigdir}/fileattrs" maven.attr -inst_data target/osgi.attr "${rpmconfigdir}/fileattrs" osgi.attr -inst_data target/javadoc.attr "${rpmconfigdir}/fileattrs" javadoc.attr - -inst_config etc/javapackages-config.json "${javaconfdir}" + inst_data target/maven.attr "${rpmconfigdir}/fileattrs" maven.attr + inst_data target/osgi.attr "${rpmconfigdir}/fileattrs" osgi.attr + inst_data target/javadoc.attr "${rpmconfigdir}/fileattrs" javadoc.attr + inst_config etc/javapackages-config.json "${javaconfdir}" +fi exec >files-maven # Nothing -exec >files-ivy - -dir "${sysconfdir}/ivy" - -inst_data configs/ivy-local-classpath "${sysconfdir}/ant.d" -inst_data configs/ivysettings.xml "${sysconfdir}/ivy" - - -exec >files-gradle +if $with_ivy; then + exec >files-ivy + dir "${sysconfdir}/ivy" + inst_data configs/ivy-local-classpath "${sysconfdir}/ant.d" + inst_data configs/ivysettings.xml "${sysconfdir}/ivy" +fi -inst_exec target/gradle-local "${bindir}" -inst_data gradle/init.gradle "${datadir}/gradle-local" -inst_data target/gradle_build.7 "${mandir}/man7" +if $with_gradle; then + exec >files-gradle + inst_exec target/gradle-local "${bindir}" + inst_data gradle/init.gradle "${datadir}/gradle-local" + inst_data target/gradle_build.7 "${mandir}/man7" +fi exec >files-python (cd ./python && "${pyinterpreter}" setup.py install -O1 --skip-build --prefix "${prefix}" --root "${DEST}") >&2