mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
handle 2.13 and 2.53
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4894 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes
parent
6ab18825ab
commit
2266b53c87
@ -1,3 +1,7 @@
|
||||
acconfig.m4
|
||||
autom4te-2.53.cache
|
||||
configure.ac
|
||||
configure.in
|
||||
config.cache
|
||||
config.log
|
||||
config.status
|
||||
|
||||
21
ChangeLog
21
ChangeLog
@ -1,4 +1,17 @@
|
||||
2002-08-08 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||
|
||||
* autogen.sh (autoversion): add handling of different autoconf
|
||||
versions.
|
||||
|
||||
* .cvsignore: add acconfig.m4, autom4te-2.53.cache, configure.in
|
||||
and configure.ac
|
||||
|
||||
* acconfig.m4: move from here...
|
||||
* config/acconfig.m4 ...to here
|
||||
|
||||
* configure.in: more from here...
|
||||
* config/configure.in: ...to here
|
||||
|
||||
2002-07-30 André Poenitz <poenitz@gmx.de>
|
||||
|
||||
* INSTALL: fix location of GNU gettext package
|
||||
@ -21,18 +34,18 @@
|
||||
of HAVE_LIBSM and XPM_H_LOCATION
|
||||
|
||||
* INSTALL: remove documentation for --with-broken-headers and
|
||||
--with-liberty
|
||||
--with-liberty
|
||||
|
||||
* configure.in: do not invoke LYX_SCO, LYX_HPUX, LYX_SUNOS4,
|
||||
AC_STRUCT_ST_BLKSIZE, AC_STRUCT_ST_BLOCKS, AC_STRUCT_ST_RDEV;
|
||||
remove --with-broken-headers option; do not test for strerror and
|
||||
atexit
|
||||
atexit
|
||||
(VERSION_INFO): add EOF at the end
|
||||
|
||||
2002-07-14 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* configure.in: remove xforms from qt
|
||||
|
||||
|
||||
2002-07-04 Kayvan A. Sylvan <kayvan@sylvan.com>
|
||||
|
||||
* configure.in (LYX_USE_FRONTEND): The order of libraries is
|
||||
@ -75,7 +88,7 @@
|
||||
* INSTALL:
|
||||
* configure.in: remove attempt to link against libiberty. It
|
||||
is morally wrong, and potentially dangerous.
|
||||
|
||||
|
||||
2002-06-07 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
|
||||
|
||||
* configure.in: move the test for xpm/xforms out of the frontends
|
||||
|
||||
28
autogen.sh
28
autogen.sh
@ -1,9 +1,33 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Discover what version of autoconf we are using.
|
||||
autoversion=`autoconf --version | head -n 1`
|
||||
|
||||
case $autoversion in
|
||||
*2.13)
|
||||
echo "2.13"
|
||||
cp config/acconfig.h .
|
||||
cp config/configure.in .
|
||||
cp config/relyx_configure.in lib/reLyX/configure.in
|
||||
;;
|
||||
*2.53)
|
||||
echo "2.53"
|
||||
cp config/configure.ac .
|
||||
cp config/relyx_configure.ac lib/reLyX/configure.ac
|
||||
;;
|
||||
*)
|
||||
echo "You are running a version of autoconf that"
|
||||
echo "we do not support."
|
||||
echo "LyX only supports autoconf 2.13 and 2.53."
|
||||
exit
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
ACLOCAL=aclocal
|
||||
AUTOHEADER=autoheader
|
||||
AUTOHEADER="autoheader -W none -W obsolete"
|
||||
AUTOMAKE="automake -a -c --foreign"
|
||||
AUTOCONF=autoconf
|
||||
AUTOCONF="autoconf -W none -W obsolete"
|
||||
GNUM4=
|
||||
|
||||
ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 xforms.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4 pkg.m4"
|
||||
|
||||
329
config/configure.ac
Normal file
329
config/configure.ac
Normal file
@ -0,0 +1,329 @@
|
||||
dnl Process with autoconf to generate configure script -*- sh -*-
|
||||
|
||||
AC_INIT(lyx,1.3.0cvs,lyx-devel@lists.lyx.org)
|
||||
AC_PREREQ(2.53)
|
||||
AC_CONFIG_SRCDIR(src/main.C)
|
||||
AM_CONFIG_HEADER([src/config.h])
|
||||
|
||||
AC_CONFIG_AUX_DIR(config)
|
||||
|
||||
PACKAGE=lyx${program_suffix}
|
||||
VERSION="1.3.0cvs"
|
||||
LYX_CHECK_VERSION
|
||||
|
||||
AC_CANONICAL_TARGET
|
||||
# AC_VALIDATE_CACHE_SYSTEM_TYPE
|
||||
|
||||
LYX_VERSION_SUFFIX
|
||||
|
||||
AM_INIT_AUTOMAKE($lyxname, $VERSION)
|
||||
|
||||
# The list of languages known to LyX
|
||||
# This is needed by GNU gettext
|
||||
ALL_LINGUAS="bg ca cs da de es eu fi fr he hu it nl no pl pt ro ru sk sl sv tr wa"
|
||||
|
||||
# fix the value of the prefixes.
|
||||
test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
||||
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
|
||||
|
||||
### Set the execute permissions of the various scripts correctly
|
||||
for file in config/install-sh config/mkinstalldirs lib/configure ; do
|
||||
chmod 755 ${srcdir}/${file}
|
||||
done
|
||||
|
||||
### Check for programs
|
||||
AC_PROG_MAKE_SET
|
||||
AC_PROG_INSTALL
|
||||
#AC_PROG_RANLIB
|
||||
AC_CHECK_PROG(KPSEWHICH, kpsewhich, kpsewhich, :)
|
||||
if test "x$KPSEWHICH" = xkpsewhich ; then
|
||||
AC_DEFINE(HAVE_KPSEWHICH, 1,
|
||||
[Define this if you have the kpsewhich program working on your system.])
|
||||
fi
|
||||
AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4)
|
||||
|
||||
# Work around a problem in automake 1.4: when invoking install-strip,
|
||||
# INSTALL_PROGRAM is changed to 'install -s', and since
|
||||
# INSTALL_SCRIPT==INSTALL_PROGRAM, we get errors with fileutils-4.0
|
||||
# which returns an error condition when stripping fails.
|
||||
INSTALL_SCRIPT='${INSTALL}'
|
||||
|
||||
### we will also need a C compiler to compile GNU gettext
|
||||
AC_PROG_CC
|
||||
|
||||
### check for special systems
|
||||
AC_ISC_POSIX
|
||||
AC_AIX
|
||||
|
||||
### Check for program extensions (.exe or nothing)
|
||||
# AC_EXEEXT
|
||||
|
||||
### check which frontend we want to use
|
||||
LYX_USE_FRONTEND
|
||||
|
||||
#old gnome stuff removed by Michael Koziarski 25-05-2002
|
||||
|
||||
### Check for a C++ compiler
|
||||
LYX_PROG_CXX
|
||||
### Some checks on what the C++ compiler can(not) do
|
||||
AC_LANG_CPLUSPLUS
|
||||
dnl we do not need that currently (and probably all our supported
|
||||
dnl compiler allow that)
|
||||
dnl LYX_CXX_PARTIAL
|
||||
LYX_CXX_EXPLICIT
|
||||
LYX_CXX_STL_STRING
|
||||
LYX_CXX_GOOD_STD_STRING
|
||||
LYX_CXX_CHEADERS
|
||||
LYX_CXX_GLOBAL_CSTD
|
||||
LYX_STD_COUNT
|
||||
dnl we disable rtti for now
|
||||
dnl LYX_CXX_RTTI
|
||||
AC_CHECK_HEADERS(ostream istream sstream locale limits)
|
||||
LYX_CXX_STL_MODERN_STREAMS
|
||||
|
||||
### and now some special lyx flags.
|
||||
AC_ARG_ENABLE(assertions,
|
||||
[ --enable-assertions add runtime sanity checks in the program],,
|
||||
[if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
|
||||
enable_assertions=yes;
|
||||
else
|
||||
enable_assertions=no;
|
||||
fi;])
|
||||
if test "x$enable_assertions" = xyes ; then
|
||||
lyx_flags="$lyx_flags assertions"
|
||||
AC_DEFINE(ENABLE_ASSERTIONS,1,
|
||||
[Define if you want assertions to be enabled in the code])
|
||||
fi
|
||||
|
||||
### Library Files
|
||||
dnl by testing these we check if it is ok to have
|
||||
dnl -lc and -lm as args to the compiler
|
||||
AC_CHECK_LIB(m, sin)
|
||||
AC_CHECK_LIB(c, fopen)
|
||||
|
||||
### Add extra directories to check for libraries.
|
||||
LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE)
|
||||
LYX_LOOP_DIR($lyx_cv_extra_lib,LYX_ADD_LIB_DIR(lyx_ldflags,$dir))
|
||||
test ! x"$lyx_ldflags" = x && LDFLAGS="$lyx_ldflags $LDFLAGS"
|
||||
|
||||
### Add extra directories to check for include files.
|
||||
LYX_WITH_DIR([extra-inc],[extra include directory],extra_inc, NONE)
|
||||
LYX_LOOP_DIR($lyx_cv_extra_inc,LYX_ADD_INC_DIR(lyx_cppflags,$dir))
|
||||
test ! x"$lyx_cppflags" = x && CPPFLAGS="$lyx_cppflags $CPPFLAGS"
|
||||
|
||||
### Add both includes and libraries
|
||||
LYX_WITH_DIR([extra-prefix],[extra lib+include directory],extra_prefix, NONE, ${prefix})
|
||||
LYX_LOOP_DIR($lyx_cv_extra_prefix,[
|
||||
LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
|
||||
LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
|
||||
|
||||
AC_ARG_WITH(aiksaurus,
|
||||
[ --without-aiksaurus do not use the Aiksaurus library],
|
||||
[lyx_use_aiksaurus=$withval])
|
||||
if test x$lyx_use_aiksaurus != xno; then
|
||||
AC_CHECK_LIB(Aiksaurus, main,
|
||||
[AC_DEFINE(HAVE_LIBAIKSAURUS,1,[Define this if you have the AikSaurus library])
|
||||
AIKSAURUS_LIBS="-lAiksaurus -lbz2"
|
||||
],,"-lbz2")
|
||||
fi
|
||||
AC_SUBST(AIKSAURUS_LIBS)
|
||||
|
||||
### Setup libtool
|
||||
AC_DISABLE_SHARED
|
||||
AC_LIBTOOL_WIN32_DLL
|
||||
#AM_PROG_LIBTOOL
|
||||
LYX_PROG_LIBTOOL
|
||||
|
||||
### Check if we want pspell libraries
|
||||
CHECK_WITH_PSPELL
|
||||
|
||||
### Check for X libraries
|
||||
# The real thing.
|
||||
AC_PATH_XTRA
|
||||
LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
|
||||
# Since solaris X headers use int as implicit return type and modern
|
||||
# gcc's do not like that, let's use -isystem instead of -I.
|
||||
# We should test for gcc version and see whether it supports -isystem,
|
||||
# but since at least gcc 2.6.x supports it and it is still too old for
|
||||
# us, it seems we are safe.
|
||||
if test -n "$GXX" ; then
|
||||
X_CFLAGS=`echo ${X_CFLAGS} | sed -e 's/-I/-isystem /'`
|
||||
fi
|
||||
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||
|
||||
## Check whether X is new enough to handle the input method stuff
|
||||
AC_CHECK_FUNCS(XOpenIM)
|
||||
|
||||
### check which frontend we want to use
|
||||
# We have to check for xforms anyway
|
||||
LYX_PATH_XPM
|
||||
LYX_PATH_XFORMS
|
||||
|
||||
#LYX_USE_FRONTEND
|
||||
dnl The code below is not in a macro, because this would cause big
|
||||
dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL.
|
||||
case "$lyx_use_frontend" in
|
||||
xforms)
|
||||
# for now don't set it for xforms as this is always entered
|
||||
FRONTEND="xforms"
|
||||
FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
|
||||
FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
|
||||
case "$host" in
|
||||
*cygwin)
|
||||
FRONTEND_LIBS="@XFORMS_LIB@ @XFORMS_IMAGE_LIB@ @XPM_LIB@"
|
||||
;;
|
||||
*)
|
||||
FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
|
||||
;;
|
||||
esac
|
||||
FRONTEND_INFO=" libXpm version: ${XPM_VERSION}\n\
|
||||
libforms version: ${XFORMS_VERSION}\n"
|
||||
;;
|
||||
gnome)
|
||||
PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
|
||||
AC_SUBST(GNOME_FRONTEND_CFLAGS)
|
||||
AC_SUBST(GNOME_FRONTEND_LIBS)
|
||||
|
||||
FRONTEND="xforms gnome"
|
||||
FRONTEND_GUILIB="gnome/*.lo"
|
||||
FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
|
||||
FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} "
|
||||
FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";;
|
||||
qt2)
|
||||
QT2_DO_IT_ALL
|
||||
FRONTEND="qt2"
|
||||
FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
|
||||
FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
|
||||
FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
|
||||
FRONTEND_LIBS="\$(QT2_LIBS)";;
|
||||
*)
|
||||
LYX_ERROR(Unknown frontend $lyx_use_frontend);;
|
||||
esac
|
||||
|
||||
### Check for xforms and xpm (only if X has been found).
|
||||
if test "$have_x" = no ; then
|
||||
LYX_ERROR(dnl
|
||||
[Cannot find X window libraries and/or headers. Check your installation.
|
||||
If you use a Linux system, check that you have installed
|
||||
the development tools.])
|
||||
fi
|
||||
|
||||
### Check whether the xforms library has a viable image loader
|
||||
### For now, run this test always so config.h is unchanged by a change in
|
||||
### frontend
|
||||
LYX_USE_XFORMS_IMAGE_LOADER
|
||||
|
||||
### Setup GNU gettext
|
||||
dnl GNU gettext is written in C
|
||||
AC_LANG_C
|
||||
# Some tests that may be useful for gettext
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
# Do the real setup now
|
||||
AM_GNU_GETTEXT
|
||||
# a hack for those who try to change LyX, but do not have gettext installed
|
||||
case "${XGETTEXT}" in
|
||||
*:) XGETTEXT='cp ${srcdir}/lyx.pot ./${PACKAGE}.po ; :'
|
||||
esac
|
||||
|
||||
AC_SUBST(LINGUAS)
|
||||
|
||||
AC_LANG_CPLUSPLUS
|
||||
|
||||
# some standard header files
|
||||
AC_HEADER_DIRENT
|
||||
AC_HEADER_MAJOR
|
||||
AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h)
|
||||
|
||||
# some standard structures
|
||||
AC_HEADER_STAT
|
||||
AC_HEADER_TIME
|
||||
|
||||
# some standard types
|
||||
AC_TYPE_MODE_T
|
||||
AC_TYPE_OFF_T
|
||||
AC_TYPE_PID_T
|
||||
AC_TYPE_SIGNAL
|
||||
AC_TYPE_SIZE_T
|
||||
AC_TYPE_UID_T
|
||||
|
||||
AC_CHECK_FUNCS(snprintf vsnprintf)
|
||||
LYX_CHECK_DECL(snprintf, stdio.h)
|
||||
LYX_CHECK_DECL(vsnprintf, stdio.h)
|
||||
LYX_CHECK_DECL(istreambuf_iterator, iterator)
|
||||
|
||||
dnl This is a slight hack: the tests generated by autoconf 2.52 do not
|
||||
dnl work correctly because of some conflict with stdlib.h with g++ 2.96
|
||||
dnl We aim to remove this eventually, since we should test as much as
|
||||
dnl possible with the compiler which will use the functions (JMarc)
|
||||
AC_LANG_C
|
||||
AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo mkstemp mktemp)
|
||||
AC_LANG_CPLUSPLUS
|
||||
|
||||
dnl Until this is fixed in autoconf we provide our own version
|
||||
LYX_FUNC_SELECT_ARGTYPES
|
||||
|
||||
dnl check whether we have to work around solaris broken putenv()
|
||||
LYX_FUNC_PUTENV_ARGTYPE
|
||||
|
||||
|
||||
LYX_CHECK_DECL_HDRS(mkstemp,[unistd.h stdlib.h])
|
||||
|
||||
### Some information on what just happened
|
||||
real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
|
||||
real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
|
||||
VERSION_INFO="Configuration\n\
|
||||
Host type: ${host}\n\
|
||||
Special build flags: ${lyx_flags}\n\
|
||||
C Compiler: ${CC}\n\
|
||||
C Compiler flags: ${CFLAGS}\n\
|
||||
C++ Compiler: ${CXX} ${CXX_VERSION}\n\
|
||||
C++ Compiler flags: ${CXXFLAGS}\n\
|
||||
Linker flags: ${LDFLAGS}\n\
|
||||
Frontend: ${lyx_use_frontend}\n\
|
||||
${FRONTEND_INFO}\
|
||||
LyX binary dir: ${real_bindir}\n\
|
||||
LyX files dir: ${real_datadir}\n"
|
||||
|
||||
|
||||
AC_SUBST(VERSION_INFO)
|
||||
|
||||
### Finish the work.
|
||||
AC_CONFIG_SUBDIRS(lib lib/reLyX)
|
||||
AC_CONFIG_FILES([Makefile \
|
||||
boost/Makefile \
|
||||
boost/libs/Makefile \
|
||||
boost/libs/regex/Makefile \
|
||||
boost/libs/regex/src/Makefile \
|
||||
boost/libs/signals/Makefile \
|
||||
boost/libs/signals/src/Makefile \
|
||||
config/Makefile \
|
||||
development/lyx.spec \
|
||||
lib/Makefile \
|
||||
intl/Makefile \
|
||||
po/Makefile.in \
|
||||
sourcedoc/Doxyfile \
|
||||
src/Makefile \
|
||||
src/version.C \
|
||||
src/mathed/Makefile \
|
||||
src/graphics/Makefile \
|
||||
src/insets/Makefile \
|
||||
src/support/Makefile \
|
||||
src/frontends/Makefile \
|
||||
src/frontends/controllers/Makefile \
|
||||
src/frontends/xforms/Makefile \
|
||||
src/frontends/xforms/forms/Makefile \
|
||||
src/frontends/qt2/Makefile \
|
||||
src/frontends/qt2/moc/Makefile \
|
||||
src/frontends/qt2/ui/Makefile \
|
||||
src/frontends/qt2/ui/moc/Makefile \
|
||||
src/frontends/gnome/Makefile \
|
||||
])
|
||||
AC_OUTPUT
|
||||
# show version information
|
||||
echo
|
||||
printf "$VERSION_INFO"
|
||||
echo
|
||||
|
||||
# Display a final warning if there has been a LYX_ERROR
|
||||
LYX_CHECK_ERRORS
|
||||
592
config/gnome.m4
592
config/gnome.m4
File diff suppressed because it is too large
Load Diff
@ -646,7 +646,7 @@ lyx_path_header_path=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
|
||||
sed -e 's/.*\(".*$1"\).*/\1/' -e "1q"`
|
||||
eval "lyx_cv_path2_${ac_safe}=\$lyx_path_header_path"
|
||||
rm -f conftest*])
|
||||
AC_DEFINE_UNQUOTED($ac_tr_safe, $lyx_path_header_path)])
|
||||
AC_DEFINE_UNQUOTED($ac_tr_safe, $lyx_path_header_path, [dummy])])
|
||||
])
|
||||
### end of LYX_PATH_HEADER
|
||||
|
||||
@ -745,7 +745,7 @@ tr_hdr=`echo $2 | tr . _`
|
||||
AC_CACHE_VAL([lyx_cv_declare_${tr_hdr}_$1],
|
||||
[AC_EGREP_HEADER($1, $2, [eval "lyx_cv_declare_${tr_hdr}_$1=yes"], [eval "lyx_cv_declare_${tr_hdr}_$1=no"])])
|
||||
if eval "test \"\${lyx_cv_declare_${tr_hdr}_$1}\" = \"yes\""; then
|
||||
AC_DEFINE_UNQUOTED(HAVE_DECL_${tr_func})
|
||||
AC_DEFINE_UNQUOTED(HAVE_DECL_${tr_func},1,[dummy])
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
|
||||
43
config/relyx_configure.ac
Normal file
43
config/relyx_configure.ac
Normal file
@ -0,0 +1,43 @@
|
||||
dnl Process with autoconf to generate configure script -*- sh -*-
|
||||
AC_INIT(reLyX.in)
|
||||
AC_PREREQ(2.53)
|
||||
AC_CONFIG_AUX_DIR(../../config)
|
||||
|
||||
dnl PACKAGE=reLyX
|
||||
dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
|
||||
|
||||
AC_ARG_WITH(version-suffix,
|
||||
[ --with-version-suffix[=<version>] install lyx files as lyx<version>],
|
||||
[lyxname="lyx$withval"
|
||||
program_suffix=$withval],
|
||||
[lyxname=lyx])
|
||||
|
||||
dnl must make a macro that gets the reLyX version
|
||||
VERSION=2.0
|
||||
AM_INIT_AUTOMAKE($lyxname, $VERSION)
|
||||
|
||||
# if reLyX has already been generated in this directory, delete it first
|
||||
test -x reLyX && rm -f reLyX
|
||||
# fix the value of the prefixes.
|
||||
test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
||||
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
|
||||
|
||||
# we need to expand ${datadir} to put it into the reLyX wrapper.
|
||||
LYX_DIR=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
|
||||
AC_SUBST(LYX_DIR)
|
||||
|
||||
# Work around a problem in automake 1.4: when invoking install-strip,
|
||||
# INSTALL_PROGRAM is changed to 'install -s', and since
|
||||
# INSTALL_SCRIPT==INSTALL_PROGRAM, we get errors with fileutils-4.0
|
||||
# which returns an error condition when stripping fails.
|
||||
INSTALL_SCRIPT='${INSTALL}'
|
||||
|
||||
dnl Checks for programs.
|
||||
AC_PROG_INSTALL
|
||||
RELYX_CHECK_PERL
|
||||
|
||||
dnl Finish the work
|
||||
AC_CONFIG_FILES(Makefile reLyX noweb2lyx, chmod 755 reLyX noweb2lyx)
|
||||
AC_OUTPUT
|
||||
|
||||
RELYX_CHECK_ERRORS
|
||||
@ -1,3 +1,6 @@
|
||||
autom4te-2.53.cache
|
||||
configure.in
|
||||
configure.ac
|
||||
reLyX
|
||||
noweb2lyx
|
||||
Makefile.in
|
||||
|
||||
@ -50,7 +50,6 @@ src/frontends/qt2/QGraphics.C
|
||||
src/frontends/qt2/QInclude.C
|
||||
src/frontends/qt2/QIndex.C
|
||||
src/frontends/qt2/QLog.C
|
||||
src/frontends/qt2/QLyXKeySym.C
|
||||
src/frontends/qt2/QMinipage.C
|
||||
src/frontends/qt2/QParagraph.C
|
||||
src/frontends/qt2/QPreamble.C
|
||||
|
||||
@ -12,9 +12,11 @@
|
||||
#ifndef LSTRING_H
|
||||
#define LSTRING_H
|
||||
|
||||
#if 0
|
||||
#ifndef _CONFIG_H
|
||||
#error The <config.h> header should always be included before LString.h
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef USE_INCLUDED_STRING
|
||||
#include <string>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user