dnl This is a trick to make autoheader do the right thing
dnl AM_CONFIG_HEADER(src/config.h)
AC_CONFIG_AUX_DIR(config)
-LYX_GET_VERSION(${srcdir}/src/version.h)
+
+PACKAGE=lyx${program_suffix}
+VERSION="1.2.0cvs"
+LYX_CHECK_VERSION
AC_CANONICAL_SYSTEM
AC_VALIDATE_CACHE_SYSTEM_TYPE
# 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 sl sv tr wa"
-
-AC_PREFIX_PROGRAM(lyx)
+ALL_LINGUAS="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
esac
### Check for a C++ compiler
-AC_LANG_CPLUSPLUS
LYX_PROG_CXX
-AC_PROG_CXXCPP
### 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
AC_CHECK_LIB(m, sin)
AC_CHECK_LIB(c, fopen)
AC_ARG_WITH(aiksaurus,
- [ --without-aiksaurus do not use the AikSaurus library],
+ [ --without-aiksaurus do not use the Aiksaurus library],
[lyx_use_aiksaurus=$withval])
if test x$lyx_use_aiksaurus != xno; then
-AC_CHECK_LIB(bz2, main)
-AC_CHECK_LIB(AikSaurus, main,
+AC_CHECK_LIB(Aiksaurus, main,
[AC_DEFINE(HAVE_LIBAIKSAURUS,,[Define this if you have the AikSaurus library])
- AIKSAURUS_LIBS="-lAikSaurus"
- ])
+ AIKSAURUS_LIBS="-lAiksaurus -lbz2"
+ ],,"-lbz2")
fi
AC_SUBST(AIKSAURUS_LIBS)
CHECK_WITH_PSPELL
### Check for X libraries
-# Check for the pt library (for SCO, needed for X)
-AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS")
+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"
case "$lyx_use_frontend" in
xforms)
# for now don't set it for xforms as this is always entered
- FRONTEND=""
- FRONTEND_GUILIB="xforms/libxforms.la";;
- gnome)
+ LYX_PATH_XPM
+ LYX_PATH_XFORMS
+ FRONTEND="xforms"
+ FRONTEND_GUILIB="xforms/*.lo"
+ FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
+ FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@"
+ FRONTEND_INFO=`cat <<EOF
+ libXpm version: ${XPM_VERSION}\n\
+ libforms version: ${XFORMS_VERSION}\n
+`
+ ;;
+ gnome)
AM_PATH_GTKMM(1.2.1,,
AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
AM_PATH_GNOMEMM
AC_MSG_ERROR(Did not find libGlade installed)
fi
- FRONTEND="gnome"
- FRONTEND_GUILIB="gnome/libgnome.la"
+ FRONTEND="xforms gnome"
+ FRONTEND_GUILIB="gnome/*.lo"
FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
- FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)"
- FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade`";;
+ 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`";;
qt2)
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"
FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
- FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
+ FRONTEND_INCLUDES="-I\${srcdir}/qt2 -I\${top_srcdir}/src/frontends/xforms \$(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" = 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
-AC_SUBST(LYX_LIBS)
-else
+#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
# some standard header files
AC_HEADER_DIRENT
AC_HEADER_MAJOR
-AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h)
+AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h)
# some annoying header files
#LYX_PATH_HEADER(stl_string_fwd.h)
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=`cat <<EOF
+Configuration\n\
+ Host type: ${host_alias}\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(sigc++ lib lib/reLyX)
AC_OUTPUT([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/support/Makefile \
src/frontends/controllers/Makefile \
src/frontends/xforms/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 \
src/frontends/gnome/Makefile \
])
-
-cat <<EOF
-
-Configuration:
- Source code location: ${srcdir}
- C++ Compiler: ${CXX}
- C++ Compiler flags: ${CXXFLAGS}
- C Compiler: ${CC}
- C Compiler flags: ${CFLAGS}
- LyX binary dir: `eval "echo \`eval \"echo ${bindir}\"\`"`
- LyX files dir: `eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
- Special flags: ${lyx_flags}
-
-EOF
+# show version information
+echo
+printf "$VERSION_INFO"
+echo
# Display a final warning if there has been a LYX_ERROR
LYX_CHECK_ERRORS
projects / lyx.git / blobdiff