lib/configure is at last automatically generated by autogen.sh. Please check that it works for you.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@338 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 1999-11-26 14:31:33 +00:00
parent 252db967fb
commit 1d00ad9765
6 changed files with 89 additions and 10 deletions

View File

@ -1,3 +1,15 @@
1999-11-26 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* lib/configure, po/POTFILES.in: regenerated
* autogen.sh: autogenerate lib/configure from lib/configure.m4
* config/lib_configure.m4: removed
* lib/configure.m4: new file (was config/lib_configure.m4)
* configure.in: do not test for rtti, since we do not use it.
1999-11-26 Lars Gullik Bjønnes <larsbj@lyx.org> 1999-11-26 Lars Gullik Bjønnes <larsbj@lyx.org>
* src/support/lyxstring.C (lyxstring::Srep): Changed to use a * src/support/lyxstring.C (lyxstring::Srep): Changed to use a

View File

@ -39,6 +39,24 @@ else
exit exit
fi fi
# Autogenerate lib/configure.m4. We need GNU m4 for that and thus have
# to try several ones.
ok=no
for prog in $M4 gm4 gnum4 m4 ; do
case `$prog --help < /dev/null 2>&1 | grep traditional` in
*traditional*) echo "Building lib/configure"
rm -f lib/configure
$prog lib/configure.m4 >lib/configure
ok=yes
break ;;
*) ;;
esac
done
if test $ok = no ; then
echo "GNU m4 not found -- aborting"
exit
fi
echo "Creating POTFILES.in..." echo "Creating POTFILES.in..."
cat <<EOF > tmppot cat <<EOF > tmppot
# #

View File

@ -69,7 +69,8 @@ LYX_CXX_STL_STACK
LYX_CXX_STL_STRING LYX_CXX_STL_STRING
LYX_CXX_NAMESPACES LYX_CXX_NAMESPACES
LYX_CXX_CHEADERS LYX_CXX_CHEADERS
LYX_CXX_RTTI dnl we disable rtti for now
dnl LYX_CXX_RTTI
AC_CHECK_HEADERS(ostream istream) AC_CHECK_HEADERS(ostream istream)
LYX_CXX_STL_MODERN_STREAMS LYX_CXX_STL_MODERN_STREAMS
@ -195,15 +196,6 @@ LYX_FUNC_SELECT_ARGTYPES
# SunOS 4.1.3 does not have strerror and atexit # SunOS 4.1.3 does not have strerror and atexit
AC_REPLACE_FUNCS(strerror atexit) AC_REPLACE_FUNCS(strerror atexit)
dnl This check should be removed. If the compiler does not understand
dnl bool it is so broken that we should not support it. (Lgb)
dnl AC_CACHE_CHECK([for bool type],lyx_cv_have_bool,[
dnl AC_TRY_LINK(, [bool foo = true;], lyx_cv_have_bool=yes,lyx_cv_have_bool=no)])
dnl if test $lyx_cv_have_bool = 'yes' ; then
dnl AC_DEFINE(HAVE_bool,1,
dnl [Define if the bool type is known to your compiler])
dnl fi
### and now some special lyx flags. ### and now some special lyx flags.
AC_ARG_WITH(two-colors,[ --with-two-colors use two color pixmaps], AC_ARG_WITH(two-colors,[ --with-two-colors use two color pixmaps],
[AC_DEFINE(TWO_COLOR_ICONS) [AC_DEFINE(TWO_COLOR_ICONS)

53
lib/configure vendored
View File

@ -129,6 +129,59 @@ if test -z "$LATEX" ; then
lyx_check_config=no lyx_check_config=no
fi fi
if test x$lyx_check_config != x ; then
echo $ac_n "checking for the pdflatex program""... $ac_c"
echo "$ac_t"""
PDFLATEX=
for ac_prog in pdflatex
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
echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -x $ac_dir/$ac_word; then
PDFLATEX="$ac_prog"
break
fi
done
IFS="$ac_save_ifs"
if test -n "$PDFLATEX"; then
ac_result=yes
else
ac_result=no
fi
## Check whether this is really LaTeX2e
rm -f chklatex.ltx
cat >chklatex.ltx <<EOF
\\nonstopmode\\makeatletter
\\ifx\\undefined\\documentclass\\else
\\message{ThisIsLaTeX2e}
\\fi
\\@@end
EOF
if eval ${LATEX} chklatex.ltx </dev/null 2>/dev/null \
| grep 'ThisIsLaTeX2e' >/dev/null; then
:
else
LATEX=
ac_result="not useable"
fi
rm -f chklatex.ltx chklatex.log
echo "$ac_t""$ac_result"
test -n "$PDFLATEX" && break
fi
done
if test -z "$PDFLATEX" ; then
PDFLATEX=none
fi
fi
# Search for an installed reLyX or a ready-to-install one # Search for an installed reLyX or a ready-to-install one
save_PATH=${PATH} save_PATH=${PATH}

View File

@ -23,6 +23,7 @@ src/FontLoader.C
src/form1.C src/form1.C
src/gettext.h src/gettext.h
src/insets/figinset.C src/insets/figinset.C
src/insets/figinset.h
src/insets/form_url.C src/insets/form_url.C
src/insets/insetbib.C src/insets/insetbib.C
src/insets/inseterror.C src/insets/inseterror.C
@ -30,6 +31,7 @@ src/insets/inseterror.h
src/insets/insetinclude.C src/insets/insetinclude.C
src/insets/insetindex.C src/insets/insetindex.C
src/insets/insetinfo.C src/insets/insetinfo.C
src/insets/insetinfo.h
src/insets/insetloa.h src/insets/insetloa.h
src/insets/insetlof.h src/insets/insetlof.h
src/insets/insetlot.h src/insets/insetlot.h
@ -37,6 +39,7 @@ src/insets/insetparent.h
src/insets/insetref.C src/insets/insetref.C
src/insets/insettoc.h src/insets/insettoc.h
src/insets/inseturl.C src/insets/inseturl.C
src/insets/inseturl.h
src/insets/lyxinset.h src/insets/lyxinset.h
src/intl.C src/intl.C
src/kbmap.C src/kbmap.C
@ -64,6 +67,7 @@ src/LyXView.C
src/mathed/formula.C src/mathed/formula.C
src/mathed/formula.h src/mathed/formula.h
src/mathed/formulamacro.C src/mathed/formulamacro.C
src/mathed/formulamacro.h
src/mathed/math_forms.C src/mathed/math_forms.C
src/mathed/math_panel.C src/mathed/math_panel.C
src/menus.C src/menus.C