Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 13794)
+++ trunk/build.xml	(revision 13819)
@@ -20,6 +20,11 @@
         <property name="test.dir" location="${base.dir}/test"/>
         <property name="src.dir" location="${base.dir}/src"/>
-        <condition property="noJavaFX" value="${env.JOSM_NOJAVAFX}" else="0">
+        <condition property="noJavaFX">
+            <or>
                 <isset property="env.JOSM_NOJAVAFX"/>
+                <not>
+                    <available classname="javafx.scene.media.Media"/>
+                </not>
+            </or>
         </condition>
         <property name="build.dir" location="${base.dir}/build"/>
@@ -370,5 +375,5 @@
             <compilerarg value="-Xep:JdkObsolete:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg line="-Xmaxwarns 1000"/>
-            <exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/>
+            <exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>
         </javac>
 
@@ -405,4 +410,5 @@
             <arg value="--add-exports" if:set="isJava9" />
             <arg value="javafx.graphics/com.sun.javafx.application=ALL-UNNAMED" if:set="isJava9" />
+            <excludepackage name="org/openstreetmap/josm/io/audio/fx" if:set="noJavaFX" />
         </javadoc>
     </target>