X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=c9b36ed9f6a833eadf57324c55d9e9c1f2c0ae3e;hb=7970b840492e43db981b840c7a52eb2478dd0305;hp=b22dab092cc4a91b1fc6ff85392ef37bc3e12a9a;hpb=ff42fea8ab70dc048bb28dc51120ae30309a3e81;p=lyx.git

diff --git a/configure.ac b/configure.ac
index b22dab092c..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
@@ -82,12 +95,12 @@ test ! x"$lyx_ldflags" = x && LDFLAGS="$lyx_ldflags $LDFLAGS"
 ### Add extra directories to check for include files.
 LYX_WITH_DIR([extra-inc],[extra include directory],extra_inc, NONE)
 LYX_LOOP_DIR($lyx_cv_extra_inc,LYX_ADD_INC_DIR(lyx_cppflags,$dir))
-test ! x"$lyx_cppflags" = x && AM_CPPFLAGS="$lyx_cppflags $AM_CPPFLAGS"
+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(AM_CPPFLAGS,$dir/include)
+  LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
   LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)
 ])
 
@@ -140,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