configure.ac | 222 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 111 insertions(+), 111 deletions(-)
New commits: commit ed24328debac297170a9bd761174ab0babacc760 Author: Andras Timar <[email protected]> Date: Mon Oct 22 17:26:46 2012 +0200 make a configure message less confusing Change-Id: I99b6fde467384aca690cdd0bd5b08e327c926f10 diff --git a/configure.ac b/configure.ac index 4971df9..29804ec 100644 --- a/configure.ac +++ b/configure.ac @@ -3224,7 +3224,7 @@ if test "$_os" = "WINNT"; then LINK_X64_BINARY= LIBMGR_X64_BINARY= - AC_MSG_CHECKING([for a x64 compiler and libraries for 64bit ActiveX component]) + AC_MSG_CHECKING([for a x64 compiler and libraries for 64-bit Explorer extensions]) if test "$BITNESS_OVERRIDE" = "" -a -f "$with_cl_home/atlmfc/lib/amd64/atls.lib"; then # Prefer native x64 compiler to cross-compiler, in case we are running # the build on a 64-bit OS. @@ -3244,7 +3244,7 @@ if test "$_os" = "WINNT"; then AC_MSG_RESULT([found]) else AC_MSG_RESULT([not found]) - AC_MSG_WARN([Installation set will not contain the 64-bit Explorer extension]) + AC_MSG_WARN([Installation set will not contain 64-bit Explorer extensions]) fi AC_SUBST(BUILD_X64) commit 1a90251fd23f6a25518cefe31af57880808bf482 Author: LuboÅ¡ LuÅák <[email protected]> Date: Mon Oct 22 17:25:40 2012 +0200 move the ENABLE_DBGUTIL block higher in configure the cpu/arch/gui/whatever block that follows it uses at least PROEXT diff --git a/configure.ac b/configure.ac index 7b39f3e..4971df9 100644 --- a/configure.ac +++ b/configure.ac @@ -3307,6 +3307,115 @@ if test "$CCACHE" != ""; then AC_LANG_POP([C]) fi +dnl Set the ENABLE_DBGUTIL variable +dnl =================================================================== +AC_MSG_CHECKING([whether to build with additional debug utilities]) +if test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then + ENABLE_DBGUTIL="TRUE" + PROEXT="" + PRODUCT="" + + AC_MSG_RESULT([yes]) + # cppunit and graphite expose STL in public headers + if test "$with_system_cppunit" = "yes"; then + AC_MSG_ERROR([--with-system-cppunit conflicts with --enable-dbgutil]) + else + with_system_cppunit=no + fi + if test "$with_system_graphite" = "yes"; then + AC_MSG_ERROR([--with-system-graphite conflicts with --enable-dbgutil]) + else + with_system_graphite=no + fi + if test "$with_system_mysql_cppconn" = "yes"; then + AC_MSG_ERROR([--with-system-mysql-cppconn conflicts with --enable-dbgutil]) + else + with_system_mysql_cppconn=no + fi +else + ENABLE_DBGUTIL="" + # PRODUCT is old concept, still used by build.pl . + PRODUCT="full" + PROEXT=".pro" + AC_MSG_RESULT([no]) +fi +AC_SUBST(ENABLE_DBGUTIL) +AC_SUBST(PRODUCT) +AC_SUBST(PROEXT) + +dnl Set the ENABLE_DEBUG variable. +dnl =================================================================== +AC_MSG_CHECKING([whether to do a debug build]) +if test -n "$enable_debug" && test "$enable_debug" != "yes" && test "$enable_debug" != "no"; then + AC_MSG_ERROR([--enable-debug now accepts only yes or no, use --enable-selective-debuginfo]) +fi +if test -n "$ENABLE_DBGUTIL"; then + if test "$enable_debug" = "no"; then + AC_MSG_ERROR([--disable-debug cannot be used with --enable-dbgutil]) + fi + ENABLE_DEBUG="TRUE" + AC_MSG_RESULT([yes (dbgutil)]) +elif test -n "$enable_debug" && test "$enable_debug" != "no"; then + ENABLE_DEBUG="TRUE" + AC_MSG_RESULT([yes]) +else + ENABLE_DEBUG="" + AC_MSG_RESULT([no]) +fi +AC_SUBST(ENABLE_DEBUG) + +dnl Selective debuginfo +ENABLE_DEBUGINFO_FOR= +if test -n "$ENABLE_DEBUG"; then + AC_MSG_CHECKING([whether to use selective debuginfo]) + if test -n "$enable_selective_debuginfo" -a "$enable_selective_debuginfo" != "no"; then + ENABLE_DEBUGINFO_FOR="$enable_selective_debuginfo" + AC_MSG_RESULT([for "$enable_selective_debuginfo"]) + else + ENABLE_DEBUGINFO_FOR=all + AC_MSG_RESULT([no, for all]) + fi +fi +AC_SUBST(ENABLE_DEBUGINFO_FOR) + +dnl Check for explicit C/CXX/OBJC/OBJCXX/LDFLAGS. We by default use the ones specified +dnl by our build system, but explicit override is possible. +AC_MSG_CHECKING(for explicit CFLAGS) +if test -n "$CFLAGS"; then + AC_MSG_RESULT([$CFLAGS]) +else + AC_MSG_RESULT(no) +fi +AC_MSG_CHECKING(for explicit CXXFLAGS) +if test -n "$CXXFLAGS"; then + AC_MSG_RESULT([$CXXFLAGS]) +else + AC_MSG_RESULT(no) +fi +AC_MSG_CHECKING(for explicit OBJCFLAGS) +if test -n "$OBJCFLAGS"; then + AC_MSG_RESULT([$OBJCFLAGS]) +else + AC_MSG_RESULT(no) +fi +AC_MSG_CHECKING(for explicit OBJCXXFLAGS) +if test -n "$OBJCXXFLAGS"; then + AC_MSG_RESULT([$OBJCXXFLAGS]) +else + AC_MSG_RESULT(no) +fi +AC_MSG_CHECKING(for explicit LDFLAGS) +if test -n "$LDFLAGS"; then + AC_MSG_RESULT([$LDFLAGS]) +else + AC_MSG_RESULT(no) +fi +AC_SUBST(CFLAGS) +AC_SUBST(CXXFLAGS) +AC_SUBST(OBJCFLAGS) +AC_SUBST(OBJCXXFLAGS) +AC_SUBST(LDFLAGS) + # # determine CPU, CPUNAME, GUI, GUIBASE, ... # @@ -4169,115 +4278,6 @@ else fi AC_SUBST(ASSERT_ALWAYS_ABORT) -dnl Set the ENABLE_DBGUTIL variable -dnl =================================================================== -AC_MSG_CHECKING([whether to build with additional debug utilities]) -if test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then - ENABLE_DBGUTIL="TRUE" - PROEXT="" - PRODUCT="" - - AC_MSG_RESULT([yes]) - # cppunit and graphite expose STL in public headers - if test "$with_system_cppunit" = "yes"; then - AC_MSG_ERROR([--with-system-cppunit conflicts with --enable-dbgutil]) - else - with_system_cppunit=no - fi - if test "$with_system_graphite" = "yes"; then - AC_MSG_ERROR([--with-system-graphite conflicts with --enable-dbgutil]) - else - with_system_graphite=no - fi - if test "$with_system_mysql_cppconn" = "yes"; then - AC_MSG_ERROR([--with-system-mysql-cppconn conflicts with --enable-dbgutil]) - else - with_system_mysql_cppconn=no - fi -else - ENABLE_DBGUTIL="" - # PRODUCT is old concept, still used by build.pl . - PRODUCT="full" - PROEXT=".pro" - AC_MSG_RESULT([no]) -fi -AC_SUBST(ENABLE_DBGUTIL) -AC_SUBST(PRODUCT) -AC_SUBST(PROEXT) - -dnl Set the ENABLE_DEBUG variable. -dnl =================================================================== -AC_MSG_CHECKING([whether to do a debug build]) -if test -n "$enable_debug" && test "$enable_debug" != "yes" && test "$enable_debug" != "no"; then - AC_MSG_ERROR([--enable-debug now accepts only yes or no, use --enable-selective-debuginfo]) -fi -if test -n "$ENABLE_DBGUTIL"; then - if test "$enable_debug" = "no"; then - AC_MSG_ERROR([--disable-debug cannot be used with --enable-dbgutil]) - fi - ENABLE_DEBUG="TRUE" - AC_MSG_RESULT([yes (dbgutil)]) -elif test -n "$enable_debug" && test "$enable_debug" != "no"; then - ENABLE_DEBUG="TRUE" - AC_MSG_RESULT([yes]) -else - ENABLE_DEBUG="" - AC_MSG_RESULT([no]) -fi -AC_SUBST(ENABLE_DEBUG) - -dnl Selective debuginfo -ENABLE_DEBUGINFO_FOR= -if test -n "$ENABLE_DEBUG"; then - AC_MSG_CHECKING([whether to use selective debuginfo]) - if test -n "$enable_selective_debuginfo" -a "$enable_selective_debuginfo" != "no"; then - ENABLE_DEBUGINFO_FOR="$enable_selective_debuginfo" - AC_MSG_RESULT([for "$enable_selective_debuginfo"]) - else - ENABLE_DEBUGINFO_FOR=all - AC_MSG_RESULT([no, for all]) - fi -fi -AC_SUBST(ENABLE_DEBUGINFO_FOR) - -dnl Check for explicit C/CXX/OBJC/OBJCXX/LDFLAGS. We by default use the ones specified -dnl by our build system, but explicit override is possible. -AC_MSG_CHECKING(for explicit CFLAGS) -if test -n "$CFLAGS"; then - AC_MSG_RESULT([$CFLAGS]) -else - AC_MSG_RESULT(no) -fi -AC_MSG_CHECKING(for explicit CXXFLAGS) -if test -n "$CXXFLAGS"; then - AC_MSG_RESULT([$CXXFLAGS]) -else - AC_MSG_RESULT(no) -fi -AC_MSG_CHECKING(for explicit OBJCFLAGS) -if test -n "$OBJCFLAGS"; then - AC_MSG_RESULT([$OBJCFLAGS]) -else - AC_MSG_RESULT(no) -fi -AC_MSG_CHECKING(for explicit OBJCXXFLAGS) -if test -n "$OBJCXXFLAGS"; then - AC_MSG_RESULT([$OBJCXXFLAGS]) -else - AC_MSG_RESULT(no) -fi -AC_MSG_CHECKING(for explicit LDFLAGS) -if test -n "$LDFLAGS"; then - AC_MSG_RESULT([$LDFLAGS]) -else - AC_MSG_RESULT(no) -fi -AC_SUBST(CFLAGS) -AC_SUBST(CXXFLAGS) -AC_SUBST(OBJCFLAGS) -AC_SUBST(OBJCXXFLAGS) -AC_SUBST(LDFLAGS) - dnl Determine whether to use linkoo for the smoketest installation dnl =================================================================== AC_MSG_CHECKING([whether to use linkoo for the smoketest installation])
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
