From 9f99b9bb3ce89207f74de7393e592b25bd923332 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 9 Mar 2010 13:27:16 +0100 Subject: odfmetadata4: #i108911#: configure.in: enable with-system-redland: based on patch by cmc. no patches are required for redland any more, so enable system redland. minimum version is redland 1.0.8. --- configure.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index be384fb3adc3..17d96d91a0f7 100644 --- a/configure.in +++ b/configure.in @@ -542,6 +542,9 @@ AC_ARG_WITH(system-altlinuxhyph, AC_ARG_WITH(system-lpsolve, [ --with-system-lpsolve Use lpsolve already on system ],,) +AC_ARG_WITH(system-redland, +[ --with-system-redland Use redland library already on system +],,) AC_ARG_WITH(system-mozilla, [ --with-system-mozilla Use mozilla already on system. Note that some components cannot be built against a contemporary @@ -4933,16 +4936,12 @@ dnl =================================================================== dnl Check for system redland dnl =================================================================== AC_MSG_CHECKING([which redland library to use]) -dnl if test -n "$with_system_redland" -o -n "$with_system_libs" && \ -dnl test "$with_system_redland" != "no"; then -dnl mst: NOTE: right now we need patches against redland -dnl so we only enable system redland if explicitly requested -dnl if next version includes patches, insert version check here -if test -n "$with_system_redland" && \ +if test -n "$with_system_redland" -o -n "$with_system_libs" && \ test "$with_system_redland" != "no"; then AC_MSG_RESULT([external]) SYSTEM_REDLAND=YES - PKG_CHECK_MODULES(REDLAND, redland) + dnl versions before 1.0.8 write RDF/XML that is useless for ODF (@xml:base) + PKG_CHECK_MODULES(REDLAND, redland >= 1.0.8) else AC_MSG_RESULT([internal]) BUILD_TYPE="$BUILD_TYPE REDLAND" -- cgit From d509d8f65323ed0c92b86a293d28cd998666341d 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) (transplanted from dde95ea6868415c432f7e82e860874abe25329d2) --- configure.in | 64 ++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 25 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index d3e5a0757435..22982829a9a0 100644 --- a/configure.in +++ b/configure.in @@ -1421,6 +1421,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" @@ -1448,7 +1451,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 @@ -1460,7 +1462,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 @@ -2065,14 +2082,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); @@ -2095,7 +2125,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 @@ -2235,21 +2264,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 084ef1d92ac0c8dd21d2a34cb10a2e1b26afcb1d 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) (transplanted from 9f7ed09e2d7215d58bf71615b481b74b2344c79c) --- configure.in | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 22982829a9a0..73c64175c2fc 100644 --- a/configure.in +++ b/configure.in @@ -3722,26 +3722,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 8fa58bb6e7c867f9af76033c18f11c1a9dcabd90 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 (transplanted from e66f992d250510fdd587b64aee80352a667d52f6) --- configure.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 73c64175c2fc..5c2ba1cbf3c5 100644 --- a/configure.in +++ b/configure.in @@ -3728,8 +3728,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]) @@ -3738,7 +3738,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 4ded51564e225874d110b3a8a4ecb75c6e02c8bb Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 26 Mar 2010 14:29:30 +0100 Subject: sb120: #i106059# fixed previous fix (transplanted from 4cd1436dc271f868b6b63987c71a6a15136af99a) --- configure.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 5c2ba1cbf3c5..14273cb4d2eb 100644 --- a/configure.in +++ b/configure.in @@ -3728,7 +3728,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