diff options
author | Martin Blapp <mbr@FreeBSD.org> | 2002-10-18 22:41:42 +0000 |
---|---|---|
committer | Martin Blapp <mbr@FreeBSD.org> | 2002-10-18 22:41:42 +0000 |
commit | 5f6e7f6949fe1fba17b53a04af5b465f19b9b17d (patch) | |
tree | 336b116c7090225344e575c81b023f12aef39c5b /editors/openoffice.org-vcltesttool/files/patch-config_office::configure.in | |
parent | * add 2 missing man pages (diff) |
First step to make this port working. Configure works and all patches
apply now. There are still some compile errors to fix.
As you may see the patchnames are very long, but that makes
maintaining patches a lot easier.
Notes
Notes:
svn path=/head/; revision=68299
Diffstat (limited to '')
-rw-r--r-- | editors/openoffice.org-vcltesttool/files/patch-config_office::configure.in | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/editors/openoffice.org-vcltesttool/files/patch-config_office::configure.in b/editors/openoffice.org-vcltesttool/files/patch-config_office::configure.in deleted file mode 100644 index 432ada6ddb57..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-config_office::configure.in +++ /dev/null @@ -1,86 +0,0 @@ ---- ../config_office/configure.in.orig Tue Feb 19 16:42:08 2002 -+++ ../config_office/configure.in Wed Mar 13 20:26:19 2002 -@@ -121,6 +121,12 @@ - - Usage: --enable-check-only=yes - ],,) -+AC_ARG_WITH(os-version, -+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice -+ with the correct OSVERSION. -+ -+ Usage: --with-os-version=<OSVERSION> -+],,) - dnl =================================================================== - dnl Message. - dnl =================================================================== -@@ -245,13 +251,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -264,13 +270,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -335,7 +341,8 @@ - fi - else - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then -- _gcc_include_path="/usr/include/g++" -+ _gcc_include_path="/usr" -+ _gxx_include_path="/usr/include/g++" - else - AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) - AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -779,6 +786,10 @@ - fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` -+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then -+ _jdk_minor="true" -+ fi - fi - if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1129,6 +1140,7 @@ - echo "\$with_lang="$with_lang - echo "\$with_asm_home="$with_asm_home - echo "\$with_unzip_home="$with_unzip_home -+echo "\$with_os_version="$with_os_version - echo "\$MINGWIN32="$WITH_MINGWIN - echo "\$USE_GCC3="$USE_GCC3 - echo -@@ -1136,7 +1148,7 @@ - - # Executing the set_soenv script to setup the environment variables. - if test -z "$enable_check_only"; then -- './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX - else - echo - echo Test Complete |