X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=d1b78f95d210d81adfa7ff8782874cedb6ba1f32;hb=7cda8f36b21a23d925aa4296beda05c22eca1959;hp=1480fe188a918fd6502fae4560eb5e6c704f0d71;hpb=e8daa48bc163ac9d6372d75337692fdaf9ab549d;p=lyx.git diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 1480fe188a..d1b78f95d2 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -19,10 +19,10 @@ AC_ARG_ENABLE(build-type, prof*) build_type=profiling;; gprof*) build_type=gprof;; rel*) build_type=release;; - *) AC_ERROR([Bad build type specification \"$enableval\". Please use one of rel(ease), pre(release), dev(elopment), prof(iling), or gprof]);; + *) AC_MSG_ERROR([bad build type specification \"$enableval\". Please use one of rel(ease), pre(release), dev(elopment), prof(iling), or gprof]);; esac], [case AC_PACKAGE_VERSION in - *svn*) build_type=development;; + *dev*) build_type=development;; *pre*|*alpha*|*beta*|*rc*) build_type=prerelease;; *) build_type=release ;; esac]) @@ -34,7 +34,7 @@ case $build_type in LYX_DATE="not released yet" ;; prerelease) lyx_prerelease=yes ;; esac - + AC_SUBST(lyx_devel_version) ]) @@ -56,19 +56,11 @@ AC_ARG_WITH(version-suffix, AC_SUBST(version_suffix,$withval) RPM_VERSION_SUFFIX="--with-version-suffix=$withval"]) AC_SUBST(RPM_VERSION_SUFFIX) +AC_SUBST(program_base_name,"lyx") AC_MSG_RESULT([$withval]) ]) -dnl Usage: LYX_ERROR(message) Displays the warning "message" and sets the -dnl flag lyx_error to yes. -AC_DEFUN([LYX_ERROR],[ -lyx_error_txt="$lyx_error_txt -** $1 -" -lyx_error=yes]) - - dnl Usage: LYX_WARNING(message) Displays the warning "message" and sets the dnl flag lyx_warning to yes. AC_DEFUN([LYX_WARNING],[ @@ -81,36 +73,20 @@ lyx_warning=yes]) dnl Usage: LYX_LIB_ERROR(file,library) Displays an error message indication dnl that 'file' cannot be found because 'lib' may be uncorrectly installed. AC_DEFUN([LYX_LIB_ERROR],[ -LYX_ERROR([Cannot find $1. Please check that the $2 library +AC_MSG_ERROR([cannot find $1. Please check that the $2 library is correctly installed on your system.])]) -dnl Usage: LYX_CHECK_ERRORS Displays a warning message if a LYX_ERROR +dnl Usage: LYX_CHECK_WARNINGS Displays a warning message if a LYX_WARNING dnl has occured previously. -AC_DEFUN([LYX_CHECK_ERRORS],[ +AC_DEFUN([LYX_CHECK_WARNINGS],[ if test x$lyx_warning = xyes; then cat <], [boost::signal s;])], [lyx_boost_underscore=yes], []) - LDFLAGS="$SAVED_LDFLAGS -lboost_signals-mt -lm $LIBTHREAD" - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [boost::signal s;])], [lyx_boost_underscore_mt=yes], []) + LIBS="$save_LIBS -lboost_signals -lm" + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [boost::signal s;])], [lyx_boost_plain=yes], []) + LIBS="$save_LIBS -lboost_signals-mt -lm $LIBTHREAD" + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [boost::signal s;])], [lyx_boost_mt=yes], []) - LDFLAGS=$SAVED_LDFLAGS + LIBS=$save_LIBS AC_LANG_POP(C++) - if test x$lyx_boost_underscore_mt = xyes ; then + if test x$lyx_boost_mt = xyes ; then BOOST_MT="-mt" else BOOST_MT="" - if test x$lyx_boost_plain != xyes -a x$lyx_boost_underscore != xyes ; then - LYX_ERROR([No suitable boost library found (do not use --without-included-boost)]) + if test x$lyx_boost_plain != xyes ; then + AC_MSG_ERROR([cannot find suitable boost library (do not use --without-included-boost)]) fi fi - AC_SUBST(BOOST_SEP) AC_SUBST(BOOST_MT) fi ]) @@ -368,7 +358,7 @@ AC_DEFUN([LYX_USE_INCLUDED_MYTHES],[ fi AC_LANG_POP(C++) if test x$lyx_mythes != xyes -o x$ac_cv_header_mythes_h != xyes; then - LYX_ERROR([No suitable MyThes library found (do not use --without-included-mythes)]) + AC_MSG_ERROR([cannot find suitable MyThes library (do not use --without-included-mythes)]) fi AC_DEFINE(USE_EXTERNAL_MYTHES, 1, [Define as 1 to use an external MyThes library]) AC_DEFINE_UNQUOTED(MYTHES_H_LOCATION,$lyx_cv_mythes_h_location,[Location of mythes.hxx]) @@ -459,25 +449,6 @@ rm -f conftest*]) ]) ### end of LYX_PATH_HEADER -### Check which frontends we want to use. -### -AC_DEFUN([LYX_USE_FRONTENDS], -[AC_MSG_CHECKING([what frontend should be used for the GUI]) -AC_ARG_WITH(frontend, - [AC_HELP_STRING([--with-frontend=THIS], [use THIS frontend as main GUI: - Possible values: qt4])], - [FRONTENDS="$withval"],[FRONTENDS="qt4"]) -if test "x$FRONTENDS" = x ; then - AC_MSG_RESULT(none) - AC_ERROR("Please select a frontend using --with-frontend") -fi -AC_MSG_RESULT($FRONTENDS) -AC_SUBST(FRONTENDS) -AC_SUBST(FRONTENDS_SUBDIRS) -AC_SUBST(FRONTENDS_PROGS) -]) - - ## Check what kind of packaging should be used at install time. ## The default is autodetected. AC_DEFUN([LYX_USE_PACKAGING], @@ -499,6 +470,7 @@ case $lyx_use_packaging in macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout]) PACKAGE=LyX${version_suffix} default_prefix="/Applications/${PACKAGE}.app" + AC_SUBST(osx_bundle_program_name,"${program_base_name}") bindir='${prefix}/Contents/MacOS' libdir='${prefix}/Contents/Resources' datarootdir='${prefix}/Contents/Resources' @@ -521,15 +493,15 @@ case $lyx_use_packaging in default_prefix=$ac_default_prefix case ${host} in *cygwin*) lyx_install_cygwin=true ;; - esac ;; - *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;; + *apple-darwin*) lyx_install_macosx=true ;; + esac + lyx_install_posix=true ;; + *) AC_MSG_ERROR([unknown packaging type $lyx_use_packaging.]) ;; esac AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx) -AM_CONDITIONAL(INSTALL_CYGWIN, $lyx_install_cygwin) AM_CONDITIONAL(INSTALL_WINDOWS, $lyx_install_windows) -dnl Next two lines are only for autoconf <= 2.59 -datadir='${datarootdir}' -AC_SUBST(datarootdir) +AM_CONDITIONAL(INSTALL_CYGWIN, $lyx_install_cygwin) +AM_CONDITIONAL(INSTALL_POSIX, $lyx_install_posix) AC_SUBST(pkgdatadir) AC_SUBST(program_suffix) ])