diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-10-18 22:52:57 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-10-18 22:52:57 +0000 |
| commit | a0ccee8b339cbd7d2a5be2f23fa0b2f51d8bbd78 (patch) | |
| tree | 1a9632c02a53b6df96425fec98a823006618e1bf /editors/openoffice.org-vcltesttool/files/patch-config_office::configure.in | |
| parent | First step to make this port working. Configure works and all patches (diff) | |
Re-add previously deleted files.
Notes
Notes:
svn path=/head/; revision=68300
Diffstat (limited to 'editors/openoffice.org-vcltesttool/files/patch-config_office::configure.in')
| -rw-r--r-- | editors/openoffice.org-vcltesttool/files/patch-config_office::configure.in | 48 |
1 files changed, 48 insertions, 0 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 new file mode 100644 index 000000000000..b10dca2be517 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-config_office::configure.in @@ -0,0 +1,48 @@ +--- configure.in.orig Wed Oct 2 21:22:53 2002 ++++ configure.in Sat Oct 19 00:09:27 2002 +@@ -356,6 +356,9 @@ + + dnl Set the include paths + _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include ++ if test "$_gcc_include_path" = "/usr/libexec/(null)/include"; then ++ _gcc_include_path="/usr/include" ++ fi + fi + + dnl =================================================================== +@@ -374,20 +377,20 @@ + if test -z "$GNUMAKE"; then + AC_MSG_WARN([not found build may fail]) >> warn + else +- _make_version=`make --version | grep GNU | $SED -e "s@^[[^0-9]]*@@" -e "s@ .*\\$@@" -e "s@,@@"`; ++ _make_version=`gmake --version | grep GNU | $SED -e "s@^[[^0-9]]*@@" -e "s@ .*\\$@@" -e "s@,@@"`; + _make_major=`echo $_make_version | $AWK -F. '{print $1;}'` + _make_middle=`echo $_make_version | $AWK -F. '{ print $2; }'` + _make_minor=`echo $_make_version | $AWK -F. '{ print $3; }'` + if test "$_make_major" -gt "3" ; then +- AC_MSG_RESULT([checked (make $_make_version)]) ++ AC_MSG_RESULT([checked (gmake $_make_version)]) + else + if test "$_make_middle" -gt "79" ; then +- AC_MSG_RESULT([checked (make $_make_version)]) ++ AC_MSG_RESULT([checked (gmake $_make_version)]) + else + if test "$_make_minor" -ge "1" ; then +- AC_MSG_RESULT([checked (make $_make_version)]) ++ AC_MSG_RESULT([checked (gmake $_make_version)]) + else +- AC_MSG_ERROR([failed (make $_make_version need 3.79.1+)]) ++ AC_MSG_ERROR([failed (gmake $_make_version need 3.79.1+)]) + fi + fi + fi +@@ -551,6 +554,9 @@ + dnl =================================================================== + if test "$GXX" = "yes"; then + _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include ++ if test "$_gxx_include_path" = "/usr/libexec/(null)/include"; then ++ _gxx_include_path="/usr/include" ++ fi + fi + + |