merge the code to create a proper X font dir into lib/configure

[lyx.git] / lib / configure.m4

diff --git a/lib/configure.m4 b/lib/configure.m4
index a0e348d413308f3ab4998c08aab848062cdc3ce6..b8ebadd65b111f0fd39345978efc823291a57570 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -172,7 +172,7 @@ fi
 
 #### Create the build directories if necessary
 for dir in bind clipart doc examples help images kbd layouts reLyX \
-    scripts templates ui ; do
+    scripts templates ui xfonts; do
   test ! -d $dir && mkdir $dir
 done
 
@@ -413,7 +413,7 @@ fi
 
 # Do we have all the files we need? Useful if latex did not run
 changequote([,])dnl
-echo creating textclass.lst 
+echo "creating textclass.lst" 
 PROVIDE_DEFAULT_FILE(textclass.lst,dnl
 [# This file declares layouts and their associated definition files
 # (include dir. relative to the place where this file is).
@@ -428,7 +428,7 @@ letter      letter  letter])
 
 PROVIDE_DEFAULT_FILE(chkconfig.sed,[s/@.*@/???/g])
 
-echo creating packages.lst
+echo "creating packages.lst"
 PROVIDE_DEFAULT_FILE(packages.lst,dnl
 [# This file should contain the list of LaTeX packages that have been
 # recognized by LyX. Unfortunately, since configure could not find
@@ -437,12 +437,12 @@ PROVIDE_DEFAULT_FILE(packages.lst,dnl
 ])
 changequote(,)dnl
 
-echo creating doc/LaTeXConfig.lyx
+echo "creating doc/LaTeXConfig.lyx"
 echo "s/@chk_linuxdoc@/$chk_linuxdoc/g" >> chkconfig.sed
 echo "s/@chk_docbook@/$chk_docbook/g" >> chkconfig.sed
 sed -f chkconfig.sed ${srcdir}/doc/LaTeXConfig.lyx.in >doc/LaTeXConfig.lyx
 
-echo creating $outfile
+echo "creating $outfile"
 cat >$outfile <<EOF
 # This file has been automatically generated by LyX' lib/configure
 # script. It contains default settings that have been determined by
@@ -546,14 +546,44 @@ cat >$outfile <<EOF
 \\viewer eps "$GHOSTVIEW"
 
 $rc_entries
-dnl \\fax_command "$fax_command"
 \\font_encoding "$chk_fontenc"
 EOF
 
+######## X FONTS
+# create a fonts.dir file to make X fonts available to LyX
+echo "checking for TeX fonts"
+fontlist="cmex10 cmmi10 cmr10 cmsy10 eufm10 msam10 msbm10"
+rm -f xfonts/fonts.dir xfonts/fonts.scale xfonts/tmpfonts
+
+num=0
+for font in $fontlist ; do
+  MSG_CHECKING([for $font])
+  result=no
+  for ext in pfb pfa ttf ; do
+    if filepath=`kpsewhich $font.$ext` ; then
+      result="yes ($ext)"
+      rm -f xfonts/$font.$ext
+      ln -s $filepath xfonts 2>/dev/null
+      echo "$font.$ext -unknown-$font-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific" >>xfonts/tmpfonts
+      num=`expr $num + 1`
+      break
+    fi
+  done
+  MSG_RESULT($result)
+done
+
+if test ! $num = 0 ; then
+  echo $num >xfonts/fonts.scale
+  cat xfonts/tmpfonts >>xfonts/fonts.scale
+  cp xfonts/fonts.scale xfonts/fonts.dir
+fi
+rm -f xfonts/tmpfonts
+
+
 # Remove superfluous files if we are not writing in the main lib
 # directory 
 for file in $outfile textclass.lst packages.lst \
-            doc/LaTeXConfig.lyx ; do
+            doc/LaTeXConfig.lyx xfonts/fonts.dir ; do
   # we rename the file first, so that we avoid comparing a file with itself
   mv $file $file.new
   if test -r $srcdir/$file && diff $file.new $srcdir/$file >/dev/null 2>/dev/null ;