X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=c9b36ed9f6a833eadf57324c55d9e9c1f2c0ae3e;hb=66f527e417de916105680696bd44d7ad91ff60cb;hp=3f317a09354b7fc51e6111a201a33fcd1276730f;hpb=41405babc526fa70ccc6ebbff30b03881762f6cb;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 3f317a0935..c9b36ed9f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,11 +63,24 @@ for file in config/install-sh ; do
   chmod 755 ${srcdir}/${file}
 done
 
-AM_PATH_PYTHON(2.4.0,, :)
+# Find a suitable python interpreter
+LYX_PATH_PYTHON23([2.7.0], [3.3.0])
+# do the usual python setup stuff
+AM_PATH_PYTHON
 AC_PROG_RANLIB
 
 ### Check for a C++ compiler
+dnl We have to do weird tricks so that autoconf does not touch CXXFLAGS even
+dnl if it is not set. We do not use autoconf defaults.
+lyx_has_CXXFLAGS=${CXXFLAGS+yes}
+if ! test "$lyx_has_CXXFLAGS" = yes; then
+  dnl set to a dummy value so that AC_PROG_CXX does not try to set CXXFLAGS
+  CXXFLAGS=" "
+fi
 LYX_PROG_CXX
+if ! test "$lyx_has_CXXFLAGS" = yes; then
+  unset CXXFLAGS
+fi
 AC_LANG(C++)
 
 ### Objective-C compiler
@@ -87,8 +100,9 @@ test ! x"$lyx_cppflags" = x && CPPFLAGS="$lyx_cppflags $CPPFLAGS"
 ### Add both includes and libraries
 LYX_WITH_DIR([extra-prefix],[extra lib+include directory],extra_prefix, NONE, ${prefix})
 LYX_LOOP_DIR($lyx_cv_extra_prefix,[
-LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
-  LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
+  LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
+  LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)
+])
 
 ### These are needed in windows
 AC_CHECK_LIB(shlwapi, main, [LIBSHLWAPI=-lshlwapi])
@@ -139,7 +153,7 @@ QT_DO_IT_ALL([4.5.0])
 AC_SUBST([FRONTENDS_SUBDIRS], [qt4])
 FRONTEND_INFO="${FRONTEND_INFO}\
   Qt Frontend:\n\
-      Qt version:\t\t${QTLIB_VERSION}\n"
+      Qt version:\t   ${QTLIB_VERSION}\n"
 
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$default_prefix
@@ -218,22 +232,21 @@ real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
 real_pkgdatadir=`eval "echo \`eval \"echo \\\`eval \\\"echo ${pkgdatadir}\\\"\\\`\"\`"`
 real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
 VERSION_INFO="Configuration\n\
-  Host type:                    ${host}\n\
-  Special build flags:         ${lyx_flags}\n\
-  C++ Compiler:                 ${CXX} ${CXX_VERSION}\n\
-  C++ Compiler LyX flags:       ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
-  C++ Compiler flags:           ${CPPFLAGS} ${CXXFLAGS}\n\
-  Linker flags:                 ${AM_LDFLAGS}\n\
-  Linker user flags:            ${LDFLAGS}\n\
+  Host type:               ${host}\n\
+  Special build flags:     ${lyx_flags}\n\
+  C++ Compiler:            ${CXX} ${CXX_VERSION}\n\
+  C++ Compiler flags:      ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
+  C++ Compiler user flags: ${CPPFLAGS} ${CXXFLAGS}\n\
+  Linker flags:            ${AM_LDFLAGS}\n\
+  Linker user flags:       ${LDFLAGS}\n\
 ${FRONTEND_INFO}\
-  Packaging:                    ${lyx_use_packaging}\n\
-  LyX binary dir:               ${real_bindir}\n\
-  LyX files dir:                ${real_pkgdatadir}\n"
+  Packaging:               ${lyx_use_packaging}\n\
+  LyX binary dir:          ${real_bindir}\n\
+  LyX files dir:           ${real_pkgdatadir}\n"
 
 AC_SUBST(VERSION_INFO)
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_CXXFLAGS)
-AC_SUBST(AM_CFLAGS)
 AC_SUBST(AM_LDFLAGS)
 AC_SUBST(real_pkgdatadir)