- fix default_headers when XFS is installed

(ie fixtitypo)
(and do we really want to configure for XFS even if it is not enabled?)

2 files changed, 14 insertions, 13 deletions

diff --git a/NEWS b/NEWS
index b49ed57..1153797 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- fix default_headers when XFS is installed
+
 Version 0.23 - 6 September 2007, by Pascal "Pixel" Rigaux
 
 - do not start xfs for the test (#33219)
diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm
index c1e57d0..d9b96b1 100644
--- a/lib/Xconfig/xfree.pm
+++ b/lib/Xconfig/xfree.pm
@@ -812,19 +812,6 @@ Section "ServerFlags"
     AllowMouseOpenFail # allows the server to start up even if the mouse does not work
 END
 
-if (-x '/usr/bin/xfs') {
-    warn "Configuring X11\n";
-    $default_header .= <<'END';
-Section "Files"
-    # font server independent of the X server to render fonts.
-    FontPath "unix/:-1"
-    # minimal fonts to allow X to run without xfs
-    FontPath "/usr/share/fonts/misc:unscaled"
-EndSection
-END
-}
-
-
 require detect_devices;
 $default_header .= <<'END_XBOX' if detect_devices::is_xbox();
     Option "PciProbe1" "false"
@@ -838,6 +825,18 @@ $default_header .= <<'END';
 EndSection
 END
 
+if (-x '/usr/bin/xfs') {
+    log::l("configuring X font server (XFS)");
+    $default_header .= <<'END';
+Section "Files"
+    # font server independent of the X server to render fonts.
+    FontPath "unix/:-1"
+    # minimal fonts to allow X to run without xfs
+    FontPath "/usr/share/fonts/misc:unscaled"
+EndSection
+END
+}
+
 our $default_ModeLine = arch() =~ /ppc/ ? <<'END_PPC' : <<'END';
     # Apple iMac modes
     ModeLine "1024x768"   78.525 1024 1049 1145 1312   768  769  772  800 +hsync +vsync