X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=9ae83b7af5d5dce13f7a469d74bd64149d13efb7;hb=4c6e0fe4226ce3b55d13726977f1e579f17c2ad1;hp=20ee16626847430ce2f342475ebdf39521d9943d;hpb=8721e76079100c9238b97b4efdd2637cc2a6790a;p=lyx.git diff --git a/configure.ac b/configure.ac index 20ee166268..9ae83b7af5 100644 --- a/configure.ac +++ b/configure.ac @@ -56,7 +56,7 @@ AC_ISC_POSIX AC_AIX ### check which frontend we want to use -LYX_USE_FRONTEND +LYX_USE_FRONTENDS ### Check for a C++ compiler LYX_PROG_CXX @@ -78,7 +78,7 @@ LYX_CXX_STL_MODERN_STREAMS ### and now some special lyx flags. AC_ARG_ENABLE(assertions, - [ --enable-assertions add runtime sanity checks in the program],, + AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),, [if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then enable_assertions=yes; else @@ -161,50 +161,60 @@ esac ### check which frontend we want to use -# XForms tests -LYX_PATH_XPM -LYX_PATH_XFORMS -LYX_CHECK_XFORMS_IMAGE_LOADER -# QT tests -QT_DO_IT_ALL - -#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) - FRONTEND="xforms" - RPM_FRONTEND="xforms" - RPM_FRONTEND_DEPS='libforms >= 1.0' - FRONTEND_GUILIB="frontends/xforms/libxforms.la" - FRONTEND_INFO=" libXpm version: ${XPM_VERSION}\n\ - libforms version: ${XFORMS_VERSION}\n" - ;; -dnl gnome) -dnl LYX_PATH_XPM -dnl LYX_PATH_XFORMS -dnl LYX_CHECK_XFORMS_IMAGE_LOADER -dnl PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0) -dnl AC_SUBST(GNOME_FRONTEND_CFLAGS) -dnl AC_SUBST(GNOME_FRONTEND_LIBS) - -dnl FRONTEND="xforms gnome" -dnl FRONTEND_GUILIB="gnome/*.lo" -dnl FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}" -dnl FRONTEND_INCLUDES="${GNOME_FRONTEND_CFLAGS}" -dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}" -dnl ;; - qt) - RPM_FRONTEND="qt" - RPM_FRONTEND_DEPS='qt >= 2.2.1' - FRONTEND="qt2" - FRONTEND_GUILIB="frontends/qt2/libqt2.la" - FRONTEND_INCLUDES="\$(QT_INCLUDES)" - FRONTEND_INFO=" Qt version: ${QT_VERSION}\n" - ;; - *) - LYX_ERROR(Unknown frontend $lyx_use_frontend);; -esac +dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL. +for frontend in $FRONTENDS ; do + case "$frontend" in + xforms) + XFORMS_DO_IT_ALL + FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)" + FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms" + RPM_FRONTEND="xforms" + RPM_FRONTEND_DEPS='libforms >= 1.0' + FRONTEND_INFO="${FRONTEND_INFO}\ + XForms Frontend:\n\ + libXpm version: ${XPM_VERSION}\n\ + libforms version: ${XFORMS_VERSION}\n" + ;; + dnl gnome) + dnl XFORMS_DO_IT_ALL + dnl PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0) + dnl AC_SUBST(GNOME_FRONTEND_CFLAGS) + dnl AC_SUBST(GNOME_FRONTEND_LIBS) + + dnl FRONTEND="xforms gnome" + dnl FRONTEND_GUILIB="gnome/*.lo" + dnl FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}" + dnl FRONTEND_INCLUDES="${GNOME_FRONTEND_CFLAGS}" + dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}" + dnl ;; + gtk) + XFORMS_DO_IT_ALL + PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.0 libglademm-2.0) + FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)" + FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms gtk" + RPM_FRONTEND="gtk" + RPM_FRONTEND_DEPS='gtkmm >= 2.2.0' + GTKMM_VERSION=`pkg-config --modversion gtkmm-2.0` + LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.0` + FRONTEND_INFO=" libgtkmm version: ${GTKMM_VERSION}\n\ + libglademm version: ${LIBGLADEMM_VERSION}\n" + ;; + + qt) + QT_DO_IT_ALL + FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt\$(EXEEXT)" + FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt2" + RPM_FRONTEND="qt" + RPM_FRONTEND_DEPS='qt >= 2.2.1' + FRONTEND_INFO="${FRONTEND_INFO}\ + Qt Frontend:\n\ + Qt version: ${QT_VERSION}\n" + ;; + *) + LYX_ERROR(Unknown frontend '$frontend');; + esac +done ### Setup GNU gettext dnl GNU gettext is written in C @@ -246,8 +256,25 @@ LYX_CHECK_DECL(vsnprintf, stdio.h) LYX_CHECK_DECL(istreambuf_iterator, iterator) LYX_CHECK_DECL(mkstemp,[unistd.h stdlib.h]) -AC_CHECK_HEADERS(zlib.h) -AC_CHECK_LIB(z, gzopen) +AC_ARG_ENABLE(compression-support, AC_HELP_STRING([--enable-compression-support],[Support for compressed files.]),[ + case "${enableval}" in + yes) use_compression=true ;; + no) use_compression=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-compression-support) ;; + esac +],[use_compression=true]) +if test $use_compression=true ; then + AC_CHECK_HEADERS(zlib.h, use_compression=true, use_compression=false) + AC_CHECK_LIB(z, gzopen,[use_compression=true;LIBS="$LIBS -lz"], use_compression=false) + if test $use_compression = true ; then + AC_DEFINE(USE_COMRESSION, 1, [Define as 1 if you want to supprot compressed files.]) + lyx_flags="$lyx_flags compression" + fi +fi +AM_CONDITIONAL(USE_COMPRESSION, test x$use_compression = xtrue) +AC_MSG_CHECKING([whether to support compressed files]) +AC_MSG_RESULT($use_compression) + 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 @@ -270,7 +297,6 @@ VERSION_INFO="Configuration\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" @@ -284,19 +310,16 @@ AC_SUBST(RPM_FRONTEND_DEPS) AH_TOP([ /* -*- C++ -*- */ -/* This is the compilation configuration file for LyX. It was generated by - autoconfs configure. You might want to change some of the defaults if - something goes wrong during the compilation - - * This file is part of - * ====================================================== - * - * LyX, the High Level Word Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. - * - *======================================================*/ +/* + * \file config.h + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * This is the compilation configuration file for LyX. + * It was generated by autoconfs configure. + * You might want to change some of the defaults if something goes wrong + * during the compilation. + */ #ifndef _CONFIG_H #define _CONFIG_H @@ -349,7 +372,6 @@ int mkstemp(char*); #endif #define BOOST_DISABLE_THREADS 1 -#define BOOST_NO_EXCEPTIONS 1 #define BOOST_NO_WREGEX 1 #define BOOST_NO_WSTRING 1 @@ -374,7 +396,7 @@ AC_CONFIG_FILES([Makefile \ sourcedoc/Doxyfile \ sourcedoc/Makefile \ src/Makefile \ - src/version.C \ + src/version.C-tmp:src/version.C.in \ src/tex2lyx/Makefile \ src/mathed/Makefile \ src/graphics/Makefile \ @@ -383,9 +405,11 @@ AC_CONFIG_FILES([Makefile \ src/frontends/Makefile \ src/frontends/controllers/Makefile \ src/frontends/xforms/Makefile \ - src/frontends/xforms/lyx_forms.h \ - src/frontends/xforms/lyx_xpm.h \ + src/frontends/xforms/lyx_forms.h-tmp:src/frontends/xforms/lyx_forms.h.in \ + src/frontends/xforms/lyx_xpm.h-tmp:src/frontends/xforms/lyx_xpm.h.in \ src/frontends/xforms/forms/Makefile \ + src/frontends/gtk/Makefile \ + src/frontends/gtk/glade/Makefile \ src/frontends/qt2/Makefile \ src/frontends/qt2/moc/Makefile \ src/frontends/qt2/ui/Makefile \