X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fconfigure.ac;h=39aacc85b067aa4d679ab7ec4a9aee7f8969a8b0;hb=feee60b0f3818a7ff963db47c79723201d9de615;hp=0a7cacb07fa07edbd5807c78feb53268f41304be;hpb=029ded31ea206c5f4bc84219a2a69935f380bdb9;p=lyx.git diff --git a/config/configure.ac b/config/configure.ac index 0a7cacb07f..39aacc85b0 100644 --- a/config/configure.ac +++ b/config/configure.ac @@ -1,6 +1,6 @@ dnl Process with autoconf to generate configure script -*- sh -*- -AC_INIT(lyx,1.3.0cvs,lyx-devel@lists.lyx.org) +AC_INIT(lyx,1.3.0pre2,lyx-devel@lists.lyx.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR(src/main.C) AM_CONFIG_HEADER([src/config.h]) @@ -8,7 +8,7 @@ AM_CONFIG_HEADER([src/config.h]) AC_CONFIG_AUX_DIR(config) PACKAGE=lyx${program_suffix} -VERSION="1.3.0cvs" +VERSION="1.3.0pre2" LYX_CHECK_VERSION AC_CANONICAL_TARGET @@ -57,8 +57,6 @@ AC_AIX ### check which frontend we want to use LYX_USE_FRONTEND -#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 @@ -171,20 +169,20 @@ case "$lyx_use_frontend" in FRONTEND_INFO=" libXpm version: ${XPM_VERSION}\n\ libforms version: ${XFORMS_VERSION}\n" ;; - gnome) - LYX_PATH_XPM - LYX_PATH_XFORMS - LYX_CHECK_XFORMS_IMAGE_LOADER - 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}" - ;; +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="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} " +dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}" +dnl ;; qt) QT_DO_IT_ALL FRONTEND="qt2" @@ -361,11 +359,13 @@ AC_CONFIG_FILES([Makefile \ boost/libs/signals/Makefile \ boost/libs/signals/src/Makefile \ config/Makefile \ + development/Makefile \ development/lyx.spec \ lib/Makefile \ intl/Makefile \ po/Makefile.in \ sourcedoc/Doxyfile \ + sourcedoc/Makefile \ src/Makefile \ src/version.C \ src/mathed/Makefile \