From f0f9aaba4b92f4e73ccbb87b9ae3f1a8925aadd4 Mon Sep 17 00:00:00 2001 From: sb Date: Tue, 9 Mar 2010 17:31:37 +0100 Subject: sb120: #i109978# removed --disable-qadevooo --- configure.in | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 8d1015441097..d08d7ae74a03 100644 --- a/configure.in +++ b/configure.in @@ -111,10 +111,6 @@ AC_ARG_ENABLE(odk, [ --disable-odk OO.o includes an ODK, office development kit which some packagers may with to build without ],,enable_odk="yes") -AC_ARG_ENABLE(qadevooo, -[ --disable-qadevooo OO.o includes some qa testsuites which some - packagers may wish to build without -],,enable_qadevooo="yes") AC_ARG_ENABLE(mathmldtd, [ --disable-mathmldtd disable mathmldtd (useful for distributions that want to avoid packaging @@ -3458,20 +3454,6 @@ AC_SUBST(BUILD_UNOWINREG) AC_SUBST(MINGWCXX) AC_SUBST(MINGWSTRIP) -dnl =================================================================== -dnl Check for building qadevOOo -dnl =================================================================== -AC_MSG_CHECKING([whether to build qadevOOo]) -if test "z$enable_qadevooo" = "z" -o "$enable_qadevooo" != "no"; then - AC_MSG_RESULT([yes]) - BUILD_QADEVOOO="YES" - BUILD_TYPE="$BUILD_TYPE QADEVOOO" -else - BUILD_QADEVOOO="NO" - AC_MSG_RESULT([no]) -fi -AC_SUBST(BUILD_QADEVOOO) - dnl =================================================================== dnl Check for prelinked libgcc_s.so.1 dnl =================================================================== -- cgit From 63a037046ed3dd5487e2afbc37f43667cbd15b53 Mon Sep 17 00:00:00 2001 From: sb Date: Thu, 11 Mar 2010 23:09:06 +0100 Subject: sb120: #i110061# automatically configure CC=gcc-4.0 on Mac OS X 10.6 (based on another patch by cloph) --- configure.in | 64 ++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 25 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index d08d7ae74a03..bbff908599ad 100644 --- a/configure.in +++ b/configure.in @@ -1380,6 +1380,9 @@ fi AC_MSG_RESULT($GCC_HOME) AC_SUBST(GCC_HOME) +save_CC=$CC +save_CXX=$CXX + if test -n "$with_gcc_home"; then if test -z "$CC"; then CC="$with_gcc_home/bin/gcc" @@ -1407,7 +1410,6 @@ if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; th AC_MSG_CHECKING([the GNU gcc compiler version]) _gcc_version=`$CC -dumpversion` _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - _gcc_longver=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` if test "$_gcc_major" -lt "3"; then @@ -1419,7 +1421,22 @@ if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; th fi fi fi - AC_MSG_RESULT([checked (gcc $_gcc_version)]) + if test "$_os" = "Darwin" -a "$GCCVER" -ge "040100" ; then + if test -z "$save_CC" -a -x "$GCC_HOME/bin/gcc-4.0" ; then + CC=$GCC_HOME/bin/gcc-4.0 + GCCVER2=`"$CC" -dumpversion | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` + if test "$GCCVER2" -ge "040000" -a "$GCCVER2" -lt "040100" ; then + GCCVER=$GCCVER2 + fi + fi + if test "$GCCVER" -ge "040100" ; then + AC_MSG_ERROR([You need to use the gcc-4.0 compiler (gcc $_gcc_version won't work with the MacOSX10.4u.sdk) - set CC accordingly]) + else + AC_MSG_RESULT([implicitly using CC=$CC]) + fi + else + AC_MSG_RESULT([checked (gcc $_gcc_version)]) + fi if test "$_os" = "SunOS"; then AC_MSG_CHECKING([gcc linker]) if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then @@ -2024,14 +2041,27 @@ if test "$GXX" = "yes"; then AC_MSG_CHECKING([the GNU C++ compiler version]) _gpp_version=`$CXX -dumpversion` - _gpp_major=`echo $_gpp_version | $AWK -F. '{ print \$1 }'` - _gpp_minor=`echo $_gpp_version | $AWK -F. '{ print \$2 }'` - - AC_MSG_RESULT([checked (g++ $_gpp_version)]) + _gpp_majmin=`echo $_gpp_version | $AWK -F. '{ print \$1*100+\$2 }'` + + if test "$_os" = "Darwin" -a "$_gpp_majmin" -ge "401" ; then + if test -z "$save_CXX" -a -x "$GCC_HOME/bin/g++-4.0" ; then + CXX=$GCC_HOME/bin/g++-4.0 + _gpp_majmin_2=`"$CXX" -dumpversion | $AWK -F. '{ print \$1*100+\$2 }'` + if test "$_gpp_majmin_2" -ge "400" -a "$_gpp_majmin_2" -lt "401" ; then + _gpp_majmin=$_gpp_majmin_2 + fi + fi + if test "$_gpp_majmin" -ge "401" ; then + AC_MSG_ERROR([You need to use the g++-4.0 compiler (g++ $_gpp_version won't work with the MacOSX10.4u.sdk) - set CXX accordingly]) + else + AC_MSG_RESULT([implicitly using CXX=$CXX]) + fi + else + AC_MSG_RESULT([checked (g++ $_gpp_version)]) + fi - if test "$_gpp_major" = "3"; then - if test "$_gpp_minor" = "4"; then - AC_MSG_CHECKING([whether $CXX has the enum bug]) + if test "$_gpp_majmin" = "304"; then + AC_MSG_CHECKING([whether $CXX has the enum bug]) AC_TRY_RUN([ extern "C" void abort (void); extern "C" void exit (int status); @@ -2054,7 +2084,6 @@ main (void) return 0; } ],[AC_MSG_ERROR([your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details.])], [AC_MSG_RESULT([no])]) - fi fi fi @@ -2194,21 +2223,6 @@ if test "$_os" = "SunOS"; then fi fi dnl =================================================================== -dnl Extra checking for the DARWIN compiler -dnl =================================================================== -if test "$_os" = "Darwin"; then - dnl c++ packaged with cc (gcc) for Macosx - if test "$CC" = "cc"; then - AC_MSG_CHECKING([Macosx c++ Compiler]) - if test "$CXX" != "c++"; then - AC_MSG_WARN([Macosx C++ was not found]) - echo "Macosx C++ was not found" >> warn - else - AC_MSG_RESULT([checked]) - fi - fi -fi -dnl =================================================================== dnl Extra checking for the OSF compiler dnl =================================================================== if test "$_os" = "OSF1"; then -- cgit From 6f92c8366367d8dd6de488d5479479374ae6e00f Mon Sep 17 00:00:00 2001 From: sb Date: Tue, 16 Mar 2010 21:05:31 +0100 Subject: sb120: #i106059# On Mac OS X, compile against system Python from 10.4 SDK (patch by cloph) --- configure.in | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index bbff908599ad..97da96e3ecb6 100644 --- a/configure.in +++ b/configure.in @@ -3702,26 +3702,24 @@ AC_SUBST(LIBXML_LIBS) dnl =================================================================== dnl Check for system python dnl =================================================================== +AC_MSG_CHECKING([which python to use]) if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then with_system_python=yes -fi -AC_MSG_CHECKING([which python to use]) -if test -n "$with_system_python" -o -n "$with_system_libs" && \ + AC_MSG_RESULT([compiling against MacOSX10.4u.sdk (python version 2.3)]) + PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3" + PYTHON_LIBS="-framework Python" +elif test -n "$with_system_python" -o -n "$with_system_libs" && \ test "$with_system_python" != "no"; then - SYSTEM_PYTHON=YES AC_MSG_RESULT([external]) AM_PATH_PYTHON([2.2]) python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"` python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"` PYTHON_CFLAGS="-I$python_include" - - if test "$_os" = "Darwin"; then - PYTHON_LIBS="-framework Python" - else - PYTHON_LIBS="-lpython$python_version" - fi - + PYTHON_LIBS="-lpython$python_version" +fi +if test "$with_system_python" != "no" ; then + SYSTEM_PYTHON=YES dnl check if the headers really work: save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS" -- cgit From 058dab8dcb55c7741c0b858c3f4baa952c0872ad Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 26 Mar 2010 13:48:29 +0100 Subject: sb120: #i106059# handle case correctly when no explicit --with[out]-system-python is given --- configure.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 97da96e3ecb6..192e4f0c4043 100644 --- a/configure.in +++ b/configure.in @@ -3708,8 +3708,8 @@ if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then AC_MSG_RESULT([compiling against MacOSX10.4u.sdk (python version 2.3)]) PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3" PYTHON_LIBS="-framework Python" -elif test -n "$with_system_python" -o -n "$with_system_libs" && \ - test "$with_system_python" != "no"; then +elif test "$with_system_python" != "no" -o -n "$with_system_libs"; then + with_system_python=yes AC_MSG_RESULT([external]) AM_PATH_PYTHON([2.2]) @@ -3718,7 +3718,7 @@ elif test -n "$with_system_python" -o -n "$with_system_libs" && \ PYTHON_CFLAGS="-I$python_include" PYTHON_LIBS="-lpython$python_version" fi -if test "$with_system_python" != "no" ; then +if test "$with_system_python" = "yes" ; then SYSTEM_PYTHON=YES dnl check if the headers really work: save_CPPFLAGS="$CPPFLAGS" -- cgit From 4d4470013fe07330a7f0fbcd43c8259ae154c089 Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 26 Mar 2010 14:29:30 +0100 Subject: sb120: #i106059# fixed previous fix --- configure.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 192e4f0c4043..1a3786d68ae9 100644 --- a/configure.in +++ b/configure.in @@ -3708,7 +3708,8 @@ if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then AC_MSG_RESULT([compiling against MacOSX10.4u.sdk (python version 2.3)]) PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3" PYTHON_LIBS="-framework Python" -elif test "$with_system_python" != "no" -o -n "$with_system_libs"; then +elif test -n "$with_system_python" -o -n "$with_system_libs" && \ + test "$with_system_python" != "no"; then with_system_python=yes AC_MSG_RESULT([external]) AM_PATH_PYTHON([2.2]) -- cgit From 91ec5c7a7ab9dc6973512da5393b163f2d4b2093 Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 23 Apr 2010 16:29:26 +0200 Subject: sb122: #i111070# improved missing JUnit 4 jar error message --- configure.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 9ae2a5ef7ab2..e00fee7978aa 100644 --- a/configure.in +++ b/configure.in @@ -6749,9 +6749,9 @@ if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then AC_MSG_RESULT([$OOO_JUNIT_JAR]) else AC_MSG_RESULT([no]) - AC_MSG_ERROR([cannot find JUnit 4 jar at $OOO_JUNIT_JAR; -please install one and/or specify its pathname via --with-junit=..., -or disable it via --without-junit]) + AC_MSG_ERROR([cannot find JUnit 4 jar; please install one in the default +location (/usr/share/java), specify its pathname via +--with-junit=..., or disable it via --without-junit]) fi fi AC_SUBST(OOO_JUNIT_JAR) -- cgit