]> git.lyx.org Git - lyx.git/blobdiff - config/lyxinclude.m4
typo
[lyx.git] / config / lyxinclude.m4
index a21ce0a6fc2c35847de4012f0731f207b6a5eed1..c781c1e57403a0cc1010669ecc074150bc4f2b3a 100644 (file)
@@ -8,9 +8,10 @@ dnl Usage LYX_CHECK_VERSION   Displays version of LyX being built and
 dnl sets variable "build_type"
 AC_DEFUN([LYX_CHECK_VERSION],[
 echo "configuring LyX version" AC_PACKAGE_VERSION
+
+AC_MSG_CHECKING([for build type])
 lyx_devel_version=no
 lyx_prerelease=no
-AC_MSG_CHECKING([for build type])
 AC_ARG_ENABLE(build-type,
   AC_HELP_STRING([--enable-build-type=TYPE],[set build setting according to TYPE=rel(ease), pre(release), dev(elopment), prof(iling), gprof]),
   [case $enableval in
@@ -19,10 +20,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*|*dev*) build_type=development;;
+    *dev*) build_type=development;;
     *pre*|*alpha*|*beta*|*rc*) build_type=prerelease;;
     *) build_type=release ;;
    esac])
@@ -34,10 +35,20 @@ case $build_type in
                 LYX_DATE="not released yet" ;;
     prerelease) lyx_prerelease=yes ;;
 esac
-    
+
 AC_SUBST(lyx_devel_version)
 ])
 
+dnl If LyX is compiled from a git clone, find the HEAD commit hash
+dnl
+dnl
+AC_DEFUN([LYX_CHECK_GIT_COMMIT], [
+AC_MSG_CHECKING([for git commit hash])
+lyxgitcommit=`cd "$srcdir" && git log -1 --pretty=format:%H 2>/dev/null || true`
+test x$lyxgitcommit = x && lyxgitcommit="none"
+AC_MSG_RESULT($lyxgitcommit)
+])
+
 
 dnl Define the option to set a LyX version on installed executables and directories
 dnl
@@ -61,15 +72,6 @@ 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],[
@@ -82,36 +84,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 <<EOF
 === The following minor problems have been detected by configure.
 === Please check the messages below before running 'make'.
 === (see the section 'Problems' in the INSTALL file)
 $lyx_warning_txt
-EOF
-fi
-if test x$lyx_error = xyes; then
-cat <<EOF
-**** The following problems have been detected by configure.
-**** Please check the messages below before running 'make'.
-**** (see the section 'Problems' in the INSTALL file)
-$lyx_error_txt
-$lyx_warning_txt
-EOF
-exit 1
-else
 
-cat <<EOF
-Configuration of LyX was successful.
-Type 'make' to compile the program,
-and then 'make install' to install it.
 EOF
 fi])
 
@@ -207,11 +193,6 @@ AC_ARG_ENABLE(concept-checks,
          [enable_concept_checks=no])]
 )
 
-AC_ARG_ENABLE(gprof,
-  AC_HELP_STRING([--enable-gprof],[enable profiling using gprof]),,
-  [AS_CASE([$build_type], [gprof], [enable_gprof=yes], [enable_gprof=no])]
-)
-
 ### set up optimization
 AC_ARG_ENABLE(optimization,
     AC_HELP_STRING([--enable-optimization[=value]],[enable compiler optimisation]),,
@@ -256,16 +237,20 @@ if test x$GXX = xyes; then
   if test "$ac_test_CXXFLAGS" = set; then
     CXXFLAGS="$ac_save_CXXFLAGS"
   else
-      CFLAGS="$lyx_opt"
-      CXXFLAGS="$lyx_opt"
+    CFLAGS="$lyx_opt"
+    CXXFLAGS="$lyx_opt"
     if test x$enable_debug = xyes ; then
-        CFLAGS="-g $CFLAGS"
-       CXXFLAGS="-g $CXXFLAGS"
+      CFLAGS="-g $CFLAGS"
+      CXXFLAGS="-g $CXXFLAGS"
     fi
-    if test x$enable_gprof = xyes ; then
-        CFLAGS="-pg $CFLAGS"
-        CXXFLAGS="-pg $CXXFLAGS"
-        LDFLAGS="-pg $LDFLAGS"
+    if test $build_type = gprof ; then
+      CFLAGS="-pg $CFLAGS"
+      CXXFLAGS="-pg $CXXFLAGS"
+      LDFLAGS="-pg $LDFLAGS"
+    fi
+    if test $build_type = profiling ; then
+      CFLAGS="$CFLAGS -fno-omit-frame-pointer"
+      CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer"
     fi
   fi
   if test "$ac_env_CPPFLAGS_set" != set; then
@@ -337,28 +322,39 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
            [lyx_cv_with_included_boost=yes])
        AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes)
        AC_MSG_RESULT([$lyx_cv_with_included_boost])
