mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-27 19:59:46 +00:00
install fixes, small cleanups
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1651 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes
parent
af1c3bc1b0
commit
6c2fde690b
11
ChangeLog
11
ChangeLog
@ -1,3 +1,14 @@
|
||||
2001-02-23 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* configure.in:
|
||||
* config/lyxinclude.m4:
|
||||
* INSTALL: --with-lyx-version
|
||||
|
||||
* config/kde.m4: remove cruft that was breaking
|
||||
installs
|
||||
|
||||
* Makefile.am: fix uninstall
|
||||
|
||||
2001-02-20 Edwin Leuven <leuven@fee.uva.nl>
|
||||
|
||||
* move latex preamble to guii xforms dir, see:
|
||||
|
||||
15
INSTALL
15
INSTALL
@ -122,13 +122,14 @@ flags:
|
||||
--with-extra-lib=DIRECTORY/lib --with-extra-inc=DIRECTORY/include
|
||||
If DIRECTORY is not specified, the current prefix is used.
|
||||
|
||||
o --with-lyx-suffix=STRING adds the given suffix to the names of the
|
||||
LyX binary and scripts, and the library directory. For example,
|
||||
"--with-lyx-suffix=1.1.6" would install a binary "lyx-1.1.6", and
|
||||
create a directory "/usr/share/lyx-1.1.6", install "reLyX-1.1.6" etc.
|
||||
Additionally, LyX will look for the user configuration file in e.g.
|
||||
"$HOME/.lyx-1.1.6". This feature is useful for installing more than
|
||||
one version of LyX on the same machine.
|
||||
o --with-lyx-version will install LyX as lyx-<version>, e.g. lyx-1.1.6
|
||||
The LyX data directory will be something like <whatever>/lyx-1.1.6/.
|
||||
Additionally your user configuration files will be found in e.g.
|
||||
$HOME/.lyx-1.1.6
|
||||
|
||||
You can use this feature to install more than one version of LyX on
|
||||
the same system. You can optionally specify a "version" of your own,
|
||||
by doing something like : ./configure --with-lyx-version=latestcvs
|
||||
|
||||
There are also flags to control the internationalization support in
|
||||
LyX:
|
||||
|
||||
554
config/kde.m4
554
config/kde.m4
@ -94,6 +94,7 @@ AC_DEFUN(KDE_FIND_PATH,
|
||||
$2=$kde_cv_path_$1
|
||||
fi
|
||||
])
|
||||
|
||||
AC_DEFUN(KDE_MOC_ERROR_MESSAGE,
|
||||
[
|
||||
AC_MSG_ERROR([No Qt meta object compiler (moc) found!
|
||||
@ -312,8 +313,6 @@ fi
|
||||
|
||||
fi
|
||||
|
||||
bindir=$kde_bindir
|
||||
|
||||
])
|
||||
|
||||
AC_DEFUN(AC_SUBST_KFSSTND,
|
||||
@ -857,29 +856,8 @@ AC_DEFUN(KDE_CREATE_LIBS_ALIASES,
|
||||
AC_DEFUN(AC_PATH_KDE,
|
||||
[
|
||||
AC_BASE_PATH_KDE
|
||||
AC_ARG_ENABLE(path-check, [ --disable-path-check don't try to find out, where to install],
|
||||
[
|
||||
if test "$enableval" = "no";
|
||||
then ac_use_path_checking="default"
|
||||
else ac_use_path_checking=""
|
||||
fi
|
||||
], [ac_use_path_checking=""]
|
||||
)
|
||||
|
||||
AC_ARG_WITH(install-root, [ --with-install-root the root, where to install to [default=/]],
|
||||
[
|
||||
if test "$withval" = "no";
|
||||
then kde_install_root="";
|
||||
else kde_install_root=$withval;
|
||||
fi
|
||||
], [kde_install_root=""]
|
||||
)
|
||||
|
||||
if test -n "$kde_install_root"; then
|
||||
install_root="$kde_install_root"
|
||||
else
|
||||
ac_use_path_checking=""
|
||||
install_root=
|
||||
fi
|
||||
|
||||
AC_CREATE_KFSSTND($ac_use_path_checking)
|
||||
|
||||
@ -1229,7 +1207,6 @@ CFLAGS="$ac_save_cflags"
|
||||
|
||||
AC_DEFUN(KDE_DO_IT_ALL,
|
||||
[
|
||||
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
|
||||
KDE_PROG_LIBTOOL
|
||||
AC_PATH_KDE
|
||||
AC_PATH_PROG(QTARCH, "qtarch",qtarch-notinstalled)
|
||||
@ -1486,149 +1463,6 @@ AC_DEFUN(AC_HAVE_GL,
|
||||
dnl PAM pam
|
||||
|
||||
dnl Should test for PAM (Pluggable Authentication Modules)
|
||||
AC_DEFUN(AC_PATH_PAM_DIRECT,
|
||||
[
|
||||
test -z "$pam_direct_test_library" && pam_direct_test_library=pam
|
||||
test -z "$pam_direct_test_include" && pam_direct_test_include=security/pam_appl.h
|
||||
|
||||
for ac_dir in \
|
||||
\
|
||||
/usr/local/include \
|
||||
/usr/include \
|
||||
/usr/unsupported/include \
|
||||
/opt/include \
|
||||
/usr/pam/include \
|
||||
/usr/local/pam/include \
|
||||
/usr/lib/pam/include \
|
||||
\
|
||||
$extra_include \
|
||||
; \
|
||||
do
|
||||
if test -r "$ac_dir/$pam_direct_test_include"; then
|
||||
no_pam= ac_pam_includes=$ac_dir
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
# First see if replacing the include by lib works.
|
||||
for ac_dir in `echo "$ac_pam_includes" | sed s/include/lib/` \
|
||||
\
|
||||
/lib \
|
||||
/usr/lib \
|
||||
/usr/local/lib \
|
||||
/usr/unsupported/lib \
|
||||
/lib/security \
|
||||
/usr/security/lib \
|
||||
$extra_lib \
|
||||
; \
|
||||
do
|
||||
for ac_extension in a so sl; do
|
||||
if test -r $ac_dir/lib${pam_direct_test_library}.$ac_extension; then
|
||||
no_pam= ac_pam_libraries=$ac_dir
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
])
|
||||
|
||||
AC_DEFUN(AC_PATH_PAM,
|
||||
[AC_REQUIRE_CPP()dnl
|
||||
|
||||
AC_CHECK_LIB(pam_misc, main, [PAM_MISC_LIB="-lpam_misc"], [], [-lpam -ldl])
|
||||
|
||||
AC_MSG_CHECKING(for PAM)
|
||||
AC_ARG_WITH(pam,
|
||||
[ --with-pam[=ARG] enable support for PAM: ARG=[yes|no|service name]],
|
||||
[
|
||||
if test "x$withval" = "xyes"; then
|
||||
no_pam=
|
||||
default_pam=yes
|
||||
elif test "x$withval" = "xno"; then
|
||||
no_pam=yes
|
||||
else
|
||||
no_pam=
|
||||
pam_service="$withval"
|
||||
if test -z "$pam_service"; then
|
||||
default_pam=yes
|
||||
else
|
||||
default_pam=
|
||||
fi
|
||||
fi
|
||||
], no_pam=yes
|
||||
)
|
||||
|
||||
if test ! "$no_pam" = yes; then
|
||||
|
||||
AC_CACHE_VAL(ac_cv_path_pam,
|
||||
[
|
||||
ac_pam_includes=NONE
|
||||
ac_pam_libraries=NONE
|
||||
if test -z "$pam_libraries"; then
|
||||
pam_libraries=NONE
|
||||
fi
|
||||
if test -z "$pam_includes"; then
|
||||
pam_includes=NONE
|
||||
fi
|
||||
|
||||
AC_PATH_PAM_DIRECT
|
||||
|
||||
test "x$pam_includes" = xNONE && pam_includes=$ac_pam_includes
|
||||
test "x$pam_libraries" = xNONE && pam_libraries=$ac_pam_libraries
|
||||
|
||||
if test ! "x$pam_includes" = xNONE && test ! "x$pam_libraries" = xNONE; then
|
||||
ac_pam_libs="-lpam $PAM_MISC_LIB -ldl"
|
||||
ac_cv_path_pam="no_pam= ac_pam_includes=$ac_pam_includes ac_pam_libraries=$ac_pam_libraries ac_pam_libs=\"$ac_pam_libs\""
|
||||
else
|
||||
ac_cv_path_pam="no_pam=yes"
|
||||
fi
|
||||
])
|
||||
|
||||
eval "$ac_cv_path_pam"
|
||||
|
||||
fi
|
||||
|
||||
if test "$no_pam" = yes; then
|
||||
AC_MSG_RESULT(no)
|
||||
else
|
||||
AC_DEFINE(HAVE_PAM)
|
||||
PAMLIBS="$ac_pam_libs"
|
||||
test "x$pam_includes" = xNONE && pam_includes=$ac_pam_includes
|
||||
test "x$pam_libraries" = xNONE && pam_libraries=$ac_pam_libraries
|
||||
AC_MSG_RESULT([libraries $pam_libraries, headers $pam_includes])
|
||||
if test "$default_pam" = yes; then
|
||||
AC_MSG_RESULT(["default pam service name will be used"])
|
||||
else
|
||||
AC_DEFINE_UNQUOTED(KDE_PAM_SERVICE,"$pam_service")
|
||||
AC_MSG_RESULT(["pam service name will be: " $pam_service])
|
||||
fi
|
||||
dnl test whether struct pam_message is const (Linux) or not (Sun)
|
||||
pam_appl_h="$ac_pam_includes/security/pam_appl.h"
|
||||
AC_MSG_CHECKING(for const pam_message)
|
||||
AC_EGREP_HEADER([struct pam_message],
|
||||
$pam_appl_h,
|
||||
[ AC_EGREP_HEADER([const struct pam_message],
|
||||
$pam_appl_h,
|
||||
[AC_MSG_RESULT(["const: Linux-type PAM"]) ],
|
||||
[AC_MSG_RESULT(["nonconst: Sun-type PAM"])
|
||||
AC_DEFINE(PAM_MESSAGE_NONCONST)]
|
||||
)],
|
||||
[AC_MSG_RESULT(["not found - assume const, Linux-type PAM"])]
|
||||
)
|
||||
fi
|
||||
|
||||
if test "x$pam_libraries" != x && test "x$pam_libraries" != xNONE ; then
|
||||
PAMLIBPATHS="-L$pam_libraries"
|
||||
fi
|
||||
if test "x$pam_includes" != x && test "x$pam_includes" != xNONE ; then
|
||||
PAMINC="-I$pam_includes"
|
||||
fi
|
||||
|
||||
AC_SUBST(PAMINC)
|
||||
AC_SUBST(PAMLIBS)
|
||||
AC_SUBST(PAMLIBPATHS)
|
||||
|
||||
])
|
||||
|
||||
AC_DEFUN(KDE_CHECK_LIBDL,
|
||||
[
|
||||
AC_CHECK_LIB(dl, dlopen, [
|
||||
@ -1740,117 +1574,6 @@ if test "$kde_cv_libgpp_includes" != "no"; then
|
||||
all_includes="-I$kde_cv_libgpp_includes $all_includes"
|
||||
fi
|
||||
])
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN(KDE_CHECK_MICO,
|
||||
[
|
||||
AC_REQUIRE([KDE_CHECK_LIBDL])
|
||||
AC_MSG_CHECKING(for MICO)
|
||||
AC_ARG_WITH(micodir,
|
||||
[ --with-micodir=micodir where mico is installed ],
|
||||
kde_micodir=$withval,
|
||||
kde_micodir=/usr/local
|
||||
)
|
||||
AC_MSG_RESULT($kde_micodir)
|
||||
if test ! -r $kde_micodir/include/CORBA.h; then
|
||||
AC_MSG_ERROR([No CORBA.h found, specify another micodir])
|
||||
fi
|
||||
|
||||
MICO_INCLUDES=-I$kde_micodir/include
|
||||
AC_SUBST(MICO_INCLUDES)
|
||||
MICO_LDFLAGS=-L$kde_micodir/lib
|
||||
AC_SUBST(MICO_LDFLAGS)
|
||||
|
||||
AC_MSG_CHECKING([for MICO version])
|
||||
AC_CACHE_VAL(kde_cv_mico_version,
|
||||
[
|
||||
AC_LANG_C
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#include <stdio.h>
|
||||
#include <mico/version.h>
|
||||
int main() {
|
||||
|
||||
printf("MICO_VERSION=%s\n",MICO_VERSION);
|
||||
return (0);
|
||||
}
|
||||
EOF
|
||||
ac_compile='${CC-gcc} $CFLAGS $MICO_INCLUDES conftest.$ac_ext -o conftest'
|
||||
if AC_TRY_EVAL(ac_compile); then
|
||||
if eval `./conftest 2>&5`; then
|
||||
kde_cv_mico_version=$MICO_VERSION
|
||||
else
|
||||
AC_MSG_ERROR([your system is not able to execute a small application to
|
||||
find MICO version! Check $kde_micodir/include/mico/version.h])
|
||||
fi
|
||||
else
|
||||
AC_MSG_ERROR([your system is not able to compile a small application to
|
||||
find MICO version! Check $kde_micodir/include/mico/version.h])
|
||||
fi
|
||||
])
|
||||
|
||||
dnl installed MICO version
|
||||
mico_v_maj=`echo $kde_cv_mico_version | sed -e 's/^\(.*\)\..*\..*$/\1/'`
|
||||
mico_v_mid=`echo $kde_cv_mico_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'`
|
||||
mico_v_min=`echo $kde_cv_mico_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'`
|
||||
|
||||
dnl required MICO version
|
||||
req_v_maj=`echo $1 | sed -e 's/^\(.*\)\..*\..*$/\1/'`
|
||||
req_v_mid=`echo $1 | sed -e 's/^.*\.\(.*\)\..*$/\1/'`
|
||||
req_v_min=`echo $1 | sed -e 's/^.*\..*\.\(.*\)$/\1/'`
|
||||
|
||||
if test "$mico_v_maj" -lt "$req_v_maj" || \
|
||||
( test "$mico_v_maj" -eq "$req_v_maj" && \
|
||||
test "$mico_v_mid" -lt "$req_v_mid" ) || \
|
||||
( test "$mico_v_mid" -eq "$req_v_mid" && \
|
||||
test "$mico_v_min" -lt "$req_v_min" )
|
||||
|
||||
then
|
||||
AC_MSG_ERROR([found MICO version $kde_cv_mico_version but version $1 \
|
||||
at least is required. You should upgrade MICO.])
|
||||
else
|
||||
AC_MSG_RESULT([$kde_cv_mico_version (minimum version $1, ok)])
|
||||
fi
|
||||
|
||||
LIBMICO="-lmico$kde_cv_mico_version $LIBDL"
|
||||
AC_SUBST(LIBMICO)
|
||||
IDL=$kde_micodir/bin/idl
|
||||
AC_SUBST(IDL)
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN(KDE_CHECK_MINI_STL,
|
||||
[
|
||||
AC_REQUIRE([KDE_CHECK_MICO])
|
||||
|
||||
AC_MSG_CHECKING(if we use mico's mini-STL)
|
||||
AC_CACHE_VAL(kde_cv_have_mini_stl,
|
||||
[
|
||||
AC_LANG_CPLUSPLUS
|
||||
kde_save_cxxflags="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $MICO_INCLUDES"
|
||||
AC_TRY_COMPILE(
|
||||
[
|
||||
#include <mico/config.h>
|
||||
],
|
||||
[
|
||||
#ifdef HAVE_MINI_STL
|
||||
#error "nothing"
|
||||
#endif
|
||||
],
|
||||
kde_cv_have_mini_stl=no,
|
||||
kde_cv_have_mini_stl=yes)
|
||||
CXXFLAGS="$kde_save_cxxflags"
|
||||
])
|
||||
|
||||
|
||||
AC_MSG_RESULT($kde_cv_have_mini_stl)
|
||||
if test "$kde_cv_have_mini_stl" = "yes"; then
|
||||
AC_DEFINE_UNQUOTED(HAVE_MINI_STL)
|
||||
fi
|
||||
])
|
||||
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN(KDE_CHECK_LIBPTHREAD,
|
||||
@ -1859,112 +1582,6 @@ AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"], LIBPTHREAD= )
|
||||
AC_SUBST(LIBPTHREAD)
|
||||
])
|
||||
|
||||
AC_DEFUN(KDE_TRY_LINK_PYTHON,
|
||||
[
|
||||
AC_CACHE_VAL(kde_cv_try_link_python_$1,
|
||||
[
|
||||
kde_save_cxxflags="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $PYTHONINC"
|
||||
kde_save_libs="$LIBS"
|
||||
LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
|
||||
kde_save_ldflags="$LDFLAGS"
|
||||
LDFLAGS="$LDFLAGS $PYTHONLIB"
|
||||
|
||||
AC_TRY_LINK(
|
||||
[
|
||||
#include <Python.h>
|
||||
],[
|
||||
PySys_SetArgv(1, 0);
|
||||
],
|
||||
[kde_cv_try_link_python_$1=yes],
|
||||
[kde_cv_try_link_python_$1=no]
|
||||
)
|
||||
CXXFLAGS="$kde_save_cxxflags"
|
||||
LIBS="$kde_save_libs"
|
||||
LDFLAGS="$kde_save_ldflags"
|
||||
])
|
||||
|
||||
if test "$kde_cv_try_link_python_$1" = "yes"; then
|
||||
$3
|
||||
else
|
||||
$4
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
AC_DEFUN(KDE_CHECK_PYTHON,
|
||||
[
|
||||
AC_REQUIRE([KDE_CHECK_LIBDL])
|
||||
AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
|
||||
if test -z "$1"; then
|
||||
version="1.5"
|
||||
else
|
||||
version="$1"
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([for Python$version])
|
||||
|
||||
AC_ARG_WITH(pythondir,
|
||||
[ --with-pythondir=pythondir use python installed in pythondir ],
|
||||
[
|
||||
ac_python_dir=$withval
|
||||
], ac_python_dir=/usr/local
|
||||
)
|
||||
|
||||
python_incdirs="$ac_python_dir/include/python$version /usr/include/python$version /usr/local/include/python$version /usr/local/include"
|
||||
AC_FIND_FILE(Python.h, $python_incdirs, python_incdir)
|
||||
if test ! -r $python_incdir/Python.h; then
|
||||
AC_MSG_ERROR(Python.h not found.)
|
||||
fi
|
||||
|
||||
PYTHONINC=-I$python_incdir
|
||||
|
||||
python_libdirs="$ac_python_dir/lib/python$version/config /usr/lib/python$version/config /usr/local/python$version/config"
|
||||
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
|
||||
if test ! -r $python_libdir/libpython$version.a; then
|
||||
AC_MSG_ERROR(libpython$version.a not found.)
|
||||
fi
|
||||
|
||||
PYTHONLIB=-L$python_libdir
|
||||
LIBPYTHON=-lpython$version
|
||||
|
||||
AC_MSG_RESULT(header $python_incdir library $python_libdir)
|
||||
|
||||
dnl Note: this test is very weak
|
||||
AC_MSG_CHECKING(if an Python application links)
|
||||
KDE_TRY_LINK_PYTHON(normal, "", AC_MSG_RESULT(yes),
|
||||
[
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_CHECKING(if Python depends on -lpthread)
|
||||
KDE_TRY_LINK_PYTHON(pthread, "$LIBPTHREAD",
|
||||
[
|
||||
AC_MSG_RESULT(yes)
|
||||
LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL"
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_CHECKING(if Python depeds on -ltcl)
|
||||
KDE_TRY_LINK_PYTHON(tcl, "-ltcl",
|
||||
[
|
||||
AC_MSG_RESULT(yes)
|
||||
LIBPYTHON="$LIBPYTHON -ltcl"
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_WARN([it seems, Python depends on another library.
|
||||
Pleae use \"make LIBPTYHON='-lpython$version -lotherlib'\" to fix this
|
||||
and contact the authors to let them know about this problem])
|
||||
])
|
||||
])
|
||||
])
|
||||
|
||||
AC_SUBST(PYTHONINC)
|
||||
AC_SUBST(PYTHONLIB)
|
||||
AC_SUBST(LIBPYTHON)
|
||||
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN(KDE_CHECK_STL_SGI,
|
||||
[
|
||||
AC_MSG_CHECKING([if STL implementation is SGI like])
|
||||
@ -2046,170 +1663,3 @@ else
|
||||
AC_MSG_RESULT(not found)
|
||||
fi
|
||||
])
|
||||
|
||||
AC_DEFUN(KDE_CHECK_ANSI,
|
||||
[
|
||||
AC_MSG_CHECKING([for strdup])
|
||||
|
||||
AC_CACHE_VAL(kde_cv_stl_type_sgi,
|
||||
[
|
||||
AC_LANG_CPLUSPLUS
|
||||
save_CXXFLAGS="$CXXFLAGS"
|
||||
if test "$GCC" = "yes"; then
|
||||
CXXFLAGS="$CXXFLAGS -pedantic-errors"
|
||||
fi
|
||||
|
||||
AC_TRY_COMPILE([
|
||||
#include <string.h>
|
||||
],[
|
||||
char buffer[] = "Hallo";
|
||||
strdup(buffer)
|
||||
], kde_cv_has_strdup=yes,
|
||||
kde_cv_has_strdup=no)
|
||||
CXXFLAGS="$save_CXXFLAGS"
|
||||
])
|
||||
AC_MSG_RESULT($kde_cv_has_strdup)
|
||||
|
||||
if test "$kde_cv_has_strdup" = "yes"; then
|
||||
AC_DEFINE_UNQUOTED(HAVE_STRDUP)
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
AC_DEFUN(KDE_CHECK_INSURE,
|
||||
[
|
||||
AC_ARG_ENABLE(insure, [ --enable-insure use insure++ for debugging [default=no]],
|
||||
[
|
||||
if test $enableval = "no"; dnl
|
||||
then ac_use_insure="no"
|
||||
else ac_use_insure="yes"
|
||||
fi
|
||||
], [ac_use_insure="no"])
|
||||
|
||||
AC_MSG_CHECKING(if we will use Insure++ to debug)
|
||||
AC_MSG_RESULT($ac_use_insure)
|
||||
if test "$ac_use_insure" = "yes"; dnl
|
||||
then CC="insure"; CXX="insure"; dnl CFLAGS="$CLAGS -fno-rtti -fno-exceptions "????
|
||||
fi
|
||||
])
|
||||
|
||||
dnl this is for kdm:
|
||||
|
||||
AC_DEFUN(AC_CHECK_KDM,
|
||||
[
|
||||
AC_CHECK_FUNCS(getsecretkey)
|
||||
dnl checks for X server
|
||||
|
||||
AC_PATH_PROG(X_SERVER, X)
|
||||
if test ! -z "$X_SERVER"; then
|
||||
X_SERVER=`echo $X_SERVER | sed -e 's+/X$++'`
|
||||
AC_DEFINE_UNQUOTED(XBINDIR,$X_SERVER)
|
||||
XBINDIR=$X_SERVER
|
||||
AC_SUBST(XBINDIR)
|
||||
fi
|
||||
|
||||
dnl This one tries to find XDMDIR for config files
|
||||
AC_ARG_WITH(xdmdir,
|
||||
[ --with-xdmdir If the xdm config dir can't be found automaticly],
|
||||
[ ac_xdmdir=$withval],
|
||||
[ ac_xdmdir="no"])
|
||||
|
||||
AC_MSG_CHECKING([for xdm configuration dir])
|
||||
if test "$ac_xdmdir" = "no"; then
|
||||
rm -fr conftestdir
|
||||
if mkdir conftestdir; then
|
||||
cd conftestdir
|
||||
cat > Imakefile <<'EOF'
|
||||
acfindxdm:
|
||||
@echo 'ac_xdmdir="$(XDMDIR)";'
|
||||
EOF
|
||||
if (xmkmf) > /dev/null 2> /dev/null && test -f Makefile; then
|
||||
eval `${MAKE-make} acfindxdm 2>/dev/null 2>/dev/null | grep -v make`
|
||||
fi
|
||||
cd ..
|
||||
rm -fr conftestdir
|
||||
dnl Check if Imake was right
|
||||
if test -f $ac_xdmdir/xdm-config; then
|
||||
AC_MSG_RESULT($ac_xdmdir)
|
||||
else
|
||||
dnl Here we must do something else
|
||||
dnl Maybe look for xdm-config in standard places, and
|
||||
dnl if that fails use a fresh copy in $KDEDIR/config/kdm/
|
||||
AC_FIND_FILE(xdm-config,/etc/X11/xdm /var/X11/xdm /usr/openwin/xdm /usr/X11R6/lib/X11/xdm,ac_xdmdir)
|
||||
if test -f $ac_xdmdir/xdm-config; then
|
||||
AC_MSG_RESULT($ac_xdmdir)
|
||||
else
|
||||
if test "${prefix}" = NONE; then
|
||||
ac_xdmdir=$ac_default_prefix/config/kdm
|
||||
else
|
||||
ac_xdmdir=$prefix/config/kdm
|
||||
fi
|
||||
AC_MSG_RESULT([xdm config dir not found, installing defaults in $ac_xdmdir])
|
||||
xdmconfigsubdir=xdmconfig
|
||||
AC_SUBST(xdmconfigsubdir)
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if test -f $ac_xdmdir/xdm-config; then
|
||||
AC_MSG_RESULT($ac_xdmdir)
|
||||
else
|
||||
|
||||
AC_MSG_RESULT([xdm config dir not found, installing defaults in $ac_xdmdir])
|
||||
xdmconfigsubdir=xdmconfig
|
||||
AC_SUBST(xdmconfigsubdir)
|
||||
fi
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED(XDMDIR,"$ac_xdmdir")
|
||||
AC_SUBST(ac_xdmdir)
|
||||
|
||||
AC_PATH_PAM
|
||||
if test "x$no_pam" = "xyes"; then
|
||||
pam_support="no"
|
||||
else
|
||||
pam_support="yes"
|
||||
shadow_support="no" # if pam is installed, use it. We can't savely
|
||||
# test, if it works *sigh*
|
||||
fi
|
||||
|
||||
AC_ARG_WITH(shadow,
|
||||
[ --with-shadow If you want shadow password support ],
|
||||
[ if test "$withval" = "yes"; then
|
||||
shadow_support="yes"
|
||||
else
|
||||
shadow_support="no"
|
||||
fi
|
||||
if test "$pam_support" = "yes" && test "$shadow_support=yes"; then
|
||||
AC_MSG_WARN("You can not define both pam AND shadow")
|
||||
fi
|
||||
],
|
||||
[ if test -z "$shadow_support"; then shadow_support="no"; fi ] )
|
||||
|
||||
if test "$pam_support" = "yes"; then
|
||||
AC_CHECK_LIB(pam, main, [PASSWDLIB="-lpam -ldl"
|
||||
AC_DEFINE_UNQUOTED(HAVE_PAM_LIB)],
|
||||
[],-ldl)
|
||||
fi
|
||||
|
||||
if test -z "$PASSWDLIB" && test "$shadow_support" = "yes"; then
|
||||
AC_CHECK_LIB(shadow, main,
|
||||
[ PASSWDLIB="-lshadow"
|
||||
AC_DEFINE_UNQUOTED(HAVE_SHADOW_LIB)
|
||||
])
|
||||
fi
|
||||
AC_SUBST(PASSWDLIB)
|
||||
AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for FreeBSD
|
||||
AC_SUBST(LIBUTIL)
|
||||
AC_CHECK_LIB(s, main, [LIB_LIBS="-ls"]) dnl for AIX
|
||||
AC_SUBST(LIB_LIBS)
|
||||
AC_CHECK_LIB(Xdmcp, main, [LIBXDMCP="-lXdmcp"], , $X_LDFLAGS -lX11) dnl for Unixware
|
||||
AC_SUBST(LIBXDMCP)
|
||||
|
||||
if test -n "$LIBXDMCP"; then
|
||||
ac_cpp_safe=$ac_cpp
|
||||
ac_cpp='$CXXCPP $CPPFLAGS $X_INCLUDES'
|
||||
AC_CHECK_HEADERS(X11/Xdmcp.h)
|
||||
ac_cpp=$ac_cpp_safe
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
@ -31,6 +31,25 @@ if test $lyx_devel_version = yes ; then
|
||||
AC_DEFINE(DEVEL_VERSION, 1, Define if you are building a development version of LyX)
|
||||
fi])
|
||||
|
||||
|
||||
dnl Define the option to set a LyX version on installed executables and directories
|
||||
dnl
|
||||
dnl
|
||||
AC_DEFUN(LYX_VERSION_SUFFIX,[
|
||||
AC_MSG_CHECKING([for install target ... ])
|
||||
AC_ARG_WITH(lyx-version,
|
||||
[ --with-lyx-version[=<version>] install lyx files as lyx-<suffix>],
|
||||
[if test "x$withval" = "xyes";
|
||||
then
|
||||
withval="$VERSION"
|
||||
ac_configure_args=`echo $ac_configure_args | sed "s,--with-lyx-version,--with-lyx-version=$withval,"`
|
||||
fi
|
||||
lyxname="lyx-$withval"
|
||||
program_suffix=-$withval],
|
||||
[lyxname=lyx])
|
||||
AC_MSG_RESULT([$lyxname])
|
||||
])
|
||||
|
||||
dnl Usage: LYX_ERROR(message) Displays the warning "message" and sets the
|
||||
dnl flag lyx_error to yes.
|
||||
AC_DEFUN(LYX_ERROR,[
|
||||
|
||||
@ -11,11 +11,7 @@ LYX_GET_VERSION(${srcdir}/src/version.h)
|
||||
AC_CANONICAL_SYSTEM
|
||||
AC_VALIDATE_CACHE_SYSTEM_TYPE
|
||||
|
||||
AC_ARG_WITH(lyx-suffix,
|
||||
[ --with-lyx-suffix install lyx files as lyx-<suffix>],
|
||||
[lyxname="lyx-$withval"
|
||||
program_suffix=-$withval],
|
||||
[lyxname=lyx])
|
||||
LYX_VERSION_SUFFIX
|
||||
|
||||
AM_INIT_AUTOMAKE($lyxname, $VERSION)
|
||||
|
||||
|
||||
@ -1,10 +1,17 @@
|
||||
2001-02-16 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* reLyX/Makefile.am: fix uninstall
|
||||
|
||||
* reLyX/configure.in: --with-lyx-version
|
||||
|
||||
2001-02-26 José Matos <jamatos@fep.up.pt>
|
||||
|
||||
* templates/docbook_template.lyx: removed.
|
||||
* templates/docbook_article.lyx: updated file, to replace the previous.
|
||||
|
||||
* templates/linuxdoctemplate.lyx: removed.
|
||||
* templates/linuxdoc_article.lyx: updated file, to replace the previous.
|
||||
* templates/linuxdoc_article.lyx: updated file, to replace the
|
||||
previous.
|
||||
|
||||
2001-02-11 José Matos <jamatos@fep.up.pt>
|
||||
|
||||
|
||||
@ -54,9 +54,13 @@ install-exec-local: libinstalldirs
|
||||
|
||||
uninstall-local:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
files=`cd ${srcdir} ; echo $(LIBINSTFILES)` ; \
|
||||
files=`cd ${srcdir} ; echo $(LIBINSTFILES) $(LYXSCRIPTS)` ; \
|
||||
for i in $${files} ; do \
|
||||
rm -f $(pkgdatadir)/$$i ; \
|
||||
done ; \
|
||||
dirs=`cd ${srcdir} ; echo $(LYXLIBDIRS)` ; \
|
||||
for i in $${dirs} ; do \
|
||||
rm -rf $(pkgdatadir)/$$i ; \
|
||||
done
|
||||
|
||||
dist-hook:
|
||||
|
||||
@ -27,3 +27,14 @@ install-data-local: libinstalldirs
|
||||
for i in $${files} ; do \
|
||||
$(INSTALL_DATA) ${srcdir}/$$i $(DESTDIR)$(pkgdatadir)/reLyX/$$i ; \
|
||||
done
|
||||
|
||||
uninstall-local:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
files=`cd ${srcdir} ; echo $(LIBINSTFILES)` ; \
|
||||
for i in $${files} ; do \
|
||||
rm -f $(pkgdatadir)/reLyX/$$i ; \
|
||||
done ; \
|
||||
dirs=`cd ${srcdir} ; echo $(LYXDATADIRS)` ; \
|
||||
for i in $${dirs} ; do \
|
||||
rm -rf $(pkgdatadir)/$$i ; \
|
||||
done
|
||||
|
||||
@ -6,8 +6,8 @@ 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(lyx-suffix,
|
||||
[ --with-lyx-suffix install lyx files as lyx-<suffix>],
|
||||
AC_ARG_WITH(lyx-version,
|
||||
[ --with-lyx-version[=<version>] install lyx files as lyx-<version>],
|
||||
[lyxname="lyx-$withval"
|
||||
program_suffix=-$withval],
|
||||
[lyxname=lyx])
|
||||
|
||||
@ -71,48 +71,48 @@ src/frontends/qt2/FormTabularCreate.C
|
||||
src/frontends/qt2/paragraphdlgimpl.C
|
||||
src/frontends/qt2/tabularcreatedlgimpl.C
|
||||
src/frontends/xforms/FormBase.h
|
||||
src/frontends/xforms/form_bibitem.C
|
||||
src/frontends/xforms/FormBibitem.C
|
||||
src/frontends/xforms/form_bibtex.C
|
||||
src/frontends/xforms/form_bibitem.C
|
||||
src/frontends/xforms/FormBibtex.C
|
||||
src/frontends/xforms/form_bibtex.C
|
||||
src/frontends/xforms/form_browser.C
|
||||
src/frontends/xforms/form_character.C
|
||||
src/frontends/xforms/FormCharacter.C
|
||||
src/frontends/xforms/form_citation.C
|
||||
src/frontends/xforms/form_character.C
|
||||
src/frontends/xforms/FormCitation.C
|
||||
src/frontends/xforms/form_copyright.C
|
||||
src/frontends/xforms/form_citation.C
|
||||
src/frontends/xforms/FormCopyright.C
|
||||
src/frontends/xforms/form_document.C
|
||||
src/frontends/xforms/form_copyright.C
|
||||
src/frontends/xforms/FormDocument.C
|
||||
src/frontends/xforms/form_error.C
|
||||
src/frontends/xforms/form_document.C
|
||||
src/frontends/xforms/FormError.C
|
||||
src/frontends/xforms/form_graphics.C
|
||||
src/frontends/xforms/form_error.C
|
||||
src/frontends/xforms/FormGraphics.C
|
||||
src/frontends/xforms/form_include.C
|
||||
src/frontends/xforms/form_graphics.C
|
||||
src/frontends/xforms/FormInclude.C
|
||||
src/frontends/xforms/form_index.C
|
||||
src/frontends/xforms/form_include.C
|
||||
src/frontends/xforms/FormIndex.C
|
||||
src/frontends/xforms/form_index.C
|
||||
src/frontends/xforms/FormInset.h
|
||||
src/frontends/xforms/FormLog.C
|
||||
src/frontends/xforms/form_paragraph.C
|
||||
src/frontends/xforms/FormParagraph.C
|
||||
src/frontends/xforms/form_preamble.C
|
||||
src/frontends/xforms/form_paragraph.C
|
||||
src/frontends/xforms/FormPreamble.C
|
||||
src/frontends/xforms/form_preferences.C
|
||||
src/frontends/xforms/form_preamble.C
|
||||
src/frontends/xforms/FormPreferences.C
|
||||
src/frontends/xforms/form_print.C
|
||||
src/frontends/xforms/form_preferences.C
|
||||
src/frontends/xforms/FormPrint.C
|
||||
src/frontends/xforms/form_ref.C
|
||||
src/frontends/xforms/form_print.C
|
||||
src/frontends/xforms/FormRef.C
|
||||
src/frontends/xforms/form_ref.C
|
||||
src/frontends/xforms/FormSplash.C
|
||||
src/frontends/xforms/form_tabular.C
|
||||
src/frontends/xforms/FormTabular.C
|
||||
src/frontends/xforms/form_tabular_create.C
|
||||
src/frontends/xforms/form_tabular.C
|
||||
src/frontends/xforms/FormTabularCreate.C
|
||||
src/frontends/xforms/form_toc.C
|
||||
src/frontends/xforms/form_tabular_create.C
|
||||
src/frontends/xforms/FormToc.C
|
||||
src/frontends/xforms/form_url.C
|
||||
src/frontends/xforms/form_toc.C
|
||||
src/frontends/xforms/FormUrl.C
|
||||
src/frontends/xforms/form_url.C
|
||||
src/frontends/xforms/FormVCLog.C
|
||||
src/frontends/xforms/input_validators.C
|
||||
src/frontends/xforms/Menubar_pimpl.C
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
2001-03-01 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
|
||||
|
||||
* bufferview_funcs.C (ToggleAndShow): do not provide optional
|
||||
arguments in function implementation.
|
||||
|
||||
2001-02-28 Lars Gullik Bjønnes <larsbj@trylle.birdstep.com>
|
||||
|
||||
* BufferView_pimpl.C: add <ctime>
|
||||
|
||||
@ -286,7 +286,7 @@ string const CurrentState(BufferView * bv)
|
||||
/* -------> Does the actual toggle job of the XxxCB() calls above.
|
||||
* Also shows the current font state.
|
||||
*/
|
||||
void ToggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall=true)
|
||||
void ToggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall)
|
||||
{
|
||||
if (bv->available()) {
|
||||
LyXText * text = bv->getLyXText();
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
2001-02-23 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* math_parser.C:
|
||||
* formula.C: make DEBUG into lyxerr
|
||||
|
||||
2001-03-01 Lars Gullik Bjønnes <larsbj@trylle.birdstep.com>
|
||||
|
||||
* math_macrotemplate.h: make noncopyable, remove last arg to
|
||||
@ -199,7 +204,8 @@
|
||||
|
||||
2001-02-14 André Pönitz <poenitz@htwm.de>
|
||||
|
||||
* array.[Ch]: "deep" copy constructor and assignment operator for MathArray
|
||||
* array.[Ch]: "deep" copy constructor and assignment operator for
|
||||
MathArray
|
||||
|
||||
* math_iter.[Ch]: seperate Copy() from Copy(int, int)
|
||||
|
||||
@ -208,7 +214,8 @@
|
||||
|
||||
2001-02-14 André Pönitz <poenitz@htwm.de>
|
||||
|
||||
* array.[Ch]: remove constructor and enums ARRAY_MIN_SIZE and ARRAY_STEP
|
||||
* array.[Ch]: remove constructor and enums ARRAY_MIN_SIZE and
|
||||
ARRAY_STEP
|
||||
|
||||
* math_iter.C: default-construct and resize array
|
||||
|
||||
|
||||
@ -294,7 +294,7 @@ void InsetFormula::Validate(LaTeXFeatures & features) const
|
||||
}
|
||||
|
||||
|
||||
void InsetFormula::Read(Buffer const *, LyXLex & lex)
|
||||
void InsetFormula::Read(Buffer const *buffer, LyXLex & lex)
|
||||
{
|
||||
istream & is = lex.getStream();
|
||||
|
||||
@ -325,9 +325,8 @@ void InsetFormula::Read(Buffer const *, LyXLex & lex)
|
||||
" or missing \\end_inset!" << endl;
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
Write(lyxerr);
|
||||
#endif
|
||||
if (lyxerr.debugging(Debug::MATHED))
|
||||
Write(buffer, lyxerr);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -875,9 +875,7 @@ void mathed_parse(MathedArray & array, unsigned flags = 0,
|
||||
crow = mt->getRowSt();
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
lyxerr << "MATH BEGIN[" << mathed_env << "]" << endl;
|
||||
#endif
|
||||
lyxerr[Debug::MATHED] << "MATH BEGIN[" << mathed_env << "]" << endl;
|
||||
} else {
|
||||
// lyxerr << "MATHCRO[" << yytext << "]";
|
||||
MathMacro * p =
|
||||
@ -924,9 +922,7 @@ void mathed_parse(MathedArray & array, unsigned flags = 0,
|
||||
} else {
|
||||
mathed_label = yytext.data();
|
||||
}
|
||||
#ifdef DEBUG
|
||||
lyxerr << "Label[" << mathed_label << "]" << endl;
|
||||
#endif
|
||||
lyxerr[Debug::MATHED] << "Label[" << mathed_label << "]" << endl;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
2001-02-16 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* syscontr.h: fix header include
|
||||
|
||||
2001-02-28 Baruch Even <baruch@ev-en.org>
|
||||
|
||||
* filetools.C: Removed dependency on syscall.h
|
||||
@ -16,7 +20,7 @@
|
||||
|
||||
* filetools.C (IsLyXFilename):
|
||||
* filetools.C (IsSGMLFilename): test if extension is suffix and not
|
||||
only containned.
|
||||
only contained.
|
||||
|
||||
2001-02-14 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
#include <LString.h>
|
||||
#include "LString.h"
|
||||
|
||||
|
||||
class Systemcalls;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user