remove annoying debug message

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2be419db4ef147b6834e91189ad40f5d4c76010e..30ac13ab273bd41e9729147d56ba470d82fa1da9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -296,20 +296,20 @@ 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:                   ${CC} ${CC_VERSION}\n\
-  C   Compiler LyX flags:         ${AM_CPPFLAGS} ${AM_CFLAGS}\n\
-  C   Compiler flags:             ${CPPFLAGS} ${CFLAGS}\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:                 ${CC} ${CC_VERSION}\n\
+  C   Compiler LyX flags:       ${AM_CPPFLAGS} ${AM_CFLAGS}\n\
+  C   Compiler flags:           ${CPPFLAGS} ${CFLAGS}\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\
 ${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"
 
 MSYS_AC_CANONICAL_PATH(LYX_ABS_TOP_SRCDIR, ${srcdir})
 MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_LOCALEDIR, ${real_localedir})
@@ -400,13 +400,17 @@ char * strerror(int n);
 ])
 
 
+AC_ARG_WITH(qmake,
+       AC_HELP_STRING([--with-qmake],
+               [Use qmake instead of automake to generate Makefiles]),,
+       [with_qmake=no])
+
 AC_ARG_ENABLE(monolithic-boost,
   AC_HELP_STRING([--enable-monolithic-boost],
                [Use monolithic boost compilations]),,
   [enable_monolithic_boost=no])
 AM_CONDITIONAL(MONOLITHIC_BOOST, test $enable_monolithic_boost = yes)
 
-
 AC_DEFINE_UNQUOTED([LYX_DATE],"$LYX_DATE",[Date of release])
 AC_DEFINE_UNQUOTED([VERSION_INFO],"$VERSION_INFO",[Full version info])
 AC_DEFINE_UNQUOTED([LYX_MAJOR_VERSION],$lyx_major,[Major version number])
@@ -414,34 +418,38 @@ AC_DEFINE_UNQUOTED([LYX_MINOR_VERSION],$lyx_minor,[Minor version number])
 AC_DEFINE_UNQUOTED([LYX_RELEASE_LEVEL],$lyx_release,[Release version number])
 AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number])
 
-### Finish the work.
+
 AC_CONFIG_FILES([Makefile
-       boost/Makefile \
-       config/Makefile \
-       development/Makefile \
-       development/MacOSX/Makefile \
-       development/MacOSX/Info.plist \
-       development/MacOSX/lyxrc.dist \
-       development/MacOSX/spotlight/Makefile \
-       development/lyx.spec \
-       intl/Makefile \
-       lib/Makefile \
-       lib/doc/Makefile \
-       lib/lyx2lyx/lyx2lyx_version.py \
-       lib/lyx2lyx/Makefile \
-       m4/Makefile \
-       po/Makefile.in \
-       sourcedoc/Doxyfile \
-       sourcedoc/Makefile \
-       src/client/Makefile \
-       src/Makefile \
-       src/tex2lyx/Makefile \
-       src/support/Makefile \
-       src/frontends/Makefile \
-       src/frontends/controllers/Makefile \
-       src/frontends/qt4/Makefile \
+      boost/Makefile \
+      config/Makefile \
+      development/Makefile \
+      development/MacOSX/Makefile \
+      development/MacOSX/Info.plist \
+      development/MacOSX/lyxrc.dist \
+      development/MacOSX/spotlight/Makefile \
+      development/lyx.spec \
+      intl/Makefile \
+      lib/Makefile \
+      lib/doc/Makefile \
+      lib/lyx2lyx/lyx2lyx_version.py \
+      lib/lyx2lyx/Makefile \
+      m4/Makefile \
+      po/Makefile.in \
+      sourcedoc/Doxyfile \
+      sourcedoc/Makefile \
+      src/client/Makefile \
+      src/Makefile \
+      src/tex2lyx/Makefile \
+      src/support/Makefile \
+      src/frontends/Makefile \
+      src/frontends/controllers/Makefile \
+      src/frontends/qt4/Makefile
 ])
 
+
+test x$with_qmake = xyes && ${srcdir}/development/qmake/doit
+
+
 AC_OUTPUT
 # show version information
 echo