configure.in | 30 ++++++++++++++++++++++++++++-
extensions/source/activex/main/makefile.mk | 2 -
set_soenv.in | 19 +++++++++++++-----
solenv/inc/set_wntx64.mk | 2 -
4 files changed, 45 insertions(+), 8 deletions(-)
New commits:
commit 9b43d52764c260afcd652afd812a129b94127fa7
Author: Andrea Pescetti <pesce...@apache.org>
Date: Tue Feb 19 22:22:14 2013 +0000
Allow --without-system-serf to override --with-system-libs
diff --git a/configure.in b/configure.in
index fde70e9..918884c 100644
--- a/configure.in
+++ b/configure.in
@@ -4597,7 +4597,8 @@ SYSTEM_SERF=NO
SERF_CFLAGS=
SERF_LIBS=
AC_MSG_CHECKING([which libserf to use])
-if test "x$with_system_serf" = "xyes" -o -n "$with_system_libs"; then
+if test -n "$with_system_serf" -o -n "$with_system_libs" && \
+ test "$with_system_serf" != "no"; then
AC_MSG_RESULT([system])
PKG_CHECK_MODULES([SERF], [serf-1 >= 1.1])
SYSTEM_SERF=YES
commit 568c8be65bd745a1b03d3b607c30f0646f395e53
Author: Jürgen Schmidt <j...@apache.org>
Date: Tue Feb 19 13:47:31 2013 +0000
#121456# fix wrong space
diff --git a/set_soenv.in b/set_soenv.in
index 6691358..f7b6cce 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -102,7 +102,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK,
$JAVAFLAGS, $OOO_SHELL,
$UPD, $WORK_STAMP, $SOURCE_ROOT_DIR , $gb_REPOS,
$SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR,
$SOLARENV,
$STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON,
$STAR_SSOLARINI,
- $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $CXX_X64_BINARY, $
LINK_X64_BINARY, $LIBMGR_X64_BINARY,
+ $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $CXX_X64_BINARY,
$LINK_X64_BINARY, $LIBMGR_X64_BINARY,
$MSPDB_PATH, $MIDL_PATH, $CSC_PATH,
$PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB,
$SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL,
commit 5ee08bdc4b036535b4e7ca1f944153f09d314053
Author: Jürgen Schmidt <j...@apache.org>
Date: Tue Feb 19 13:28:56 2013 +0000
#121456# improve handling/building of 64 bit shell extensions for windows
diff --git a/configure.in b/configure.in
index eaa6e5f..fde70e9 100644
--- a/configure.in
+++ b/configure.in
@@ -268,6 +268,12 @@ AC_ARG_ENABLE(cl-standard,
options and therefore removes a lot of warnings when
using the cheaper standard compiler. )
],,)
+AC_ARG_ENABLE(win-x64-shellext,
+[ --enable-win-x64-shellext Enable the build/usage of Windows 64bit shell
extensions.
+ These extension are used for the system integration
on a
+ Windows 64bit systems. For example supporting the
search
+ in ODF files with the standard Windows search feature.
+],,)
AC_ARG_ENABLE(gtk,
[ --disable-gtk Determines whether to use Gtk+ vclplug on platforms
where Gtk+ is available.
@@ -1292,6 +1298,21 @@ if test "$_os" = "WINNT"; then
AC_SUBST(VC_STANDARD)
fi
+if test "$_os" = "WINNT"; then
+ dnl ===================================================================
+ dnl Set the BUILD_X64 variable.
+ dnl ===================================================================
+ AC_MSG_CHECKING([whether to build/use the Windows 64bit shell extensions])
+ if test "$enable_win_x64_shellext" = "" -o "$enable_win_x64_shellext" =
"no"; then
+ BUILD_X64=""
+ AC_MSG_RESULT([no])
+ else
+ BUILD_X64="TRUE"
+ AC_MSG_RESULT([yes])
+ fi
+ AC_SUBST(BUILD_X64)
+fi
+
dnl ===================================================================
dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
dnl ===================================================================
@@ -5766,8 +5787,10 @@ if test \( "$_os" = "WINNT" \) ; then
fi
if test -z "$with_atl_lib_dir"; then
ATL_LIB=$COMPATH/atlmfc/lib
+ ATL_LIB_X64=$COMPATH/atlmfc/lib/amd64
else
ATL_LIB=`cygpath -u "$with_atl_lib_dir"`
+ ATL_LIB_X64=$ATL_LIB/../amd64
fi
if test -z "$with_mfc_include_dir"; then
MFC_INCLUDE=$COMPATH/atlmfc/include
@@ -5782,6 +5805,7 @@ if test \( "$_os" = "WINNT" \) ; then
ATL_INCLUDE=`echo $ATL_INCLUDE | $SED 's/\/$//'`
ATL_LIB=`echo $ATL_LIB | $SED 's/\/$//'`
+ ATL_LIB_X64=`echo $ATL_LIB_X64 | $SED 's/\/$//'`
MFC_INCLUDE=`echo $MFC_INCLUDE | $SED 's/\/$//'`
MFC_LIB=`echo $MFC_LIB | $SED 's/\/$//'`
@@ -5827,6 +5851,7 @@ if test \( "$_os" = "WINNT" \) ; then
if test "$HAVE_ATL_H" = "no" -o "$HAVE_MFC_H" = "no" -o
"$HAVE_ATL_LIB" = "no" -o "$HAVE_MFC_LIB" = "no"; then
ATL_INCLUDE=
ATL_LIB=
+ ATL_LIB_X64=
MFC_INCLUDE=
MFC_LIB=
HAVE_ATL_LIB=
@@ -5837,6 +5862,7 @@ if test \( "$_os" = "WINNT" \) ; then
else
ATL_INCLUDE=`cygpath -dm "$ATL_INCLUDE"`
ATL_LIB=`cygpath -dm "$ATL_LIB"`
+ ATL_LIB_X64=`cygpath -dm "$ATL_LIB_X64"`
MFC_INCLUDE=`cygpath -dm "$MFC_INCLUDE"`
MFC_LIB=`cygpath -dm "$MFC_LIB"`
AC_MSG_RESULT([ATL/MFC enabled])
@@ -5845,6 +5871,7 @@ if test \( "$_os" = "WINNT" \) ; then
fi
AC_SUBST(ATL_INCLUDE)
AC_SUBST(ATL_LIB)
+AC_SUBST(ATL_LIB_X64)
AC_SUBST(HAVE_ATLTHUNK)
AC_SUBST(MFC_INCLUDE)
AC_SUBST(MFC_LIB)
diff --git a/extensions/source/activex/main/makefile.mk
b/extensions/source/activex/main/makefile.mk
index 7141a5c..d3c9b7d 100644
--- a/extensions/source/activex/main/makefile.mk
+++ b/extensions/source/activex/main/makefile.mk
@@ -137,7 +137,7 @@ SHL1STDLIBS_X64+=\
SHL1OBJS_X64=$(SLOFILES_X64)
SHL1DEF_X64=$(TARGET).def
-SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atls.lib
+SHL1STDLIBS_X64+= $(ATL_LIB_X64)$/atls.lib $(ATL_LIB_X64)$/atlthunk.lib
.ENDIF # "$(BUILD_X64)"!=""
diff --git a/set_soenv.in b/set_soenv.in
index 880eb1e..6691358 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -102,12 +102,12 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK,
$JAVAFLAGS, $OOO_SHELL,
$UPD, $WORK_STAMP, $SOURCE_ROOT_DIR , $gb_REPOS,
$SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR,
$SOLARENV,
$STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON,
$STAR_SSOLARINI,
- $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
+ $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $CXX_X64_BINARY, $
LINK_X64_BINARY, $LIBMGR_X64_BINARY,
$MSPDB_PATH, $MIDL_PATH, $CSC_PATH,
$PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB,
$SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL,
$COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK,
$FRAME_HOME,
- $USE_DIRECTX5, $ATL_LIB, $HAVE_ATLTHUNK, $ATL_INCLUDE, $MFC_LIB,
$MFC_INCLUDE, $TMPDIR,
+ $USE_DIRECTX5, $ATL_LIB, $ATL_LIB_X64, $HAVE_ATLTHUNK, $ATL_INCLUDE,
$MFC_LIB, $MFC_INCLUDE, $TMPDIR,
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT,
$PREBUILD_MOZAB, $MOZILLABUILD,
$PROEXT, $TARFILE_LOCATION,
@@ -695,6 +695,9 @@ elsif ( $platform =~ m/cygwin/ )
else # The MSVC section starts here
{ $outfile = "winenv.set";
$COMPATH = PathFormat('@COMPATH@');
+ $CXX_X64_BINARY = PathFormat('@COMPATH@/bin/amd64/cl.exe');
+ $LINK_X64_BINARY = PathFormat('@COMPATH@/bin/amd64/link.exe');
+ $LIBMGR_X64_BINARY = PathFormat('@COMPATH@/bin/amd64/lib.exe');
$COM = "MSC";
$OUTPATH = "wntmsci@COMEX@";
$INPATH = $OUTPATH.$PROEXT;
@@ -1726,6 +1729,9 @@ ToFile( "SOLAR_JAVA", $SOLAR_JAVA, "e" );
ToFile( "BIG_SVX", $BIG_SVX, "e" );
ToFile( "COM", $COM, "e" );
ToFile( "COMPATH", $COMPATH, "e" );
+ToFile( "CXX_X64_BINARY", $CXX_X64_BINARY, "e" );
+ToFile( "LINK_X64_BINARY", $LINK_X64_BINARY, "e" );
+ToFile( "LIBMGR_X64_BINARY", $LIBMGR_X64_BINARY, "e" );
ToFile( "CPU", $CPU, "e" );
ToFile( "CPUNAME", $CPUNAME, "e" );
ToFile( "CVER", $CVER, "e" );
@@ -1768,6 +1774,7 @@ if ( $platform =~ m/cygwin/ )
ToFile( "DIRECTXSDK_LIB", $DIRECTXSDK_LIB, "e" );
ToFile( "USE_DIRECTX5", $USE_DIRECTX5, "e" );
ToFile( "ATL_LIB", "@ATL_LIB@", "e" );
+ ToFile( "ATL_LIB_X64", "@ATL_LIB_X64@", "e" );
ToFile( "ATL_INCLUDE", "@ATL_INCLUDE@", "e" );
ToFile( "HAVE_ATLTHUNK", "@HAVE_ATLTHUNK@", "e" );
ToFile( "MFC_LIB", "@MFC_LIB@", "e" );
@@ -1778,9 +1785,10 @@ if ( $platform =~ m/cygwin/ )
ToFile( "USE_NEW_SDK", $USE_NEW_SDK, "e" );
# Hack around dmake's mktmp not generating DOS paths.
- my $tmpdir = qx{cygpath -m "/tmp"};
- chomp($tmpdir);
- ToFile( "TMPDIR", $tmpdir, "e" );
+# my $tmpdir = qx{cygpath -m "/tmp"};
+# chomp($tmpdir);
+# ToFile( "TMPDIR", $tmpdir, "e" );
+ ToFile( "TMPDIR", "/tmp", "e" );
}
ToFile( "ENABLE_HUNSPELL", "@ENABLE_HUNSPELL@", "e" );
ToFile( "ENABLE_HYPHEN", "@ENABLE_HYPHEN@", "e" );
@@ -1862,6 +1870,7 @@ ToFile( "SYSTEM_GRAPHITE", "@SYSTEM_GRAPHITE@", "e");
ToFile( "GRAPHITE_LIBS", "@GRAPHITE_LIBS@", "e");
ToFile( "GRAPHITE_CFLAGS", "@GRAPHITE_CFLAGS@", "e");
ToFile( "VC_STANDARD", "@VC_STANDARD@", "e" );
+ToFile( "BUILD_X64", "@BUILD_X64@", "e" );
ToFile( "ENABLE_CATEGORY_B", "@ENABLE_CATEGORY_B@", "e");
ToFile( "BUNDLED_EXTENSION_BLOBS", "@BUNDLED_EXTENSION_BLOBS@", "e");
ToFile( "BUNDLED_PREREG_EXTENSIONS", "@BUNDLED_PREREG_EXTENSIONS@", "e");
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index 788538d..333ebe9 100644
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -110,7 +110,7 @@ STDSLOCUI_X64=
IMPLIBFLAGS_X64=-machine:X64
-LIBPATH_X64=$(PSDK)/lib/x64
+LIBPATH_X64=$(PSDK_HOME)/lib/x64
LIBPATH_VC_X64=$(COMPATH)/lib/amd64
ADVAPI32LIB_X64=$(LIBPATH_X64)/advapi32.lib
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
