anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change configure scripts to work when PATH contains spaces

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@351 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 1999-12-06 15:16:16 +00:00
parent c9e3a02206
commit 7d99e34d02
5 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,4 +1,15 @@
1999-12-03 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 1999-12-06 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* acinclude.m4 (LYX_SEARCH_PROG): make it work when the PATH
elements contain spaces
* lib/configure: regenerated
* lib/configure.m4 (SEARCH_PROG): make it work when the PATH
elements contain spaces; display the list of programs that are
tried.
* autogen.sh: make sure lib/configure is executable
* lib/examples/*: rename the tutorial examples to begin with the * lib/examples/*: rename the tutorial examples to begin with the
two-letters language code. two-letters language code.

2
acinclude.m4
View File

@ -93,7 +93,7 @@ for ac_prog in $2 ; do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog ; ac_word=$[2] set dummy $ac_prog ; ac_word=$[2]
if test -z "[$]$1"; then if test -z "[$]$1"; then
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -f [$ac_dir/$ac_word]; then if test -f [$ac_dir/$ac_word]; then

1
autogen.sh
View File

@ -47,6 +47,7 @@ for prog in $M4 gm4 gnum4 m4 ; do
*traditional*) echo "Building lib/configure" *traditional*) echo "Building lib/configure"
rm -f lib/configure rm -f lib/configure
$prog lib/configure.m4 >lib/configure $prog lib/configure.m4 >lib/configure
chmod a+x lib/configure
ok=yes ok=yes
break ;; break ;;
*) ;; *) ;;

56
lib/configure vendored
View File

@ -78,7 +78,7 @@ done
#### Searching some useful programs #### Searching some useful programs
# Search LaTeX2e # Search LaTeX2e
echo $ac_n "checking for a LaTeX2e program""... $ac_c" echo $ac_n "checking for a LaTeX2e program""... $ac_c"
echo "$ac_t""" echo "$ac_t""(latex latex2e)"
LATEX= LATEX=
for ac_prog in latex latex2e for ac_prog in latex latex2e
do do
@ -86,7 +86,7 @@ do
set dummy $ac_prog ; ac_word=$2 set dummy $ac_prog ; ac_word=$2
if test -n "$ac_word"; then if test -n "$ac_word"; then
echo $ac_n "+checking for \"$ac_word\"""... $ac_c" echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -x $ac_dir/$ac_word; then if test -x $ac_dir/$ac_word; then
@ -131,7 +131,7 @@ fi
if test x$lyx_check_config != x ; then if test x$lyx_check_config != x ; then
echo $ac_n "checking for the pdflatex program""... $ac_c" echo $ac_n "checking for the pdflatex program""... $ac_c"
echo "$ac_t""" echo "$ac_t""(pdflatex)"
PDFLATEX= PDFLATEX=
for ac_prog in pdflatex for ac_prog in pdflatex
do do
@ -139,7 +139,7 @@ do
set dummy $ac_prog ; ac_word=$2 set dummy $ac_prog ; ac_word=$2
if test -n "$ac_word"; then if test -n "$ac_word"; then
echo $ac_n "+checking for \"$ac_word\"""... $ac_c" echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -x $ac_dir/$ac_word; then if test -x $ac_dir/$ac_word; then
@ -187,7 +187,7 @@ fi
save_PATH=${PATH} save_PATH=${PATH}
PATH=${PATH}:./reLyX/ PATH=${PATH}:./reLyX/
echo $ac_n "checking for reLyX LaTeX-to-LyX translator""... $ac_c" echo $ac_n "checking for reLyX LaTeX-to-LyX translator""... $ac_c"
echo "$ac_t""" echo "$ac_t""(reLyX)"
RELYX= RELYX=
for ac_prog in reLyX for ac_prog in reLyX
do do
@ -195,7 +195,7 @@ do
set dummy $ac_prog ; ac_word=$2 set dummy $ac_prog ; ac_word=$2
if test -n "$ac_word"; then if test -n "$ac_word"; then
echo $ac_n "+checking for \"$ac_word\"""... $ac_c" echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -x $ac_dir/$ac_word; then if test -x $ac_dir/$ac_word; then
@ -224,7 +224,7 @@ PATH=${save_PATH}
# Search something to process a literate document # Search something to process a literate document
echo $ac_n "checking for a Literate programming processor""... $ac_c" echo $ac_n "checking for a Literate programming processor""... $ac_c"
echo "$ac_t""" echo "$ac_t""("noweave -delay -index")"
LITERATE= LITERATE=
for ac_prog in "noweave -delay -index" for ac_prog in "noweave -delay -index"
do do
@ -232,7 +232,7 @@ do
set dummy $ac_prog ; ac_word=$2 set dummy $ac_prog ; ac_word=$2
if test -n "$ac_word"; then if test -n "$ac_word"; then
echo $ac_n "+checking for \"$ac_word\"""... $ac_c" echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -x $ac_dir/$ac_word; then if test -x $ac_dir/$ac_word; then
@ -261,7 +261,7 @@ if test "$LITERATE" = "none"; then LITERATE_EXT="none"; else LITERATE_EXT=".nw";
# Search for a Postscript interpreter # Search for a Postscript interpreter
echo $ac_n "checking for a Postscript interpreter""... $ac_c" echo $ac_n "checking for a Postscript interpreter""... $ac_c"
echo "$ac_t""" echo "$ac_t""(gs)"
GS= GS=
for ac_prog in gs for ac_prog in gs
do do
@ -269,7 +269,7 @@ do
set dummy $ac_prog ; ac_word=$2 set dummy $ac_prog ; ac_word=$2
if test -n "$ac_word"; then if test -n "$ac_word"; then
echo $ac_n "+checking for \"$ac_word\"""... $ac_c" echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -x $ac_dir/$ac_word; then if test -x $ac_dir/$ac_word; then
@ -297,7 +297,7 @@ fi
# Search something to preview postscript # Search something to preview postscript
echo $ac_n "checking for a Postscript previewer""... $ac_c" echo $ac_n "checking for a Postscript previewer""... $ac_c"
echo "$ac_t""" echo "$ac_t""(gv ghostview)"
GHOSTVIEW= GHOSTVIEW=
for ac_prog in gv ghostview for ac_prog in gv ghostview
do do
@ -305,7 +305,7 @@ do
set dummy $ac_prog ; ac_word=$2 set dummy $ac_prog ; ac_word=$2
if test -n "$ac_word"; then if test -n "$ac_word"; then
echo $ac_n "+checking for \"$ac_word\"""... $ac_c" echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -x $ac_dir/$ac_word; then if test -x $ac_dir/$ac_word; then
@ -333,7 +333,7 @@ fi
# Search a *roff program (used to translate tables in ASCII export) # Search a *roff program (used to translate tables in ASCII export)
echo $ac_n "checking for a *roff formatter""... $ac_c" echo $ac_n "checking for a *roff formatter""... $ac_c"
echo "$ac_t""" echo "$ac_t""(groff nroff)"
ROFF= ROFF=
for ac_prog in groff nroff for ac_prog in groff nroff
do do
@ -341,7 +341,7 @@ do
set dummy $ac_prog ; ac_word=$2 set dummy $ac_prog ; ac_word=$2
if test -n "$ac_word"; then if test -n "$ac_word"; then
echo $ac_n "+checking for \"$ac_word\"""... $ac_c" echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -x $ac_dir/$ac_word; then if test -x $ac_dir/$ac_word; then
@ -372,7 +372,7 @@ test $ROFF = "nroff" && ascii_roff_command="tbl \$\$FName | nroff"
# Search the ChkTeX program # Search the ChkTeX program
echo $ac_n "checking for ChkTeX""... $ac_c" echo $ac_n "checking for ChkTeX""... $ac_c"
echo "$ac_t""" echo "$ac_t""(chktex)"
CHKTEX= CHKTEX=
for ac_prog in chktex for ac_prog in chktex
do do
@ -380,7 +380,7 @@ do
set dummy $ac_prog ; ac_word=$2 set dummy $ac_prog ; ac_word=$2
if test -n "$ac_word"; then if test -n "$ac_word"; then
echo $ac_n "+checking for \"$ac_word\"""... $ac_c" echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -x $ac_dir/$ac_word; then if test -x $ac_dir/$ac_word; then
@ -410,7 +410,7 @@ test $CHKTEX = "chktex" && chktex_command="$CHKTEX -n1 -n3 -n6 -n9 -n22 -n25 -n3
# Search for a spellchecker # Search for a spellchecker
echo $ac_n "checking for a spell-checker""... $ac_c" echo $ac_n "checking for a spell-checker""... $ac_c"
echo "$ac_t""" echo "$ac_t""(ispell)"
SPELL= SPELL=
for ac_prog in ispell for ac_prog in ispell
do do
@ -418,7 +418,7 @@ do
set dummy $ac_prog ; ac_word=$2 set dummy $ac_prog ; ac_word=$2
if test -n "$ac_word"; then if test -n "$ac_word"; then
echo $ac_n "+checking for \"$ac_word\"""... $ac_c" echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -x $ac_dir/$ac_word; then if test -x $ac_dir/$ac_word; then
@ -446,7 +446,7 @@ fi
# Search a Fax handling program # Search a Fax handling program
echo $ac_n "checking for a fax driver""... $ac_c" echo $ac_n "checking for a fax driver""... $ac_c"
echo "$ac_t""" echo "$ac_t""(sendfax faxsend fax)"
FAX= FAX=
for ac_prog in sendfax faxsend fax for ac_prog in sendfax faxsend fax
do do
@ -454,7 +454,7 @@ do
set dummy $ac_prog ; ac_word=$2 set dummy $ac_prog ; ac_word=$2
if test -n "$ac_word"; then if test -n "$ac_word"; then
echo $ac_n "+checking for \"$ac_word\"""... $ac_c" echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -x $ac_dir/$ac_word; then if test -x $ac_dir/$ac_word; then
@ -491,7 +491,7 @@ fi
# Search for LinuxDoc support # Search for LinuxDoc support
echo $ac_n "checking for SGML-tools 1.x (LinuxDoc)""... $ac_c" echo $ac_n "checking for SGML-tools 1.x (LinuxDoc)""... $ac_c"
echo "$ac_t""" echo "$ac_t""(sgml2lyx)"
LINUXDOC= LINUXDOC=
for ac_prog in sgml2lyx for ac_prog in sgml2lyx
do do
@ -499,7 +499,7 @@ do
set dummy $ac_prog ; ac_word=$2 set dummy $ac_prog ; ac_word=$2
if test -n "$ac_word"; then if test -n "$ac_word"; then
echo $ac_n "+checking for \"$ac_word\"""... $ac_c" echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -x $ac_dir/$ac_word; then if test -x $ac_dir/$ac_word; then
@ -532,7 +532,7 @@ fi
# Search for DocBook support # Search for DocBook support
echo $ac_n "checking for SGML-tools 2.x (DocBook)""... $ac_c" echo $ac_n "checking for SGML-tools 2.x (DocBook)""... $ac_c"
echo "$ac_t""" echo "$ac_t""(sgmltools)"
DOCBOOK= DOCBOOK=
for ac_prog in sgmltools for ac_prog in sgmltools
do do
@ -540,7 +540,7 @@ do
set dummy $ac_prog ; ac_word=$2 set dummy $ac_prog ; ac_word=$2
if test -n "$ac_word"; then if test -n "$ac_word"; then
echo $ac_n "+checking for \"$ac_word\"""... $ac_c" echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -x $ac_dir/$ac_word; then if test -x $ac_dir/$ac_word; then
@ -574,7 +574,7 @@ fi
# Search for a spool command # Search for a spool command
echo $ac_n "checking for a spool command""... $ac_c" echo $ac_n "checking for a spool command""... $ac_c"
echo "$ac_t""" echo "$ac_t""(lp lpr)"
LPR= LPR=
for ac_prog in lp lpr for ac_prog in lp lpr
do do
@ -582,7 +582,7 @@ do
set dummy $ac_prog ; ac_word=$2 set dummy $ac_prog ; ac_word=$2
if test -n "$ac_word"; then if test -n "$ac_word"; then
echo $ac_n "+checking for \"$ac_word\"""... $ac_c" echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -x $ac_dir/$ac_word; then if test -x $ac_dir/$ac_word; then
@ -617,7 +617,7 @@ esac
# Search for a latex to html converter # Search for a latex to html converter
echo $ac_n "checking for an HTML converter""... $ac_c" echo $ac_n "checking for an HTML converter""... $ac_c"
echo "$ac_t""" echo "$ac_t""(tth latex2html hevea)"
TOHTML= TOHTML=
for ac_prog in tth latex2html hevea for ac_prog in tth latex2html hevea
do do
@ -625,7 +625,7 @@ do
set dummy $ac_prog ; ac_word=$2 set dummy $ac_prog ; ac_word=$2
if test -n "$ac_word"; then if test -n "$ac_word"; then
echo $ac_n "+checking for \"$ac_word\"""... $ac_c" echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -x $ac_dir/$ac_word; then if test -x $ac_dir/$ac_word; then

4
lib/configure.m4
View File

@ -29,7 +29,7 @@ dnl
define(SEARCH_PROG,[dnl define(SEARCH_PROG,[dnl
changequote([,])dnl changequote([,])dnl
MSG_CHECKING($1) MSG_CHECKING($1)
MSG_RESULT() MSG_RESULT(($3))
$2= $2=
for ac_prog in $3 for ac_prog in $3
do do
@ -37,7 +37,7 @@ do
set dummy $ac_prog ; ac_word=$[2] set dummy $ac_prog ; ac_word=$[2]
if test -n "$ac_word"; then if test -n "$ac_word"; then
MSG_CHECKING([for \"$ac_word\"],[+]) MSG_CHECKING([for \"$ac_word\"],[+])
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -x [$ac_dir/$ac_word]; then if test -x [$ac_dir/$ac_word]; then