From d15a35a9097686cff2188c1b6e80832bbad22c90 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sun, 12 Mar 2006 10:51:11 +0000 Subject: [PATCH] Get rid of lib/configure.m4 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13347 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 5 + autogen.sh | 7 - configure.ac | 5 +- lib/ChangeLog | 5 + lib/Makefile.am | 13 +- lib/configure.m4 | 729 ----------------------------------------------- src/ChangeLog | 5 + src/lyx_cb.C | 4 +- src/lyx_main.C | 6 +- 9 files changed, 27 insertions(+), 752 deletions(-) delete mode 100644 lib/configure.m4 diff --git a/ChangeLog b/ChangeLog index e0207fd02c..5e3f19907f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-03-12 Georg Baum + + * configure.ac: run lib/configure.py, not lib/configure + * autogen.sh: don't build lib/configure from lib/configure.m4 anymore + 2006-02-24 Jean-Marc Lasgouttes * RELEASE-NOTES: update. diff --git a/autogen.sh b/autogen.sh index bda48fd4ab..fa2b829675 100755 --- a/autogen.sh +++ b/autogen.sh @@ -127,13 +127,6 @@ else exit 1 fi -# Autogenerate lib/configure.m4. -echo -n "Building lib/configure ... " -rm -f lib/configure -$GNUM4 lib/configure.m4 > lib/configure -chmod a+x lib/configure -echo "done." - echo echo 'run "./configure ; make"' echo diff --git a/configure.ac b/configure.ac index bc80ec095e..ea83e9b0b4 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar no-define 1.9]) PACKAGE=$save_PACKAGE ### Set the execute permissions of the various scripts correctly -for file in config/install-sh config/mkinstalldirs lib/configure ; do +for file in config/install-sh config/mkinstalldirs ; do chmod 755 ${srcdir}/${file} done @@ -427,7 +427,6 @@ int mkstemp(char*); ]) ### Finish the work. -AC_CONFIG_SUBDIRS(lib) AC_CONFIG_FILES([Makefile m4/Makefile \ boost/Makefile \ boost/libs/Makefile \ @@ -474,6 +473,8 @@ AC_CONFIG_FILES([Makefile m4/Makefile \ src/frontends/qt4/moc/Makefile \ src/frontends/qt4/ui/Makefile \ ]) +echo "Running $LYX_ABS_TOP_SRCDIR/lib/configure.py --with-version-suffix=\"$version_suffix\"" +(cd lib && python $LYX_ABS_TOP_SRCDIR/lib/configure.py --with-version-suffix="$version_suffix") AC_OUTPUT # show version information diff --git a/lib/ChangeLog b/lib/ChangeLog index 15c5a4ddf7..5ec17b69d2 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2006-03-12 Georg Baum + + * configure.m4: Remove + * Makefile.am: Remove configure.m4 and use configure.py + 2006-03-11 Georg Baum * configure.py: fix off-by-one error in version_suffix handling diff --git a/lib/Makefile.am b/lib/Makefile.am index 09520e1073..510eae7574 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -5,7 +5,6 @@ DISTCLEANFILES += texput.log textclass.lst packages.lst lyxrc.defaults SUBDIRS = doc lyx2lyx EXTRA_DIST = \ - configure.m4 \ chkconfig.ltx CHMOD = chmod @@ -13,7 +12,7 @@ CHMOD = chmod # We cannot use dist_pkgdata_SCRIPTS for configure, since a possible # version-suffix would get appended to the names. So we use dist_pkgdata_DATA # and chmod manually in install-data-hook. -dist_pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx configure \ +dist_pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx configure.py \ lyxrc.defaults textclass.lst packages.lst external_templates \ encodings languages symbols syntax.default @@ -898,15 +897,11 @@ dist_ui_DATA = \ ui/stdmenus.ui \ ui/stdtoolbars.ui -$(srcdir)/configure: $(srcdir)/configure.m4 - $(M4) $< > $@ - $(CHMOD) 755 $@ - -lyxrc.defaults: $(srcdir)/configure - $(SHELL) $< +lyxrc.defaults: $(srcdir)/configure.py + python $< install-data-hook: - $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure + $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure.py for i in $(dist_scripts_DATA); do \ $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/$$i; \ done diff --git a/lib/configure.m4 b/lib/configure.m4 deleted file mode 100644 index 1e8afd04f9..0000000000 --- a/lib/configure.m4 +++ /dev/null @@ -1,729 +0,0 @@ -#! /bin/sh -dnl Use 'make' to create configure from this m4 script. -# This script is a hand-made configure script. It contains a lot of -# code stolen from GNU autoconf. I removed all the code that was not -# useful for configuring a LyX installation. - - -dnl ######### Begin M4 macros ######################################### -dnl This is a template for my stripped-down configure script. -dnl First, a few convenient macros. -changequote([,])dnl -dnl -dnl -dnl MSG_CHECKING(FEATURE-DESCRIPTION,PREFIX) -dnl -define(MSG_CHECKING, -[echo $ac_n "$2checking $1""... $ac_c"])dnl -dnl -dnl -dnl MSG_RESULT(RESULT-DESCRIPTION) -dnl -define(MSG_RESULT, -[echo "$ac_t""$1"])dnl -dnl -dnl -dnl SEARCH_PROG(FEATURE-DESCRIPTION,VARIABLE-NAME,PROGRAMS-LIST, -dnl ACTION-IF-FOUND,ACTION-IF-NOT-FOUND) -dnl -define(SEARCH_PROG,[dnl -changequote([,])dnl -MSG_CHECKING($1) -MSG_RESULT() -$2= -for ac_prog in $3 -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog ; ac_word=$[2] -if test -n "$ac_word"; then - MSG_CHECKING([for \"$ac_word\"],[+]) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - save_PATH=$PATH ; PATH=:$PATH - for ac_dir in ${PATH} ; do - if test -x [$ac_dir/$ac_word]; then - $2="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" - PATH=$save_PATH - - if test -n "[$]$2"; then - ac_result=yes - ifelse($4,,,[$4]) - else - ac_result=no - fi - MSG_RESULT($ac_result) - test -n "[$]$2" && break -fi -done - -if test -z "[$]$2" ; then - $2=none -ifelse($5,,,[ $5 -])dnl -fi -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 -# if $1 does not exist (because LaTeX did not run), -# then provide a standard version. -if test ! -f $1 ; then - cat >$1 </dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi - - - -####some configuration variables -outfile=lyxrc.defaults -rc_entries= -lyx_check_config=yes -lyx_keep_temps=no -srcdir= -version_suffix= - -#### Parse the command line -for ac_option do - case "$ac_option" in - -help | --help | -h) - cat << EOF -Usage: configure [options] -Options: - --help show this help lines - --keep-temps keep temporary files (for debug. purposes) - --without-latex-config do not run LaTeX to determine configuration - --with-version-suffix=suffix suffix of binary installed files -EOF - exit 0;; - --without-latex-config) - lyx_check_config=no ;; - --keep-temps) - lyx_keep_temps=yes ;; - --with-version-suffix*) - version_suffix=`echo "$ac_option" | sed 's,--with-version-suffix=,,'` - esac -done - - -#### Checking for some echo oddities -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi - - -#### I do not really know why this is useful, but we might as well keep it. -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - - -#### Guess the directory in which configure is located. -changequote([,])dnl -ac_prog=[$]0 -changequote(,)dnl -srcdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` -test "x${srcdir}" = "x$ac_prog" && srcdir=. -if test ! -r "${srcdir}"/chkconfig.ltx ; then - echo "configure: error: cannot find chkconfig.ltx script" - exit 1 -fi - -#### Adjust PATH for Win32 (Cygwin) -use_cygwin_path_fix='' -case `uname -s` in - CYGWIN*) - tmpfname="/tmp/x$$.ltx"; - echo "\\documentstyle{article}" > $tmpfname - echo "\\begin{document}\\end{document}" >> $tmpfname - inpname=`cygpath -w $tmpfname | tr '\\\\' /` - echo "\\input{$inpname}" > wrap_temp$$.ltx - check_err=`latex wrap_temp$$.ltx 2>&1 < /dev/null | grep Error` - rm -f wrap_temp$$.* /tmp/x$$.* - if [ x"$check_err" = "x" ] - then - echo "configure: cygwin detected; path correction" - srcdir=`cygpath -w "${srcdir}" | tr '\\\\' /` - echo "srcdir=${srcdir}" - use_cygwin_path_fix='true' - else - echo "configure: cygwin detected; path correction is not needed" - use_cygwin_path_fix='false' - fi - ;; -esac - -#### Create the build directories if necessary -for dir in bind clipart doc examples images kbd layouts \ - scripts templates ui ; do - test ! -d $dir && mkdir $dir -done - - -#### Searching some useful programs -define(CHECKLATEX2E,[ -## Check whether this is really LaTeX2e -rm -f chklatex.ltx -cat >chklatex.ltx </dev/null \ - | grep 'ThisIsLaTeX2e' >/dev/null; then - : -else - LATEX= - ac_result="not useable" -fi -rm -f chklatex.ltx chklatex.log])dnl -dnl -# Search LaTeX2e -SEARCH_PROG([for a LaTeX2e program],LATEX,pplatex latex2e latex,CHECKLATEX2E,dnl - [lyx_check_config=no]) -latex_to_dvi=$LATEX -test -z "$latex_to_dvi" && latex_to_dvi="none" - -# Search for pdflatex -if test ${lyx_check_config} = no ; then - latex_to_pdf=none -else - SEARCH_PROG([for the pdflatex program],latex_to_pdf,pdflatex) -fi - -test $latex_to_dvi != "none" && latex_to_dvi="$latex_to_dvi \$\$i" -test $latex_to_pdf != "none" && latex_to_pdf="$latex_to_pdf \$\$i" - -SEARCH_PROG([for a Tgif viewer and editor], TGIF_EDITOR, tgif) -TGIF_VIEWER="$TGIF_EDITOR" - -SEARCH_PROG([for a FIG viewer and editor], FIG_EDITOR, xfig) -FIG_VIEWER="$FIG_EDITOR" - -SEARCH_PROG([for a Grace viewer and editor], GRACE_EDITOR, xmgrace) -GRACE_VIEWER="$GRACE_EDITOR" - -SEARCH_PROG([for a FEN viewer and editor], FEN_EDITOR, "xboard -lpf \$\$i -mode EditPosition") -FEN_VIEWER="$FEN_EDITOR" - -SEARCH_PROG([for a raster image viewer], RASTERIMAGE_VIEWER, xv kview gimp) - -SEARCH_PROG([for a raster image editor], RASTERIMAGE_EDITOR, gimp) - -SEARCH_PROG([for a text editor], TEXT_EDITOR, xemacs gvim kedit kwrite kate nedit gedit notepad) - -# Search for an installed tex2lyx or a ready-to-install one -SEARCH_PROG([for a LaTeX -> LyX converter],tex_to_lyx_command, "$PWD/../src/tex2lyx/tex2lyx -f \$\$i \$\$o" "tex2lyx$version_suffix -f \$\$i \$\$o") - -SEARCH_PROG([for a Noweb -> LyX converter],literate_to_lyx_command,"noweb2lyx \$\$i \$\$o") -literate_to_lyx_command=`echo $literate_to_lyx_command | sed "s,noweb2lyx,noweb2lyx$version_suffix,"` - -# Search something to process a literate document -SEARCH_PROG([for a Noweb -> LaTeX converter],literate_to_tex_command,"noweave -delay -index \$\$i > \$\$o") - -SEARCH_PROG([for an HTML -> LaTeX converter],html_to_latex_command, "html2latex \$\$i") - -SEARCH_PROG([for an MS Word -> LaTeX converter],word_to_latex_command, "wvCleanLatex \$\$i \$\$o") - -# tex4ht generates HTML output that is well-suited for MS Word -SEARCH_PROG([for a LaTeX -> MS Word converter],latex_to_word_command, "htlatex") -test "$latex_to_word_command" = "htlatex" && latex_to_word_command="htlatex \$\$i 'html,word' 'symbol/!' '-cvalidate'" - - - -SEARCH_PROG([for Image converter],image_command, "convert \$\$i \$\$o") - -SEARCH_PROG([for an OpenOffice.org -> LaTeX converter],sxw_to_latex_command, "w2l -clean \$\$i") - -# oolatex is the original name, SuSE has oolatex.sh -SEARCH_PROG([for a LaTeX -> OpenOffice.org converter],latex_to_sxw_command, "oolatex \$\$i" "oolatex.sh \$\$i") - -# Search something to preview postscript -SEARCH_PROG([for a Postscript previewer],PS_VIEWER,gsview32 gv "ghostview -swap" kghostview) -EPS_VIEWER=$PS_VIEWER - -# Search for a program to preview pdf -SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview) - -# Search something to preview dvi -SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi) - -# Search something to preview html -SEARCH_PROG([for a HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape) - -# Search for a program to convert ps to pdf -SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i") - -# Search for a program to convert dvi to ps -SEARCH_PROG([for a DVI to PS converter],dvi_to_ps_command, "dvips -o \$\$o \$\$i") - -# Search for a program to convert dvi to pdf -SEARCH_PROG([for a DVI to PDF converter],dvi_to_pdf_command, "dvipdfm \$\$i") - -# We have a script to convert previewlyx to ppm or to png -lyxpreview_to_bitmap_command='python $$s/scripts/lyxpreview2bitmap.py' - -# Search for 'dvipng'. Only enable the conversion from lyxpreview -> png -# if dvipng is found. -SEARCH_PROG([for dvipng],DVIPNG,dvipng) - -test "$DVIPNG" = "dvipng" && \ - lyxpreview_to_png_command=$lyxpreview_to_bitmap_command - -# Search a *roff program (used to translate tables in ASCII export) -LYXRC_PROG([for a *roff formatter], \ascii_roff_command, dnl - "groff -t -Tlatin1 \$\$FName" nroff,dnl - test "$prog" = "nroff" && prog='tbl $$FName | nroff') - -# Search the ChkTeX program -LYXRC_PROG([for ChkTeX], \chktex_command,dnl - "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38") - -# Search for a spellchecker -LYXRC_PROG([for a spellchecker], \spell_command, ispell) - -# Search for computer algebra systems -SEARCH_PROG([for Octave],OCTAVE,octave) -SEARCH_PROG([for Maple],MAPLE,maple) - -dnl # Search a Fax handling program -dnl SEARCH_PROG([for a fax driver], FAX, sendfax faxsend fax) -dnl if test $FAX = sendfax ; then -dnl fax_command="sendfax -n -h '\$\$Host' -c '\$\$Comment' -x '\$\$Enterprise' -d '\$\$Name'@'\$\$Phone' '\$\$FName'" -dnl elif test $FAX = faxsend ; then -dnl fax_command="faxsend '\$\$Phone' '\$\$FName'" -dnl elif test $FAX = fax ; then -dnl fax_command="fax send '\$\$Phone' '\$\$FName'" -dnl else -dnl fax_command="none" -dnl fi - -# Search a GUI Fax program -SEARCH_PROG([for a fax program], fax_command, "kdeprintfax \$\$i" "ksendfax \$\$i") - -# Search for LinuxDoc support -SEARCH_PROG([for SGML-tools 1.x (LinuxDoc)], LINUXDOC, sgml2lyx) -if test $LINUXDOC != none; then - chk_linuxdoc=yes - bool_linuxdoc=true - linuxdoc_cmd="\\def\\haslinuxdoc{yes}" -else - chk_linuxdoc=no - bool_linuxdoc=false -fi - -case $LINUXDOC in - sgml2lyx) - linuxdoc_to_latex_command="sgml2latex \$\$i" - linuxdoc_to_dvi_command="sgml2latex -o dvi \$\$i" - linuxdoc_to_html_command="sgml2html \$\$i" - linuxdoc_to_lyx_command="sgml2lyx \$\$i";; - none) - linuxdoc_to_latex_command="none" - linuxdoc_to_dvi_command="none" - linuxdoc_to_html_command="none" - linuxdoc_to_lyx_command="none";; -esac - -# Search for DocBook support -SEARCH_PROG([for SGML-tools 2.x (DocBook) or db2x scripts], DOCBOOK, sgmltools db2dvi) -if test $DOCBOOK != none; then - chk_docbook=yes - bool_docbook=true - docbook_cmd="\\def\\hasdocbook{yes}" -else - chk_docbook=no - bool_docbook=false -fi - -case $DOCBOOK in - sgmltools) - docbook_to_dvi_command="sgmltools -b dvi \$\$i" - docbook_to_html_command="sgmltools -b html \$\$i";; - db2dvi) - docbook_to_dvi_command="db2dvi \$\$i" - docbook_to_html_command="db2html \$\$i";; - none) - docbook_to_dvi_command="none" - docbook_to_html_command="none";; -esac - -# Search for a spool command -LYXRC_PROG([for a spool command], \print_spool_command, lp lpr) -case $prog in - lp) print_spool_printerprefix="-d ";; - 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], latex_to_html_command,dnl - "htlatex \$\$i" dnl - "tth -t -e2 -L\$\$b < \$\$i > \$\$o" dnl - "latex2html -no_subdir -split 0 -show_section_numbers \$\$i" dnl - "hevea -s \$\$i") - -#### Explore the LaTeX configuration -MSG_CHECKING(LaTeX configuration) -# First, remove the files that we want to re-create -rm -f textclass.lst packages.lst chkconfig.sed -if test ${lyx_check_config} = no ; then - MSG_RESULT(default values) - MSG_CHECKING(list of textclasses,+) - cat >textclass.lst <> textclass.lst - fi - fi ;; - esac - done - MSG_RESULT(done) -else - MSG_RESULT(auto) - rm -f wrap_chkconfig.ltx chkconfig.vars chkconfig.classes chklayouts.tex - if test ! -r "chkconfig.ltx" ; then - cp "${srcdir}"/chkconfig.ltx . - rmcopy=true - fi - cat >wrap_chkconfig.ltx < chklayouts.tex - ${LATEX} wrap_chkconfig.ltx 2>/dev/null | grep '^\+' -changequote([,])dnl - [eval] `cat chkconfig.vars | sed 's/-/_/g'` -changequote(,)dnl - test -n "${rmcopy}" && rm -f chkconfig.ltx -fi - -# Do we have all the files we need? Useful if latex did not run -changequote([,])dnl - -PROVIDE_DEFAULT_FILE(chkconfig.sed,[s/@.*@/???/g]) - -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 -# your LaTeX2e program, the tests have not been run. Run ./configure -# if you need to update it after a configuration change. -]) -changequote(,)dnl - -echo "creating doc/LaTeXConfig.lyx" -echo "s/@chk_linuxdoc@/$chk_linuxdoc/g" >> chkconfig.sed -echo "s/@chk_docbook@/$chk_docbook/g" >> chkconfig.sed - -if test `uname -s | grep 'MINGW'` ; then - # Before running chkconfig.sed, remove the trailing '\r' - # characters that can bugger up various versions of sed. - tr -d '\r' < chkconfig.sed > chkconfig2.sed - mv -f chkconfig2.sed chkconfig.sed -fi - -sed -f chkconfig.sed "${srcdir}"/doc/LaTeXConfig.lyx.in >doc/LaTeXConfig.lyx - -### Let's check whether spaces are allowed in TeX file names -MSG_CHECKING(whether TeX allows spaces in file names) -if test ${lyx_check_config} = no ; then - tex_allows_spaces=false -else - fname="a b" - rm -f "$fname".tex - echo "\\message{working^^J}" >"$fname".tex - if ${LATEX} "$fname" /dev/null ; then - MSG_RESULT(yes) - tex_allows_spaces=true - else - MSG_RESULT(no) - tex_allows_spaces=false - fi - rm -f "$fname".* texput.log -fi - -echo "creating $outfile" -cat >$outfile < \$\$o" "" -\\converter docbook docbook-xml "cp \$\$i \$\$o" "xml" -\\converter docbook dvi "$docbook_to_dvi_command" "" -\\converter docbook html "$docbook_to_html_command" "" -\\converter dvi pdf3 "$dvi_to_pdf_command" "" -\\converter dvi ps "$dvi_to_ps_command" "" -\\converter fen asciichess "python \$\$s/scripts/fen2ascii.py \$\$i \$\$o" "" -\\converter fig pdftex "sh \$\$s/scripts/fig2pdftex.sh \$\$i \$\$o" "" -\\converter fig pstex "sh \$\$s/scripts/fig2pstex.sh \$\$i \$\$o" "" -\\converter html latex "$html_to_latex_command" "" -\\converter latex html "$latex_to_html_command" "originaldir,needaux" -\\converter latex dvi "$latex_to_dvi" "latex" -\\converter latex lyx "$tex_to_lyx_command" "" -\\converter latex pdf2 "$latex_to_pdf" "latex" -\\converter latex sxw "$latex_to_sxw_command" "latex" -\\converter latex wordhtml "$latex_to_word_command" "" -\\converter linuxdoc dvi "$linuxdoc_to_dvi_command" "" -\\converter linuxdoc html "$linuxdoc_to_html_command" "" -\\converter linuxdoc latex "$linuxdoc_to_latex_command" "" -\\converter linuxdoc lyx "$linuxdoc_to_lyx_command" "" -\\converter literate latex "$literate_to_tex_command" "" -\\converter literate lyx "$literate_to_lyx_command" "" -\\converter lyx lyx13x "python \$\$s/lyx2lyx/lyx2lyx -t 221 \$\$i > \$\$o" "" -\\converter lyxpreview png "$lyxpreview_to_png_command" "" -\\converter lyxpreview ppm "$lyxpreview_to_bitmap_command" "" -\\converter ps fax "$fax_command" "" -\\converter ps pdf "$ps_to_pdf_command" "" -\\converter sxw latex "$sxw_to_latex_command" "" -\\converter word latex "$word_to_latex_command" "" -EOF - -### the graphic converter part with the predefined ones -#### Search for the nonstandard converting progs -# -SEARCH_PROG([for a FIG -> EPS/PPM/PNG converter], FIG2DEV, fig2dev) -if test "$FIG2DEV" = "fig2dev"; then -cat >>$outfile < PS converter], TIFF2PS, tiff2ps) -if test "$TIFF2PS" = "tiff2ps"; then -cat >>$outfile < \$\$o" "" -EOF -fi - -SEARCH_PROG([for a Tgif -> EPS/PDF converter], TGIF, tgif) -if test "$TGIF" = "tgif"; then -cat >>$outfile < \$\$o" "" -\\converter tgif pdf "tgif -stdout -print -color -pdf \$\$i > \$\$o" "" -EOF -fi - -SEARCH_PROG([for an EPS -> PDF converter], EPSTOPDF, epstopdf) -if test "$EPSTOPDF" = "epstopdf"; then -cat >>$outfile < Image converter], GRACE, gracebat) -if test "$GRACE" = "gracebat"; then -cat >>$outfile </dev/null" "" -\\converter agr png "gracebat -hardcopy -printfile \$\$o -hdevice PNG \$\$i 2>/dev/null" "" -\\converter agr jpg "gracebat -hardcopy -printfile \$\$o -hdevice JPEG \$\$i 2>/dev/null" "" -\\converter agr ppm "gracebat -hardcopy -printfile \$\$o -hdevice PNM \$\$i 2>/dev/null" "" -EOF -fi - -cat >>$outfile <> $outfile -fi - -# 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 - # 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 ; - then - echo "removing $file, which is identical to the system global version" - rm -f $file.new - else - mv $file.new $file - fi -done - -# Final clean-up -if test $lyx_keep_temps = no ; then -rm -f chkconfig.sed chkconfig.vars wrap_chkconfig.* chklayouts.tex \ - missfont.log -fi diff --git a/src/ChangeLog b/src/ChangeLog index bed26ff8ef..6bb6a61409 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-03-12 Georg Baum + + * lyx_cb.C (Reconfigure): run lib/configure.py, not lib/configure + * lyx_main.C (reconfigureUserLyXDir): run ditto + 2006-03-12 Martin Vermeer * lyxtext.h: doxygen documentation fix diff --git a/src/lyx_cb.C b/src/lyx_cb.C index ff6eeb49ac..d69871edb7 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -447,8 +447,8 @@ void Reconfigure(BufferView * bv) // Run configure in user lyx directory Path p(package().user_support()); string const configure_script = - AddName(package().system_support(), "configure"); - string const configure_command = "sh " + QuoteName(configure_script); + AddName(package().system_support(), "configure.py"); + string const configure_command = "python " + QuoteName(configure_script); Systemcall one; one.startscript(Systemcall::Wait, configure_command); p.pop(); diff --git a/src/lyx_main.C b/src/lyx_main.C index 50fcd9e096..f19801213e 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -117,9 +117,9 @@ void showFileError(string const & error) void reconfigureUserLyXDir() { string const configure_script = - AddName(package().system_support(), "configure"); + AddName(package().system_support(), "configure.py"); string const configure_command = - "sh " + QuoteName(configure_script); + "python " + QuoteName(configure_script); lyxerr << _("LyX: reconfiguring user directory") << endl; Path p(package().user_support()); @@ -621,7 +621,7 @@ bool LyX::queryUserLyXDir(bool explicit_userdir) fs::is_directory(package().user_support())) { first_start = false; string const configure_script = - AddName(package().system_support(), "configure"); + AddName(package().system_support(), "configure.py"); string const userDefaults = AddName(package().user_support(), "lyxrc.defaults"); if (fs::exists(configure_script) &&