summaryrefslogtreecommitdiff
path: root/config_office
diff options
context:
space:
mode:
authorArmin Theissen <armin@openoffice.org>2002-10-17 09:54:15 +0000
committerArmin Theissen <armin@openoffice.org>2002-10-17 09:54:15 +0000
commit572ec02979e6683308765e4c00f1de0e222efc09 (patch)
treee69e3f9aebbb3636f26ba6e31cb7fa616ed39f30 /config_office
parent79769049bbfb9fe9f1b16924be51cb52f14ba765 (diff)
Merge from SRX643_OO to HEAD
Diffstat (limited to 'config_office')
-rw-r--r--config_office/configure.in11
1 files changed, 8 insertions, 3 deletions
diff --git a/config_office/configure.in b/config_office/configure.in
index bf8c2c5b07ed..e849ae58c307 100644
--- a/config_office/configure.in
+++ b/config_office/configure.in
@@ -12,7 +12,7 @@ dnl * necessary to build OpenOffice.
dnl *
dnl *
dnl ******************************************************************/
-AC_REVISION( $Revision: 1.47 $ )
+AC_REVISION( $Revision: 1.48 $ )
clear;
AC_PREREQ(2.13)
AC_INIT()
@@ -213,6 +213,8 @@ case "$_os" in
;;
"Linux")
;;
+ "GNU")
+ ;;
"WINNT")
;;
"Darwin")
@@ -519,7 +521,7 @@ AC_HEADER_STDC
dnl ===================================================================
dnl Check if pam-appl.h is available on Linux or FreeBSD
dnl ===================================================================
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
+if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then
AC_MSG_CHECKING([pam_appl.h])
if test -f "/usr/include/security/pam_appl.h"; then
AC_MSG_RESULT([yes])
@@ -544,7 +546,10 @@ if test "$_os" = "WINNT"; then
fi
fi
-AC_PROG_CXX
+dnl Autoconf 2.53 can do this test for cl.exe, 2.13 can't!
+if test test "$_os" != "WINNT"; then
+ AC_PROG_CXX
+fi
dnl ===================================================================
dnl Set the gxx include directories