summaryrefslogtreecommitdiff
path: root/desktop/cmatrix/cmatrix-1.2a-find_fonts.diff
blob: 429b48701f500ed7de8b5c5670dabfe01e8a5c14 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
diff -Nur cmatrix-1.2a.orig/configure cmatrix-1.2a/configure
--- cmatrix-1.2a.orig/configure	2002-03-31 19:17:59.000000000 -0600
+++ cmatrix-1.2a/configure	2009-09-06 23:43:05.089753804 -0500
@@ -1876,7 +1876,7 @@
 if test x$CONSOLECHARS != x -o x$CONSOLECHARS != x'"$CONSOLECHARS"'; then
      if test x$SETFONT != x -o x$SETFONT != x'"$SETFONT"'; then
 
-		for ac_file in /usr/lib/kbd/consolefonts /usr/share/consolefonts
+		for ac_file in /usr/lib/kbd/consolefonts /usr/share/consolefonts /usr/share/kbd/consolefonts
 do
 
 ac_safe=`echo "$ac_file" | sed 'y%./+-%__p_%'`
@@ -1911,15 +1911,17 @@
 
 	if test "x$ac_cv_file__usr_lib_kbd_consolefonts" = "xno"; then
 	    if test "x$ac_cv_file__usr_share_consolefonts" = "xno"; then
-		echo "configure: warning:  
+	        if test "x$ac_cv_file__usr_share_kbd_consolefonts" = "xno"; then
+		    echo "configure: warning:  
 
 *** You do not appear to have a consolefonts directory in a standard location
-*** (/usr/lib/kbd or /usr/share), even though you appear to have the
+*** (/usr/lib/kbd or /usr/share/kbd or /usr/share), even though you appear to have the
 *** consolechars and/or setfont command.  The matrix font for the console
 *** will not be installed.  This means you will not be able to use the
 *** matrix console font (and the -l command line switch) unless the font
 *** is located in your current directory when you run CMatrix.
 " 1>&2
+	        fi
 	    fi
 	fi
      fi
@@ -1962,7 +1964,7 @@
   echo "$ac_t""no" 1>&6
 fi
 
-for ac_file in /usr/lib/X11/fonts/misc /usr/X11R6/lib/X11/fonts/misc
+for ac_file in /usr/lib/X11/fonts/misc /usr/X11R6/lib/X11/fonts/misc /usr/share/fonts/misc
 do
 
 ac_safe=`echo "$ac_file" | sed 'y%./+-%__p_%'`
@@ -1997,17 +1999,19 @@
 
 if test "x$ac_cv_file__usr_lib_X11_fonts_misc" = "xno"; then
     if test "x$ac_cv_file__usr_X11R6_lib_X11_fonts_misc" = "xno"; then
-	echo "configure: warning:  
+        if test "x$ac_cv_file__usr_share_fonts_misc" = "xno"; then
+	    echo "configure: warning:  
 
 *** You do not appear to have an X window fonts directory in the standard
-*** locations (/usr/lib/X11/fonts/misc or /usr/X11R6/lib/X11/fonts/misc). The
-*** mtx.pcf font will not be installed.  This means you will probably not
-*** be able to use the mtx fonts in your x terminals, and hence be unable
-*** to use the -x command line switch.  Sorry about that...
+*** locations (/usr/lib/X11/fonts/misc or /usr/X11R6/lib/X11/fonts/misc or
+*** /usr/share/fonts/misc). The mtx.pcf font will not be installed.  This 
+*** means you will probably not be able to use the mtx fonts in your x 
+*** terminals, and hence be unable to use the -x command line switch.  
+*** Sorry about that...
 " 1>&2
 	fi
     fi
-
+fi
 
 LIBS="$LIBS $CURSES_LIB"
 # Check whether --enable-debug or --disable-debug was given.