X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=9ae83b7af5d5dce13f7a469d74bd64149d13efb7;hb=4c6e0fe4226ce3b55d13726977f1e579f17c2ad1;hp=edb223f2551ad204464703816b21e96d2412f131;hpb=02aa32e2eb36ba988af300d93d83b10b9e8f8ccd;p=lyx.git diff --git a/configure.ac b/configure.ac index edb223f255..9ae83b7af5 100644 --- a/configure.ac +++ b/configure.ac @@ -167,7 +167,7 @@ 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' @@ -188,9 +188,22 @@ for frontend in $FRONTENDS ; do 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" + FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt\$(EXEEXT)" FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt2" RPM_FRONTEND="qt" RPM_FRONTEND_DEPS='qt >= 2.2.1' @@ -199,7 +212,7 @@ for frontend in $FRONTENDS ; do Qt version: ${QT_VERSION}\n" ;; *) - LYX_ERROR(Unknown frontend $lyx_use_frontend);; + LYX_ERROR(Unknown frontend '$frontend');; esac done @@ -297,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 @@ -362,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 @@ -387,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 \ @@ -396,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 \