INTEGRATION: CWS presenterview (1.254.10); FILE MERGED

2008/04/02 14:56:26 af 1.254.10.1: #i84791# Added support for minimizer and presenter screen.

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: 2008-04-02 09:48:48 $
+dnl * Date: $Date: 2008-04-03 13:19:10 $
 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.255 $ )
+AC_REVISION( $Revision: 1.256 $ )
 AC_PREREQ(2.50)
 AC_INIT()
 echo "$@" >config.parms
@@ -326,8 +326,11 @@ AC_ARG_WITH(beanshell-jar,
 [  --with-beanshell-jar=JARFILE   Specify path to jarfile manually ],
 [ BSH_JAR="$withval"
 ])
-AC_ARG_ENABLE(sdext,
-[  --enable-sdext          enables the build of the Presentation Minimizer extension
+AC_ARG_ENABLE(minimizer,
+[  --enable-minimizer          enables the build of the Presentation Minimizer extension
+],,)
+AC_ARG_ENABLE(presenter-screen,
+[  --enable-presenter-screen          enables the build of the Presenter Screen extension
 ],,)
 AC_ARG_ENABLE(ogltrans,
 [  --enable-ogltrans       enables the build of the OGLTrans extension
@@ -5036,11 +5039,27 @@ fi
 AC_SUBST(ENABLE_OPENGL)
 
 AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
-if test -n "$enable_sdext" -a "$enable_sdext" != "no"; then
+if test -n "$enable_minimizer" -a "$enable_minimizer"!= "no"; then
    AC_MSG_RESULT([yes])
-   BUILD_TYPE="$BUILD_TYPE SDEXT"
+   ENABLE_MINIMIZER=YES
+else
+   AC_MSG_RESULT([no])
+   ENABLE_MINIMIZER=NO
+fi
+AC_SUBST(ENABLE_MINIMIZER)
+
+AC_MSG_CHECKING([whether to build the Presenter Screen extension])
+if test -n "$enable_presenter_screen" -a "$enable_presenter_screen"!= "no"; then
+   AC_MSG_RESULT([yes])
+   ENABLE_PRESENTER_SCREEN=YES
 else
    AC_MSG_RESULT([no])
+   ENABLE_PRESENTER_SCREEN=NO
+fi
+AC_SUBST(ENABLE_PRESENTER_SCREEN)
+
+if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$(ENABLE_MINIMIZER" = "YES"; then
+   BUILD_TYPE="$BUILD_TYPE SDEXT"
 fi
 
 AC_MSG_CHECKING([whether to build the Report Builder extension])