configure.ac | 8 +++----- sd/Library_sd.mk | 1 + sd/source/ui/remotecontrol/BluetoothServer.cxx | 1 - 3 files changed, 4 insertions(+), 6 deletions(-)
New commits: commit 3be458578445b82c718b1a8512d16d706fc2329b Author: Peter Foley <pefol...@verizon.net> Date: Wed Dec 5 19:46:36 2012 -0500 we dont execute config.guess anymore Change-Id: Ia2a0158b2824748625e4ece26d3a145fefd519cb diff --git a/configure.ac b/configure.ac index 48c01d7..b09f2c2 100644 --- a/configure.ac +++ b/configure.ac @@ -12254,9 +12254,6 @@ fi AC_SUBST(LO_PATH) -# make sure config.guess is +x; we execute config.guess, so it has to be so -chmod +x ./config.guess - # Generate a configuration timestamp we can use for deps if test -f config_host.mk; then mv -f config_host.mk config_host.mk.last commit 0743ccea543dfcad5c4875b943330fd894a5132a Author: Peter Foley <pefol...@verizon.net> Date: Wed Dec 5 19:41:32 2012 -0500 define must be overridden on cmdline Change-Id: If85a60d9db69ab96c8a77b7715fc2a51fcd7ba51 diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 6390e11..449b761 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -534,6 +534,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ $(eval $(call gb_Library_add_defs,sd,\ -DENABLE_SDREMOTE_BLUETOOTH \ + $(if $(filter MSC,$(COM)),-UMSC) \ )) endif diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 9ba9bad..63be65e 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -28,7 +28,6 @@ #endif #ifdef WIN32 - #undef MSC // Unset a legacy define, as otherwise ws2bth.h breaks #include <winsock2.h> #include <ws2bth.h> #endif commit 0f6286ae723e5c677ca02b9376797a3ea047fd45 Author: Peter Foley <pefol...@verizon.net> Date: Mon Dec 3 18:54:18 2012 -0500 dont create warn file if no warnings Change-Id: I338b76971c4fd94455231d58e9d0bcce4524e829 diff --git a/configure.ac b/configure.ac index 55ca717..48c01d7 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,6 @@ PathFormat() fi } -cat /dev/null > warn have_WARNINGS="no" add_warning() { @@ -12334,6 +12333,8 @@ $GNUMAKE check _EOF fi -cat warn +if test -f warn; then + cat warn +fi dnl vim:set shiftwidth=4 softtabstop=4 expandtab: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits