partial cleanup to the lib/configure script

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3247 a592a061-630c-0410-9148-cb99ea01b6c8

lib/ChangeLog

@@ -1,5 +1,11 @@
 2001-12-19  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
+	* configure.m4: add new macros LYXRC_VAR and LYXRC_PROG. These are
+	used for checking for a program and add the corresponding entry in
+	lyxrc.defaults. Used this for various checks (not finished yet).
+
+	* chkconfig.ltx: add test for graphic package
+
 	* doc/LaTeXConfig.lyx.in: general update: moved things around,
 	corrected some entries, collapsed some others, added graphicx.
 

lib/chkconfig.ltx

@@ -212,6 +212,7 @@
 \TestPackage{array}
 \TestPackage{babel}
 \TestPackage{color} % this one should be there if graphics.sty is there.
+\TestPackage{graphicx} % this one should be there if graphics.sty is there. 
 \TestPackage{fancyhdr}
 \TestPackage{floatflt}
 \TestPackage{setspace}

lib/configure

@@ -7,7 +7,11 @@
 
 
 
+
+
 ####some configuration variables
+outfile=lyxrc.defaults
+rc_entries=
 lyx_check_config=yes
 lyx_keep_temps=no
 srcdir=
@@ -413,7 +417,7 @@ test $image_command = "convert" && image_command="convert \$\$i \$\$o"
 # Search for a Postscript interpreter
 echo $ac_n "checking for a Postscript interpreter""... $ac_c"
 echo "$ac_t""(gs)"
-GS=
+prog=
 for ac_prog in gs
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -424,27 +428,29 @@ if test -n "$ac_word"; then
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -x $ac_dir/$ac_word; then
-      GS="$ac_prog"
+      prog="$ac_prog"
       break
     fi
   done
   IFS="$ac_save_ifs"
 
-  if test -n "$GS"; then
+  if test -n "$prog"; then
     ac_result=yes
     
   else
     ac_result=no
   fi
   echo "$ac_t""$ac_result"
-  test -n "$GS" && break
+  test -n "$prog" && break
 fi
 done
 
-if test -z "$GS" ; then
+if test -z "$prog" ; then
-  GS=none
+  prog=none
 fi
 
+rc_entries="$rc_entries
+\ps_command \"$prog\""
 
 # Search something to preview postscript
 echo $ac_n "checking for a Postscript previewer""... $ac_c"
@@ -703,9 +709,9 @@ test $dvi_to_pdf_command = "dvipdfm" && dvi_to_pdf_command="dvipdfm \$\$i"
 
 # Search a *roff program (used to translate tables in ASCII export)
 echo $ac_n "checking for a *roff formatter""... $ac_c"
-echo "$ac_t""(groff nroff)"
+echo "$ac_t""('groff -t -Tlatin1 $$FName' nroff)"
-ROFF=
+prog=
-for ac_prog in groff nroff
+for ac_prog in 'groff -t -Tlatin1 $$FName' nroff
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -715,36 +721,35 @@ if test -n "$ac_word"; then
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -x $ac_dir/$ac_word; then
-      ROFF="$ac_prog"
+      prog="$ac_prog"
       break
     fi
   done
   IFS="$ac_save_ifs"
 
-  if test -n "$ROFF"; then
+  if test -n "$prog"; then
     ac_result=yes
-    
+    test $prog = "nroff" && prog='tbl $$FName | nroff'
   else
     ac_result=no
   fi
   echo "$ac_t""$ac_result"
-  test -n "$ROFF" && break
+  test -n "$prog" && break
 fi
 done
 
-if test -z "$ROFF" ; then
+if test -z "$prog" ; then
-  ROFF=none
+  prog=none
 fi
 
-ascii_roff_command=$ROFF
+rc_entries="$rc_entries
-test $ROFF = "groff" && ascii_roff_command="groff -t -Tlatin1 \$\$FName"
+\ascii_roff_command \"$prog\""
-test $ROFF = "nroff" && ascii_roff_command="tbl \$\$FName | nroff"
 
 # Search the ChkTeX program
 echo $ac_n "checking for ChkTeX""... $ac_c"
-echo "$ac_t""(chktex)"
+echo "$ac_t""("chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38")"
-CHKTEX=
+prog=
-for ac_prog in chktex
+for ac_prog in "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38"
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -754,34 +759,34 @@ if test -n "$ac_word"; then
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -x $ac_dir/$ac_word; then
-      CHKTEX="$ac_prog"
+      prog="$ac_prog"
       break
     fi
   done
   IFS="$ac_save_ifs"
 
-  if test -n "$CHKTEX"; then
+  if test -n "$prog"; then
     ac_result=yes
     
   else
     ac_result=no
   fi
   echo "$ac_t""$ac_result"
-  test -n "$CHKTEX" && break
+  test -n "$prog" && break
 fi
 done
 
-if test -z "$CHKTEX" ; then
+if test -z "$prog" ; then
-  CHKTEX=none
+  prog=none
 fi
 
-chktex_command=$CHKTEX
+rc_entries="$rc_entries
-test $CHKTEX = "chktex" && chktex_command="$CHKTEX -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38"
+\chktex_command \"$prog\""
 
 # Search for a spellchecker
 echo $ac_n "checking for a spell-checker""... $ac_c"
 echo "$ac_t""(ispell)"
-SPELL=
+prog=
 for ac_prog in ispell
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -792,27 +797,29 @@ if test -n "$ac_word"; then
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -x $ac_dir/$ac_word; then
-      SPELL="$ac_prog"
+      prog="$ac_prog"
       break
     fi
   done
   IFS="$ac_save_ifs"
 
-  if test -n "$SPELL"; then
+  if test -n "$prog"; then
     ac_result=yes
     
   else
     ac_result=no
   fi
   echo "$ac_t""$ac_result"
-  test -n "$SPELL" && break
+  test -n "$prog" && break
 fi
 done
 
-if test -z "$SPELL" ; then
+if test -z "$prog" ; then
-  SPELL=none
+  prog=none
 fi
 
+rc_entries="$rc_entries
+\spell_command \"$prog\""
 
 
 # Search a GUI Fax program
@@ -962,7 +969,7 @@ esac
 # Search for a spool command
 echo $ac_n "checking for a spool command""... $ac_c"
 echo "$ac_t""(lp lpr)"
-LPR=
+prog=
 for ac_prog in lp lpr
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -973,34 +980,36 @@ if test -n "$ac_word"; then
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -x $ac_dir/$ac_word; then
-      LPR="$ac_prog"
+      prog="$ac_prog"
       break
     fi
   done
   IFS="$ac_save_ifs"
 
-  if test -n "$LPR"; then
+  if test -n "$prog"; then
     ac_result=yes
     
   else
     ac_result=no
   fi
   echo "$ac_t""$ac_result"
-  test -n "$LPR" && break
+  test -n "$prog" && break
 fi
 done
 
-if test -z "$LPR" ; then
+if test -z "$prog" ; then
-  LPR=none
+  prog=none
 fi
 
-case $LPR in
+rc_entries="$rc_entries
-  lp) print_spool_command=lp
+\printspool_command \"$prog\""
-      print_spool_printerprefix="-d ";;
+case $prog in
- lpr) print_spool_command=lpr
+  lp) print_spool_printerprefix="-d ";;
-      print_spool_printerprefix="-P";;
+ lpr) print_spool_printerprefix="-P";;
    *) :;; # leave to empty values
 esac
+rc_entries="$rc_entries
+\print_spool_printerprefix \"$print_spool_printerprefix\""
 
 echo $ac_n "checking for a LaTeX -> HTML converter""... $ac_c"
 echo "$ac_t""(tth latex2html hevea)"
@@ -1275,9 +1284,8 @@ 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 lyxrc.defaults
+echo creating $outfile
-rm -f lyxrc.defaults
+cat >$outfile <<EOF
-cat >lyxrc.defaults <<EOF
 # This file has been automatically generated by LyX' lib/configure
 # script. It contains default settings that have been determined by
 # examining your system. PLEASE DO NOT MODIFY ANYTHING HERE! If you
@@ -1351,18 +1359,13 @@ cat >lyxrc.defaults <<EOF
 \\viewer ps "$GHOSTVIEW -swap"
 \\viewer eps "$GHOSTVIEW"
 
-\\ps_command "$GS"
+$rc_entries
-\\ascii_roff_command "$ascii_roff_command"
-\\chktex_command "$chktex_command"
-\\spell_command "$SPELL"
-\\print_spool_command "$print_spool_command"
-\\print_spool_printerprefix "$print_spool_printerprefix"
 \\font_encoding "$chk_fontenc"
 EOF
 
 # Remove superfluous files if we are not writing in the main lib
 # directory 
-for file in lyxrc.defaults textclass.lst packages.lst \
+for file in $outfile textclass.lst packages.lst \
             doc/LaTeXConfig.lyx ; do
   # we rename the file first, so that we avoid comparing a file with itself
   mv $file $file.new

lib/configure.m4

@@ -67,6 +67,19 @@ changequote(,)dnl
 ])dnl
 dnl
 dnl
