X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=af1a2c527354631efaed39ddf77515da81d1b848;hb=3a4be311e69ad234dad94af3fd41b0287de2a734;hp=1ceca98c21fb7a11146f2bc3dfc672b79ab6f703;hpb=20af81782b6b4f4378c169605be8e738779c25fe;p=lyx.git diff --git a/configure.ac b/configure.ac index 1ceca98c21..af1a2c5273 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,10 @@ PACKAGE=lyx${program_suffix} VERSION="1.4.0cvs" LYX_CHECK_VERSION +dnl default maintainer mode to true for development versions +if test "${enable_maintainer_mode+set}" != set; then + enable_maintainer_mode=$lyx_devel_version +fi AM_MAINTAINER_MODE AC_CANONICAL_TARGET @@ -22,10 +26,6 @@ AM_INIT_AUTOMAKE($lyxname, $VERSION) # This is needed by GNU gettext ALL_LINGUAS="bg ca cs da de es eu fi fr he hu it nl nn 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} @@ -66,9 +66,6 @@ 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 @@ -118,8 +115,9 @@ AC_ARG_WITH(aiksaurus, 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") + AIKSAURUS_LIBS="-lAiksaurus" + lyx_flags="$lyx_flags aiksaurus" + ]) AC_CHECK_HEADER(Aiksaurus.h,[ ac_cv_header_aiksaurus_h=yes lyx_cv_aiksaurus_h_location=""]) @@ -161,20 +159,24 @@ esac ### check which frontend we want to use +dnl if the gtk frontend has been specified, then xforms is needed too +if echo $FRONTENDS | grep gtk | grep -v xforms ; then + FRONTENDS="$FRONTENDS xforms" +fi + dnl The code below is not in a macro, because this would cause big 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" + 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" + libXpm version:\t\t${XPM_VERSION}\n\ + libforms version:\t\t${XFORMS_VERSION}\n" ;; dnl gnome) dnl XFORMS_DO_IT_ALL @@ -188,21 +190,53 @@ for frontend in $FRONTENDS ; do dnl FRONTEND_INCLUDES="${GNOME_FRONTEND_CFLAGS}" dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}" dnl ;; + gtk) + PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.4 libglademm-2.4) + FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)" + FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk" + RPM_FRONTEND="gtk" + GTKMM_VERSION=`pkg-config --modversion gtkmm-2.4` + LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.4` + FRONTEND_INFO="${FRONTEND_INFO}\ + GTK Frontend:\n\ + libgtkmm version:\t\t${GTKMM_VERSION}\n\ + libglademm version:\t\t${LIBGLADEMM_VERSION}\n" + ;; + qt) QT_DO_IT_ALL - FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt" + 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" + Qt version:\t\t${QT_VERSION}\n" +dnl qt build will fail without moc or uic + if test -z "$MOC"; then + LYX_ERROR([moc binary not found !]) + fi + if test -z "$UIC"; then + LYX_ERROR([uic binary not found !]) + fi ;; *) - LYX_ERROR(Unknown frontend $lyx_use_frontend);; + LYX_ERROR(Unknown frontend '$frontend');; esac done +### Check how the files should be packaged +LYX_USE_PACKAGING +# fix the value of the prefixes. +test "x$prefix" = xNONE && prefix=$default_prefix +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then + LYX_WARNING([The installation prefix \"${prefix}\" contains a space, which + causes problems with the Makefiles. The installation will be done in + directory \"`pwd`/installprefix\" instead. Please move its contents to + the right place after installation.]) + prefix=`pwd`/installprefix +fi + ### Setup GNU gettext dnl GNU gettext is written in C AC_LANG_PUSH(C) @@ -237,12 +271,13 @@ AC_TYPE_SIGNAL AC_TYPE_SIZE_T AC_TYPE_UID_T -AC_CHECK_FUNCS(snprintf vsnprintf strerror) -LYX_CHECK_DECL(snprintf, stdio.h) -LYX_CHECK_DECL(vsnprintf, stdio.h) +AC_CHECK_FUNCS(strerror) LYX_CHECK_DECL(istreambuf_iterator, iterator) LYX_CHECK_DECL(mkstemp,[unistd.h stdlib.h]) +# Check the form of mkdir() +AC_FUNC_MKDIR + AC_ARG_ENABLE(compression-support, AC_HELP_STRING([--enable-compression-support],[Support for compressed files.]),[ case "${enableval}" in yes) use_compression=true ;; @@ -254,7 +289,7 @@ 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.]) + AC_DEFINE(USE_COMPRESSION, 1, [Define as 1 if you want to support compressed files.]) lyx_flags="$lyx_flags compression" fi fi @@ -268,7 +303,7 @@ 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_PUSH(C) -AC_CHECK_FUNCS(memmove memset strchr mkfifo mkstemp mktemp) +AC_CHECK_FUNCS(mkfifo mkstemp mktemp lstat readlink) AC_LANG_POP(C) AC_FUNC_SELECT_ARGTYPES @@ -280,36 +315,33 @@ 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 flags: ${CPPFLAGS} ${CFLAGS}\n\ C++ Compiler: ${CXX} ${CXX_VERSION}\n\ - C++ Compiler flags: ${CXXFLAGS}\n\ + C++ Compiler flags: ${CPPFLAGS} ${CXXFLAGS}\n\ Linker flags: ${LDFLAGS}\n\ ${FRONTEND_INFO}\ + Packaging: ${lyx_use_packaging}\n\ LyX binary dir: ${real_bindir}\n\ LyX files dir: ${real_datadir}\n" AC_SUBST(VERSION_INFO) AC_SUBST(RPM_FRONTEND) -AC_SUBST(RPM_FRONTEND_DEPS) ## Some config.h stuff 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 @@ -319,14 +351,6 @@ AH_BOTTOM([ /************************************************************ ** You should not need to change anything beyond this point */ -#ifndef HAVE_STRCHR -# define strchr(a,b) index(a,b) -#endif - -#ifndef HAVE_MEMMOVE -# define memmove(a,b,c) bcopy(b,a,c) -#endif - #ifndef HAVE_STRERROR #if defined(__cplusplus) extern "C" @@ -334,10 +358,6 @@ extern "C" char * strerror(int n); #endif -#ifdef BROKEN_HEADERS -#include "broken_headers.h" -#endif - #ifdef HAVE_MKSTEMP #ifndef HAVE_DECL_MKSTEMP #if defined(__cplusplus) @@ -351,29 +371,38 @@ int mkstemp(char*); #include "support/os2_defines.h" #endif -#if defined(__CYGWIN__) || defined(__CYGWIN32__) -#include "support/nt_defines.h" -#endif - #if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM) #define USE_BOOST_FORMAT 1 #else #define USE_BOOST_FORMAT 0 #endif +#define BOOST_USER_CONFIG + +#if defined(ENABLE_ASSERTIONS) +#define BOOST_ENABLE_ASSERT_HANDLER 1 +#else +#define BOOST_DISABLE_ASSERTS 1 +#endif + #define BOOST_DISABLE_THREADS 1 -#define BOOST_NO_EXCEPTIONS 1 #define BOOST_NO_WREGEX 1 #define BOOST_NO_WSTRING 1 +#ifdef __CYGWIN__ +#define BOOST_POSIX 1 +#endif + #endif ]) ### Finish the work. AC_CONFIG_SUBDIRS(lib lib/reLyX) -AC_CONFIG_FILES([Makefile \ +AC_CONFIG_FILES([Makefile m4/Makefile \ boost/Makefile \ boost/libs/Makefile \ + boost/libs/filesystem/Makefile \ + boost/libs/filesystem/src/Makefile \ boost/libs/regex/Makefile \ boost/libs/regex/src/Makefile \ boost/libs/signals/Makefile \ @@ -382,10 +411,12 @@ AC_CONFIG_FILES([Makefile \ development/Makefile \ development/lyx.spec \ lib/Makefile \ + lib/doc/Makefile \ intl/Makefile \ po/Makefile.in \ sourcedoc/Doxyfile \ sourcedoc/Makefile \ + src/client/Makefile \ src/Makefile \ src/version.C-tmp:src/version.C.in \ src/tex2lyx/Makefile \ @@ -393,12 +424,16 @@ AC_CONFIG_FILES([Makefile \ src/graphics/Makefile \ src/insets/Makefile \ src/support/Makefile \ + src/support/tests/Makefile \ src/frontends/Makefile \ src/frontends/controllers/Makefile \ src/frontends/xforms/Makefile \ 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/gimages/Makefile \ + src/frontends/gtk/glade/Makefile \ src/frontends/qt2/Makefile \ src/frontends/qt2/moc/Makefile \ src/frontends/qt2/ui/Makefile \