INTEGRATION: CWS gslpatches4 (1.127.2); FILE MERGED

2005/07/19 11:21:55 pl 1.127.2.2: RESYNC: (1.127-1.128); FILE MERGED
2005/07/11 10:21:41 pl 1.127.2.1: #i51735# optional NAS support

config_office/configure.in

@@ -3,7 +3,7 @@ dnl *     vi:set sw=3 ts=3 et:
 dnl *
 dnl * Name: configure.in
 dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
-dnl * Date: $Date: 2005-08-18 08:21:16 $
+dnl * Date: $Date: 2005-08-25 16:11:15 $
 dnl *
 dnl * Desc: This file serves as input for the GNU autoconf package
 dnl *       in order to create a configure script.
@@ -12,7 +12,7 @@ dnl *       necessary to build OpenOffice.org
 dnl *
 dnl *
 dnl ******************************************************************/
-AC_REVISION( $Revision: 1.132 $ )
+AC_REVISION( $Revision: 1.133 $ )
 AC_PREREQ(2.50)
 AC_INIT()
 echo "$@" >config.parms
@@ -187,6 +187,9 @@ AC_ARG_WITH(myspell-dicts,
                           distributions where the myspell dictionaries are
                           installed from other sources
 ],,)
+AC_ARG_WITH(nas,
+[  --without-nas           Removes nas support
+],,)
 AC_ARG_WITH(system-libs,
 [  --with-system-libs      Use libs already on system -- enables all
                           --with-system-* flags except mozilla, python and
@@ -3059,7 +3062,9 @@ dnl ===================================================================
 dnl Check for system nas
 dnl ===================================================================
 AC_MSG_CHECKING([which nas to use])
-if test -n "$with_system_nas" -o -n "$with_system_libs" && \
+if test -n "$with_nas"; then
+    AC_MSG_RESULT([none])
+elif test -n "$with_system_nas" -o -n "$with_system_libs" && \
 	test "$with_system_nas" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_NAS=YES
@@ -3074,9 +3079,11 @@ if test -n "$with_system_nas" -o -n "$with_system_libs" && \
     )
     AC_CHECK_LIB(audio, AuOpenServer, [],
         [AC_MSG_ERROR(nas not found or functional)], [-L$XLIB -lXt])
+    ENABLE_NAS=YES
 else
     AC_MSG_RESULT([internal])
     SYSTEM_NAS=NO
+    ENABLE_NAS=YES
     BUILD_TYPE="$BUILD_TYPE NAS"
     dnl ===================================================================
     dnl Check whether xmkmf program can be used, x systems only
@@ -3090,6 +3097,7 @@ else
 fi
 AC_SUBST(SYSTEM_NAS)
 AC_SUBST(NAS_INCLUDES)
+AC_SUBST(ENABLE_NAS)
 
 AC_MSG_CHECKING([whether to enable portaudio/sndfile support])
 if test "$_os" != "WINNT" && \