[Libreoffice-commits] .: configure.in set_soenv.in

[Caolán McNamara]

 configure.in |   23 +++--------------------
 set_soenv.in |    1 -
 2 files changed, 3 insertions(+), 21 deletions(-)

New commits:
commit 35ec29d9591b02f683cad024d20ddf74f7ab32f9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 12 13:14:16 2011 +0100

    get rid of legacy libXaw usage

diff --git a/configure.in b/configure.in
index 6443de0..5a83ef7 100755
--- a/configure.in
+++ b/configure.in
@@ -394,11 +394,6 @@ AC_ARG_ENABLE(neon,
         [Disable neon and the compilation of webdav binding.]),
 ,)
 
-AC_ARG_ENABLE(Xaw,
-    AS_HELP_STRING([--disable-Xaw],
-        [Disables the use of Xaw for the Netscape/Mozilla plugin.]),
-,)
-
 AC_ARG_ENABLE(check-only,
     AS_HELP_STRING([--enable-check-only],
         [Use this option option if you just want to check your environment.
@@ -5351,23 +5346,11 @@ AC_SUBST(XAU_LIBS)
 
 if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then
    dnl ===================================================================
-   dnl Check for using Xaw
+   dnl Check for Composite.h for mozilla plugin
    dnl ===================================================================
-   AC_MSG_CHECKING([whether to use Xaw])
-   if test "$enable_Xaw" = "no"; then
-       DISABLE_XAW=TRUE
-       AC_MSG_RESULT([no])
-       AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt include headers not found])],
-         [#include <X11/Intrinsic.h>])
-   else
-       AC_MSG_RESULT([yes])
-       AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])],
-         [#include <X11/Intrinsic.h>])
-       AC_CHECK_LIB(Xaw, main, [],
-           [AC_MSG_ERROR(Xaw library not found or functional)], [])
-   fi
+   AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt include headers not found])],
+     [#include <X11/Intrinsic.h>])
 fi
-AC_SUBST(DISABLE_XAW)
 
 
 dnl ===================================================================
diff --git a/set_soenv.in b/set_soenv.in
index 0393872..1d511ed 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1968,7 +1968,6 @@ ToFile( "NEON_VERSION",      "@NEON_VERSION@",     "e" );
 ToFile( "NEON_LIBS",         "@NEON_LIBS@",        "e" );
 ToFile( "NEON_CFLAGS",       "@NEON_CFLAGS@",      "e" );
 ToFile( "DISABLE_NEON",      "@DISABLE_NEON@",     "e" );
-ToFile( "DISABLE_XAW",       "@DISABLE_XAW@",      "e" );
 ToFile( "BUILD_DMAKE",       "@BUILD_DMAKE@",      "e" );
 ToFile( "BUILD_STAX",        "@BUILD_STAX@",       "e" );
 ToFile( "BUILD_UNOWINREG",   "@BUILD_UNOWINREG@",  "e" );