rpms/openoffice.org/devel openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch, 1.1, 1.2

[fedora-cvs-commits redhat com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31368

Modified Files:
	openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch 
Log Message:
tweak patch

openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch:
 config/ssolar.cmn              |    0 
 config/ssrc680.ini             |    0 
 config_office/configure.in     |   10 +++++++++-
 config_office/set_soenv.in     |    1 +
 solenv/config/ssolar.cmn       |    1 +
 solenv/config/ssrc680.ini      |    2 ++
 unx/source/app/makefile.mk     |    0 
 unx/source/app/vsound.hxx      |    0 
 util/makefile.mk               |    0 
 vcl/unx/source/app/makefile.mk |    8 ++++++++
 vcl/unx/source/app/vsound.hxx  |    4 ----
 vcl/util/makefile.mk           |    2 ++
 12 files changed, 23 insertions(+), 5 deletions(-)

Index: openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch	7 Jul 2005 20:30:48 -0000	1.1
+++ openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch	8 Jul 2005 07:26:40 -0000	1.2
@@ -2,10 +2,10 @@
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
 retrieving revision 1.126
-diff -u -r1.126 configure.in
+diff -u -p -r1.126 configure.in
 --- openoffice.org.orig/config_office/configure.in	21 Jun 2005 10:13:47 -0000	1.126
-+++ openoffice.org/config_office/configure.in	7 Jul 2005 17:54:17 -0000
-@@ -176,6 +176,9 @@
++++ openoffice.org/config_office/configure.in	8 Jul 2005 07:29:56 -0000
+@@ -176,6 +176,9 @@ AC_ARG_WITH(myspell-dicts,
                            distributions where the myspell dictionaries are
                            installed from other sources
  ],,)
@@ -15,19 +15,27 @@
  AC_ARG_WITH(system-libs,
  [  --with-system-libs      Use libs already on system -- enables all
                            --with-system-* flags except mozilla, python and
-@@ -3006,13 +3012,18 @@
+@@ -2991,7 +2999,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
+@@ -3006,13 +3016,16 @@ if test -n "$with_system_nas" -o -n "$wi
      )
      AC_CHECK_LIB(audio, AuOpenServer, [],
          [AC_MSG_ERROR(nas not found or functional)], [-L$XLIB -lXt])
--else
 +    ENABLE_NAS=YES
-+elif test -z "$with_nas"; then
+ else
      AC_MSG_RESULT([internal])
      SYSTEM_NAS=NO
 +    ENABLE_NAS=YES
      BUILD_TYPE="$BUILD_TYPE NAS"
-+else
-+    AC_MSG_RESULT([none])
  fi
  AC_SUBST(SYSTEM_NAS)
  AC_SUBST(NAS_INCLUDES)