+dnl LYXRC_VAR(VARIABLE_NAME, VALUE)
+define(LYXRC_VAR,[dnl
+rc_entries="$rc_entries
+$1 \"$2\""])
+dnl
+dnl
+dnl LYXRC_PROG(FEATURE-DESCRIPTION,VARIABLE-NAME,PROGRAMS-LIST,
+dnl             ACTION-IF-FOUND,ACTION-IF-NOT-FOUND)
+define(LYXRC_PROG,[dnl
+SEARCH_PROG($1,prog,$3,$4,$5)
+LYXRC_VAR($2,$prog)])
+dnl
+dnl
 dnl PROVIDE_DEFAULT_FILE(FILE, DEFAULT-VALUE)
 dnl
 define(PROVIDE_DEFAULT_FILE,[dnl
@@ -82,6 +95,8 @@ dnl ######### End M4 macros #############################################
 
 
 ####some configuration variables
+outfile=lyxrc.defaults
+rc_entries=
 lyx_check_config=yes
 lyx_keep_temps=no
 srcdir=
@@ -225,7 +240,7 @@ SEARCH_PROG([for Image converter],image_command,convert)
 test $image_command = "convert" && image_command="convert \$\$i \$\$o"
 
 # Search for a Postscript interpreter
-SEARCH_PROG([for a Postscript interpreter],GS, gs)
+LYXRC_PROG([for a Postscript interpreter], \ps_command, gs)
 
 # Search something to preview postscript
 SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gv ghostview)
@@ -252,18 +267,16 @@ SEARCH_PROG([for a DVI to PDF converter],dvi_to_pdf_command,dvipdfm)
 test $dvi_to_pdf_command = "dvipdfm" && dvi_to_pdf_command="dvipdfm \$\$i"
 
 # Search a *roff program (used to translate tables in ASCII export)
-SEARCH_PROG([for a *roff formatter],ROFF,groff nroff)
+LYXRC_PROG([for a *roff formatter], \ascii_roff_command, dnl
-ascii_roff_command=$ROFF
+  'groff -t -Tlatin1 $$FName' nroff,dnl
-test $ROFF = "groff" && ascii_roff_command="groff -t -Tlatin1 \$\$FName"
+  test $prog = "nroff" && prog='tbl $$FName | nroff')
-test $ROFF = "nroff" && ascii_roff_command="tbl \$\$FName | nroff"
 
 # Search the ChkTeX program
-SEARCH_PROG([for ChkTeX],CHKTEX,chktex)
+LYXRC_PROG([for ChkTeX], \chktex_command,dnl
-chktex_command=$CHKTEX
+   "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38")
-test $CHKTEX = "chktex" && chktex_command="$CHKTEX -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38"
 
 # Search for a spellchecker
-SEARCH_PROG([for a spell-checker], SPELL,ispell)
+LYXRC_PROG([for a spell-checker], \spell_command, ispell)
 
 dnl # Search a Fax handling program
 dnl SEARCH_PROG([for a fax driver], FAX, sendfax faxsend fax)
@@ -323,14 +336,13 @@ case $DOCBOOK in
 esac
 
 # Search for a spool command
-SEARCH_PROG([for a spool command], LPR, lp lpr)
+LYXRC_PROG([for a spool command], \printspool_command, lp lpr)
-case $LPR in
+case $prog in
-  lp) print_spool_command=lp
+  lp) print_spool_printerprefix="-d ";;
-      print_spool_printerprefix="-d ";;
+ lpr) print_spool_printerprefix="-P";;
- lpr) print_spool_command=lpr
-      print_spool_printerprefix="-P";;
    *) :;; # leave to empty values
 esac
+LYXRC_VAR(\print_spool_printerprefix, $print_spool_printerprefix)
 
 SEARCH_PROG([for a LaTeX -> HTML converter], TOHTML, tth latex2html hevea)
 latex_to_html_command=$TOHTML
@@ -428,9 +440,8 @@ 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 lyxrc.defaults
+echo creating $outfile
-rm -f lyxrc.defaults
+cat >$outfile <<EOF
-cat >lyxrc.defaults <<EOF
 # This file has been automatically generated by LyX' lib/configure
 # script. It contains default settings that have been determined by
 # examining your system. PLEASE DO NOT MODIFY ANYTHING HERE! If you
@@ -504,19 +515,14 @@ cat >lyxrc.defaults <<EOF
 \\viewer ps "$GHOSTVIEW -swap"
 \\viewer eps "$GHOSTVIEW"
 
-\\ps_command "$GS"
+$rc_entries
-\\ascii_roff_command "$ascii_roff_command"
-\\chktex_command "$chktex_command"
-\\spell_command "$SPELL"
 dnl \\fax_command "$fax_command"
-\\print_spool_command "$print_spool_command"
-\\print_spool_printerprefix "$print_spool_printerprefix"
 \\font_encoding "$chk_fontenc"
 EOF
 
 # Remove superfluous files if we are not writing in the main lib
 # directory 
-for file in lyxrc.defaults textclass.lst packages.lst \
+for file in $outfile textclass.lst packages.lst \
             doc/LaTeXConfig.lyx ; do
   # we rename the file first, so that we avoid comparing a file with itself
   mv $file $file.new