X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=e532c54d87e17a576784b0a3ab8a6a3d6e9e7f15;hb=3a5c0f66a008f9e7baadd017ff0b37c4f6789b6a;hp=1480fe188a918fd6502fae4560eb5e6c704f0d71;hpb=e8daa48bc163ac9d6372d75337692fdaf9ab549d;p=lyx.git

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 1480fe188a..e532c54d87 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -22,7 +22,7 @@ AC_ARG_ENABLE(build-type,
     *) AC_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;;
+    *svn*|*dev*) build_type=development;;
     *pre*|*alpha*|*beta*|*rc*) build_type=prerelease;;
     *) build_type=release ;;
    esac])
@@ -56,6 +56,7 @@ 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])
 ])
 
@@ -322,25 +323,24 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
 	AC_MSG_RESULT([$lyx_cv_with_included_boost])
 	if test x$lyx_cv_with_included_boost != xyes ; then
 		AC_LANG_PUSH(C++)
-		SAVED_LDFLAGS=$LDFLAGS
+		save_LIBS=$LIBS
 
-		LDFLAGS="$SAVED_LDFLAGS -lboost_signals -lm"
-		AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_underscore=yes], [])
-		LDFLAGS="$SAVED_LDFLAGS -lboost_signals-mt -lm $LIBTHREAD"
-		AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_underscore_mt=yes], [])
+		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], [])
 
-		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
+			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_SEP)
 		AC_SUBST(BOOST_MT)
 	fi
 ])
@@ -499,6 +499,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,12 +522,15 @@ case $lyx_use_packaging in
 	   default_prefix=$ac_default_prefix
 	   case ${host} in
 	   *cygwin*) lyx_install_cygwin=true ;;
-	   esac ;;
+		*apple-darwin*) lyx_install_macosx=true ;;
+	   esac
+	   lyx_install_posix=true ;;
     *) LYX_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)
+AM_CONDITIONAL(INSTALL_CYGWIN, $lyx_install_cygwin)
+AM_CONDITIONAL(INSTALL_POSIX, $lyx_install_posix)
 dnl Next two lines are only for autoconf <= 2.59
 datadir='${datarootdir}'
 AC_SUBST(datarootdir)