Kaydet (Commit) 13cbab35 authored tarafından Kurt Zenker's avatar Kurt Zenker

#i87913# buildfixes

üst 6dcbb8a1
This diff is collapsed.
......@@ -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-04 10:56:00 $
dnl * Date: $Date: 2008-04-08 15:16:57 $
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.260 $ )
AC_REVISION( $Revision: 1.261 $ )
AC_PREREQ(2.50)
AC_INIT()
echo "$@" >config.parms
......@@ -335,6 +335,9 @@ AC_ARG_ENABLE(minimizer,
AC_ARG_ENABLE(presenter-screen,
[ --enable-presenter-screen enables the build of the Presenter Screen extension
],,)
AC_ARG_ENABLE(pdfimport,
[ --disable-pdfimport disables the build of the PDF Import extension and xpdf
],,)
AC_ARG_ENABLE(mediawiki,
[ --disable-mediawiki disables the build of the MediaWiki Editor extension
],,)
......@@ -1665,6 +1668,7 @@ AC_SUBST(USE_MINGW)
dnl ===================================================================
dnl .NET needs special treatment
dnl ===================================================================
if test "$_os" = "WINNT"; then
if test "$COMEX" -ge "10"; then
dnl Check midl.exe
AC_PATH_PROG(MIDL_PATH, midl.exe)
......@@ -1745,6 +1749,7 @@ fi
AC_SUBST(MIDL_PATH)
AC_SUBST(CSC_PATH)
AC_SUBST(FRAME_HOME)
fi
dnl ===================================================================
dnl Check if stdc headers are available excluding windows.
......@@ -4962,7 +4967,8 @@ fi
dnl ===================================================================
dnl Windows builds with Visual Studio 2008 needs msvc{m,p,r}90.dll in external/msvcp90
dnl ===================================================================
if test "$_os" = "WINNT" -a "$COMEX" = "12"; then
if test "$_os" = "WINNT"; then
if test "$COMEX" = "12"; then
AC_MSG_CHECKING([for msvcm90.dll/msvcp90.dll/msvcr90.dll/Microsoft.VC90.CRT.manifest])
if test -x ../external/msvcp90/msvcm90.dll -a -x ../external/msvcp90/msvcp90.dll -a -x ../external/msvcp90/msvcr90.dll -a -x ../external/msvcp90/Microsoft.VC90.CRT.manifest; then
AC_MSG_RESULT([found])
......@@ -4988,6 +4994,7 @@ As the automatic detection fails please copy the files to external/msvcp90/.])
fi
fi
fi
fi
dnl ===================================================================
dnl Windows builds - attempt to auto-copy required instmsiX.exe into external/
......@@ -4999,7 +5006,8 @@ fi
dnl ===================================================================
dnl Windows builds with VS 2003/2005/2008 need instmsia.exe and instmsiw.exe in external/msi
dnl ===================================================================
if test "$_os" = "WINNT" -a \( "$COMEX" -ge "10" \) ; then
if test "$_os" = "WINNT"; then
if test "$COMEX" -ge "10"; then
AC_MSG_CHECKING([for instmsia.exe/instmsiw.exe])
if test -x ../external/msi/instmsia.exe -a -x ../external/msi/instmsiw.exe; then
AC_MSG_RESULT([found])
......@@ -5021,6 +5029,7 @@ As the automatic detection fails please copy the files to external/msi/.])
fi
fi
fi
fi
dnl ===================================================================
dnl Test for the presence of the right polygon clipping code
......@@ -5207,7 +5216,7 @@ fi
AC_SUBST(ENABLE_OPENGL)
AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
if test -n "$enable_minimizer" -a "$enable_minimizer"!= "no"; then
if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then
AC_MSG_RESULT([yes])
ENABLE_MINIMIZER=YES
else
......@@ -5217,7 +5226,7 @@ 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
if test -n "$enable_presenter_screen" -a "$enable_presenter_screen" != "no"; then
AC_MSG_RESULT([yes])
ENABLE_PRESENTER_SCREEN=YES
else
......@@ -5226,10 +5235,21 @@ else
fi
AC_SUBST(ENABLE_PRESENTER_SCREEN)
if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$(ENABLE_MINIMIZER" = "YES"; then
if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES"; then
BUILD_TYPE="$BUILD_TYPE SDEXT"
fi
AC_MSG_CHECKING([whether to build the PDF Import extension])
if test -z "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
AC_MSG_RESULT([yes])
BUILD_TYPE="$BUILD_TYPE XPDF"
ENABLE_PDFIMPORT=YES
else
AC_MSG_RESULT([no])
ENABLE_PDFIMPORT=NO
fi
AC_SUBST(ENABLE_PDFIMPORT)
AC_MSG_CHECKING([whether to build the MediaWiki Editor extension])
if test -z "$enable_mediawiki" -a "$enable_mediawiki" != "no" && test "$WITH_JAVA" != "no"; then
AC_MSG_RESULT([yes])
......
#!@PERL@ -w
#
# Program: set_soenv.in
# Version: $Revision: 1.184 $
# Date: $Date: 2008-04-04 10:56:32 $
# Version: $Revision: 1.185 $
# Date: $Date: 2008-04-08 15:16:24 $
# Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland.
#
#---------------------------------------------------------------------------
......@@ -1671,6 +1671,7 @@ ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
ToFile( "ENABLE_CAIRO", "@ENABLE_CAIRO@", "e" );
ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" );
ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" );
ToFile( "ENABLE_MINIMIZER", "@ENABLE_MINIMIZER@","e" );
ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
ToFile( "ENABLE_REPORTDESIGN","@ENABLE_REPORTDESIGN@","e" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment