AC_CONFIG_AUX_DIR(config)
PACKAGE=lyx${program_suffix}
-VERSION="1.2.0cvs"
+VERSION="1.3.0cvs"
LYX_CHECK_VERSION
AC_CANONICAL_SYSTEM
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="ca cs da de es eu fi fr he hu it nl no pl pt ro ru sk sl sv tr wa"
+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
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
### check which frontend we want to use
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
- gnome)
- GNOME_INIT
- GNOME_COMPILE_WARNINGS
- GNOME_X_CHECKS
-esac
+
+#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 compiler allow that)
dnl LYX_CXX_PARTIAL
LYX_CXX_EXPLICIT
LYX_CXX_STL_STRING
[Define if you want assertions to be enabled in the code])
fi
-### We need a regex implementation, so we provide our own if none is found.
-LYX_REGEX
-
### 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)
-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,,[Define this if you have the AikSaurus library])
- AIKSAURUS_LIBS="-lAiksaurus -lbz2"
- ],,"-lbz2")
-fi
-AC_SUBST(AIKSAURUS_LIBS)
### Add extra directories to check for libraries.
LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE)
LYX_LOOP_DIR($lyx_cv_extra_prefix,[
LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
-
+
### Check for the -liberty library
test "x$GXX" = xyes && lyx_use_liberty=yes
AC_ARG_WITH(liberty,
AC_CHECK_LIB(iberty,main)
fi
+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,,[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 which libsigc++ we're using
-LYX_WITH_SIGC
-
### Check if we want pspell libraries
CHECK_WITH_PSPELL
### Check for X libraries
-dnl # Check for the pt library (for SCO, needed for X)
-dnl AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS")
# The real thing.
AC_PATH_XTRA
LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
### check which frontend we want to use
#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)
+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=""
- FRONTEND_GUILIB="xforms/libxforms.o";;
- gnome)
- AM_PATH_GTKMM(1.2.1,,
- AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
- AM_PATH_GNOMEMM
-
-dnl ******************************
-dnl LibGlade checking
-dnl ******************************
-dnl Ensure gnome-config is available...
- AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
- AC_MSG_CHECKING(for Glade libraries)
- if $GNOME_CONFIG --libs libglade > /dev/null 2>&1; then
- AC_MSG_RESULT(found)
- else
- AC_MSG_ERROR(Did not find libGlade installed)
- fi
-
- FRONTEND="gnome"
- FRONTEND_GUILIB="gnome/libgnome.la"
- FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
- FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS) `gnome-config --cflags libglade gnomeui`"
- FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade gnomeui`";;
+ LYX_PATH_XPM
+ LYX_PATH_XFORMS
+ FRONTEND="xforms"
+ FRONTEND_GUILIB="xforms/*.lo"
+ FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
+ FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
+ FRONTEND_INFO=`cat <<EOF
+ libXpm version: ${XPM_VERSION}\n\
+ libforms version: ${XFORMS_VERSION}\n
+`
+ ;;
+ gnome)
+ LYX_PATH_XPM
+ LYX_PATH_XFORMS
+
+ 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)
+ LYX_PATH_XPM
+ LYX_PATH_XFORMS
QT2_DO_IT_ALL
FRONTEND="qt2"
- FRONTEND_GUILIB="qt2/libqt2.la"
+ FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo qt2/xforms/*.lo"
FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
- FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
- FRONTEND_LIBS="\$(QT2_LIBS)";;
+ FRONTEND_INCLUDES="-I\${srcdir}/qt2 -I\${top_srcdir}/src/frontends/xforms \$(QT2_INCLUDES)"
+ FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ \$(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" = yes ; then
+if test "$have_x" = no ; then
# We surely need these two libraries and want to check carefully the
-# version numbers...
-LYX_PATH_XPM
-LYX_PATH_XFORMS
-FRONTEND_INFO=`cat <<EOF
- libXpm version: ${XPM_VERSION}\n\
- libforms version: ${XFORMS_VERSION}\n
-`
-
-AC_SUBST(LYX_LIBS)
-else
+# version numbers...
+#LYX_PATH_XPM
+#LYX_PATH_XFORMS
+#FRONTEND_INFO=`cat <<EOF
+# libXpm version: ${XPM_VERSION}\n\
+# libforms version: ${XFORMS_VERSION}\n
+#`
+#
+#AC_SUBST(LYX_LIBS)
+#else
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
+[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
+LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG
+
### Setup GNU gettext
dnl GNU gettext is written in C
AC_LANG_C
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
+# 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
LYX_CHECK_DECL(vsnprintf, stdio.h)
LYX_CHECK_DECL(istreambuf_iterator, iterator)
-AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo \
- mkstemp mktemp)
+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)
+# SunOS 4.1.3 does not have strerror and atexit
+AC_REPLACE_FUNCS(strerror atexit)
+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
-# SunOS 4.1.3 does not have strerror and atexit
-AC_REPLACE_FUNCS(strerror atexit)
LYX_CHECK_DECL_HDRS(mkstemp,[unistd.h stdlib.h])
AC_SUBST(VERSION_INFO)
### Finish the work.
-AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX)
+AC_CONFIG_SUBDIRS(lib lib/reLyX)
AC_OUTPUT([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 \
src/frontends/Makefile \
src/frontends/controllers/Makefile \
src/frontends/xforms/Makefile \
+ src/frontends/xforms/forms/Makefile \
src/frontends/qt2/Makefile \
+ src/frontends/qt2/xforms/Makefile \
src/frontends/qt2/moc/Makefile \
src/frontends/qt2/ui/Makefile \
src/frontends/qt2/ui/moc/Makefile \
# show version information
echo
-printf "$VERSION_INFO"
+printf "$VERSION_INFO"
echo
# Display a final warning if there has been a LYX_ERROR
projects / lyx.git / blobdiff