-       if test x$lyx_cv_with_included_boost != xyes ; then
-               AC_LANG_PUSH(C++)
-               save_LIBS=$LIBS
-
-               LIBS="$save_LIBS -lboost_signals -lm"
-               AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_plain=yes], [])
-               LIBS="$save_LIBS -lboost_signals-mt -lm $LIBTHREAD"
-               AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_mt=yes], [])
-
-               LIBS=$save_LIBS
-               AC_LANG_POP(C++)
-
-               if test x$lyx_boost_mt = xyes ; then
-                       BOOST_MT="-mt"
-               else
-                       BOOST_MT=""
-                       if test x$lyx_boost_plain != xyes ; then
-                               LYX_ERROR([No suitable boost library found (do not use --without-included-boost)])
-                       fi
-               fi
-               AC_SUBST(BOOST_MT)
+       if test x$lyx_cv_with_included_boost = xyes ; then
+           BOOST_INCLUDES='-I$(top_srcdir)/boost'
+           BOOST_LIBS='$(top_builddir)/boost/liblyxboost.a'
+       else
+           AC_LANG_PUSH(C++)
+           save_LIBS=$LIBS
+
+           AC_MSG_CHECKING([for multithreaded boost libraries])
+           LIBS="$save_LIBS -lboost_signals-mt -lm $LIBTHREAD"
+           AC_LINK_IFELSE(
+               [AC_LANG_PROGRAM([#include <boost/signal.hpp>],
+                       [boost::signal<void ()> s;])],
+               [AC_MSG_RESULT([yes])
+                BOOST_MT="-mt"],
+               [AC_MSG_RESULT([no])
+                AC_MSG_CHECKING([for plain boost libraries])
+                LIBS="$save_LIBS -lboost_signals -lm"
+                AC_LINK_IFELSE(
+                    [AC_LANG_PROGRAM([#include <boost/signal.hpp>],
+                            [boost::signal<void ()> s;])],
+                    [AC_MSG_RESULT([yes])
+                     BOOST_MT=""],
+                    [AC_MSG_RESULT([no])
+                     AC_MSG_ERROR([cannot find suitable boost library (do not use --without-included-boost)])
+                ])
+           ])
+           LIBS=$save_LIBS
+           AC_LANG_POP(C++)
+           BOOST_INCLUDES=
+           BOOST_LIBS="-lboost_regex${BOOST_MT} -lboost_signals${BOOST_MT}"
        fi
+       AC_SUBST(BOOST_INCLUDES)
+       AC_SUBST(BOOST_LIBS)
 ])
 
 
@@ -384,7 +380,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])
@@ -475,25 +471,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],
@@ -508,6 +485,7 @@ AC_ARG_WITH(packaging,
                   *) lyx_use_packaging=posix;;
   esac])
 AC_MSG_RESULT($lyx_use_packaging)
+lyx_install_posix=false
 lyx_install_macosx=false
 lyx_install_cygwin=false
 lyx_install_windows=false
@@ -541,7 +519,7 @@ case $lyx_use_packaging in
                *apple-darwin*) lyx_install_macosx=true ;;
           esac
           lyx_install_posix=true ;;
-    *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
+    *) AC_MSG_ERROR([unknown packaging type $lyx_use_packaging.]) ;;
 esac
 AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx)
 AM_CONDITIONAL(INSTALL_WINDOWS, $lyx_install_windows)