X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=f81818aa406519edae12134c38d53368c26b9079;hb=68d936250e909b1746ba03968cc5f09b21b5ec04;hp=81e3a123eb5048b35d3f0ea58b3da5ac2fa5a0e8;hpb=76d0ead2b6ed6cf143bf8f45b22150238655cec0;p=lyx.git diff --git a/configure.ac b/configure.ac index 81e3a123eb..f81818aa40 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process with autoconf to generate configure script -*- sh -*- AC_INIT(LyX,2.0.0svn,[lyx-devel@lists.lyx.org],[lyx]) # Use ISO format only. The frontend needs to parse this -AC_SUBST(LYX_DATE, ["2008-11-15"]) +AC_SUBST(LYX_DATE, ["2009-03-25"]) AC_PREREQ(2.52) AC_CONFIG_SRCDIR(src/main.cpp) AC_CONFIG_HEADERS([config.h]) @@ -19,7 +19,7 @@ LYX_USE_PACKAGING # AM_INIT_AUTOMAKE above because we alter $PACKAGE in LYX_USE_PACKAGING. AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -dnl default maintainer mode to true for development versions +dnl Default maintainer mode to true for development versions if test "${enable_maintainer_mode+set}" != set; then enable_maintainer_mode=$lyx_devel_version fi @@ -112,46 +112,10 @@ LYX_ADD_INC_DIR(CPPFLAGS,$dir/include) ### These are needed in windows AC_CHECK_LIB(shlwapi, main, [LIBSHLWAPI=-lshlwapi]) AC_SUBST(LIBSHLWAPI) +AC_CHECK_LIB(psapi, main, [LIBPSAPI=-lpsapi]) +AC_SUBST(LIBPSAPI) AC_CHECK_LIB(gdi32, main) -AC_ARG_WITH(mythes, - [ --without-mythes do not use the MyThes library], - [lyx_use_mythes=$withval]) -if test x$lyx_use_mythes != xno; then -AC_CHECK_LIB(mythes, main, - [AC_DEFINE(HAVE_LIBMYTHES,1,[Define this if you have the MyThes library]) - MYTHES_LIBS="-lmythes" - lyx_flags="mythes $lyx_flags" - ]) -AC_CHECK_HEADER(mythes.hxx,[ - ac_cv_header_mythes_h=yes - lyx_cv_mythes_h_location=""]) -AC_CHECK_HEADER(mythes/mythes.hxx,[ - ac_cv_header_mythes_h=yes - lyx_cv_mythes_h_location=""]) -AC_DEFINE_UNQUOTED(MYTHES_H_LOCATION,$lyx_cv_mythes_h_location,[Location of mythes.hxx]) -fi -AC_SUBST(MYTHES_LIBS) - -AC_ARG_WITH(aiksaurus, - [ --without-aiksaurus do not use the Aiksaurus library], - [lyx_use_aiksaurus=$withval]) -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" - lyx_flags="aiksaurus $lyx_flags" - ]) -AC_CHECK_HEADER(Aiksaurus.h,[ - ac_cv_header_aiksaurus_h=yes - lyx_cv_aiksaurus_h_location=""]) -AC_CHECK_HEADER(Aiksaurus/Aiksaurus.h,[ - ac_cv_header_aiksaurus_h=yes - lyx_cv_aiksaurus_h_location=""]) -AC_DEFINE_UNQUOTED(AIKSAURUS_H_LOCATION,$lyx_cv_aiksaurus_h_location,[Location of Aiksaurus.h]) -fi -AC_SUBST(AIKSAURUS_LIBS) - LYX_USE_INCLUDED_BOOST # Needed for our char_type @@ -358,6 +322,7 @@ char * strerror(int n); #define BOOST_NO_WSTRING 1 #ifdef __CYGWIN__ +# define NOMINMAX # define BOOST_POSIX 1 # define BOOST_POSIX_API 1 # define BOOST_POSIX_PATH 1 @@ -384,48 +349,26 @@ char * strerror(int n); #endif ]) - -AC_ARG_ENABLE(monolithic-boost, - AC_HELP_STRING([--enable-monolithic-boost], - [Use monolithic boost compilations]),, - [enable_monolithic_boost=no]) -AM_CONDITIONAL(MONOLITHIC_BOOST, test "$enable_monolithic_boost" = "yes") - -AC_ARG_ENABLE(monolithic-client, - AC_HELP_STRING([--enable-monolithic-client], - [Use monolithic client compilations]),, - [enable_monolithic_client=no]) -AM_CONDITIONAL(MONOLITHIC_CLIENT, test "$enable_monolithic_client" = "yes") - -AC_ARG_ENABLE(monolithic-insets, - AC_HELP_STRING([--enable-monolithic-insets], - [Use monolithic insets compilations]),, - [enable_monolithic_insets=no]) -AM_CONDITIONAL(MONOLITHIC_INSETS, test "$enable_monolithic_insets" = "yes") - -AC_ARG_ENABLE(monolithic-mathed, - AC_HELP_STRING([--enable-monolithic-mathed], - [Use monolithic mathed compilations]),, - [enable_monolithic_mathed=no]) -AM_CONDITIONAL(MONOLITHIC_MATHED, test "$enable_monolithic_mathed" = "yes") - -AC_ARG_ENABLE(monolithic-core, - AC_HELP_STRING([--enable-monolithic-core], - [Use monolithic core files compilations]),, - [enable_monolithic_core=no]) -AM_CONDITIONAL(MONOLITHIC_CORE, test "$enable_monolithic_core" = "yes") - -AC_ARG_ENABLE(monolithic-tex2lyx, - AC_HELP_STRING([--enable-monolithic-tex2lyx], - [Use monolithic tex2lyx compilations]),, - [enable_monolithic_tex2lyx=no]) -AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test "$enable_monolithic_tex2lyx" = "yes") - -AC_ARG_ENABLE(monolithic-frontend-qt4, - AC_HELP_STRING([--enable-monolithic-frontend-qt4], - [Use monolithic compilation of the Qt 4 frontend. Only recommended with > 512 MB of RAM]),, - [enable_monolithic_frontend_qt4=no]) -AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT4, test "$enable_monolithic_frontend_qt4" = "yes") +m4_define([ALLPARTS],[boost,client,insets,mathed,core,tex2lyx,frontend_qt4]) +AC_ARG_ENABLE(monolithic-build, + AC_HELP_STRING([--enable-monolithic-build@<:@=LIST@:>@], + [Use monolithic build for modules in LIST (default: ALLPARTS)]), + [test "$enable_monolithic_build" = yes && enable_monolithic_build="ALLPARTS" + test "$enable_monolithic_build" = no && enable_monolithic_build= + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=" ," + for i in $enable_monolithic_build ; do + eval "enable_monolithic_$i=yes" + done + IFS="$ac_save_ifs"], + [enable_monolithic_build=]) + +AM_CONDITIONAL(MONOLITHIC_BOOST, test "x$enable_monolithic_boost" = "xyes") +AM_CONDITIONAL(MONOLITHIC_CLIENT, test "x$enable_monolithic_client" = "xyes") +AM_CONDITIONAL(MONOLITHIC_INSETS, test "x$enable_monolithic_insets" = "xyes") +AM_CONDITIONAL(MONOLITHIC_MATHED, test "x$enable_monolithic_mathed" = "xyes") +AM_CONDITIONAL(MONOLITHIC_CORE, test "x$enable_monolithic_core" = "xyes") +AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test "x$enable_monolithic_tex2lyx" = "xyes") +AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT4, test "x$enable_monolithic_frontend_qt4" = "xyes") MSYS_AC_CANONICAL_PATH(lyx_abs_top_srcdir, ${srcdir}) MSYS_AC_CANONICAL_PATH(lyx_abs_installed_localedir, ${real_localedir}) @@ -458,6 +401,8 @@ AC_CONFIG_FILES([Makefile \ development/MacOSX/Info.plist \ development/MacOSX/lyxrc.dist \ development/MacOSX/spotlight/Makefile \ + development/cygwin/Makefile \ + development/cygwin/lyxrc.dist \ development/lyx.spec \ intl/Makefile \ lib/Makefile \ @@ -472,6 +417,7 @@ AC_CONFIG_FILES([Makefile \ src/client/lyxclient.1:src/client/lyxclient.1in \ src/Makefile \ src/tex2lyx/Makefile \ + src/tex2lyx/tex2lyx.1:src/tex2lyx/tex2lyx.1in \ src/support/Makefile \ src/frontends/Makefile \ src/frontends/qt4/Makefile