[Libreoffice-commits] .: 3 commits - configure.ac
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Jan 10 05:43:18 PST 2013
configure.ac | 109 +++++++++++++++++++++++++++++++++--------------------------
1 file changed, 61 insertions(+), 48 deletions(-)
New commits:
commit 417943f071cc6c7ebe4dad69dfdec411cc7de975
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Jan 10 15:41:02 2013 +0200
Get rid of last actual TABs in this file
Change-Id: Ic92c47834add4f5d0350343e6b7ea8294477b495
diff --git a/configure.ac b/configure.ac
index 7267536..2ef61b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4575,6 +4575,8 @@ if test -z "$GNUMAKE"; then
AC_MSG_ERROR([not found. install GNU make.])
fi
+TAB=`printf '\t'`
+
AC_MSG_CHECKING([the GNU make version])
_make_version=`$GNUMAKE --version | grep GNU | $GREP -v GPL | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`
_make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
@@ -4596,16 +4598,16 @@ elif test "$_make_longver" -ge "038100"; then
fi
AC_MSG_CHECKING([for GNU make bug 20033])
TESTGMAKEBUG20033=`mktemp -d tmp.XXXXXX`
- cat > $TESTGMAKEBUG20033/Makefile << EOF
+ $SED -e "s/<TAB>/$TAB/" > $TESTGMAKEBUG20033/Makefile << EOF
A := \$(wildcard *.a)
.PHONY: all
all: \$(A:.a=.b)
- @echo survived bug20033. #dont kill these tabs, you will break the Makefile!!!!
+<TAB>@echo survived bug20033. #dont kill these tabs, you will break the Makefile!!!!
.PHONY: setup
setup:
- @touch 1.a 2.a 3.a 4.a 5.a 6.a
+<TAB>@touch 1.a 2.a 3.a 4.a 5.a 6.a
define d1
@echo lala \$(1)
@@ -4618,9 +4620,9 @@ define d2
endef
%.b : %.a
- \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | $SHA1SUM))) \$(if \$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
- \$(call d1,\$(CHECKSUM)),\
- \$(call d2,\$(CHECKSUM)))
+<TAB>\$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | $SHA1SUM))) \$(if \$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
+<TAB>\$(call d1,\$(CHECKSUM)),\
+<TAB>\$(call d2,\$(CHECKSUM)))
EOF
if test -z "`(cd $TESTGMAKEBUG20033 && $GNUMAKE setup && $GNUMAKE -j)|grep survived`"; then
no_parallelism_make="YES"
@@ -4636,12 +4638,12 @@ fi
# find if gnumake support file function
AC_MSG_CHECKING([whether GNU make supports the 'file' function])
TESTGMAKEFILEFUNC="`mktemp -d -t tst.XXXXXX`"
-cat > $TESTGMAKEFILEFUNC/Makefile << EOF
+$SED -e "s/<TAB>/$TAB/" > $TESTGMAKEFILEFUNC/Makefile << EOF
\$(file >test.txt,Success )
.PHONY: all
all:
- @cat test.txt
+<TAB>@cat test.txt
EOF
$GNUMAKE -C $TESTGMAKEFILEFUNC 2>/dev/null 1>&2
commit f340cbb6af86c7046d34202d2781a68b0d991001
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Jan 10 15:13:49 2013 +0200
De-tab
Change-Id: If0e93181affadd7c608625c494daf6da78ba9bbc
diff --git a/configure.ac b/configure.ac
index 60daa23..7267536 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8293,9 +8293,9 @@ if test "$with_system_nss" = "yes"; then
libo_MINGW_CHECK_DLL([SSL3], [ssl3])
else
SYSTEM_NSS="NO"
- NSS_MAJOR="3"
- NSS_MINOR="13"
- NSS_PATCH="5"
+ NSS_MAJOR="3"
+ NSS_MINOR="13"
+ NSS_PATCH="5"
BUILD_TYPE="$BUILD_TYPE NSS"
AC_MSG_RESULT([internal])
fi # system nss
commit dc7e074fc89677d87194b2836c18755788c22f1c
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Jan 10 15:09:46 2013 +0200
Make it possible to even try building the OpenGL transitions for Windows
Change-Id: Id9b688a22518aedb8959120f909832f0cd84b324
diff --git a/configure.ac b/configure.ac
index 688f2e4..60daa23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -867,8 +867,7 @@ AC_ARG_ENABLE(cairo-canvas,
AC_ARG_ENABLE(opengl,
AS_HELP_STRING([--disable-opengl],
- [Determines whether to build the OpenGL 3D slide transitions component.]),
-,enable_opengl=yes)
+ [Determines whether to build the OpenGL 3D slide transitions component.]))
AC_ARG_ENABLE(dbus,
AS_HELP_STRING([--disable-dbus],
@@ -9702,47 +9701,59 @@ dnl ===================================================================
AC_MSG_CHECKING([whether to build the OpenGL Transitions component])
ENABLE_OPENGL=
-if test "$_os" = "Darwin"; then
+if test -z "$enable_opengl"; then
+ if test $_os = WINNT; then
+ # By default disable the OpenGL transitions for Windows (the code doesn't even compile
+ # currently). In other words, use --enable-opengl only if you plan to hack on that code for
+ # Windows.
+ enable_opengl=no
+ else
+ enable_opengl=yes
+ fi
+fi
+
+if test "x$enable_opengl" = "xno"; then
+ AC_MSG_RESULT([no])
+elif test "$_os" = "Darwin"; then
# We use frameworks on Mac OS X, no need for detail checks
ENABLE_OPENGL=TRUE
SYSTEM_MESA_HEADERS=YES
AC_MSG_RESULT([yes])
+elif test $_os = WINNT; then
+ # Experimental: try to use OpenGL on Windows
+ ENABLE_OPENGL=TRUE
+ # We need the internal "Mesa" headers.
+ SYSTEM_MESA_HEADERS=NO
+ BUILD_TYPE="$BUILD_TYPE MESA"
+ AC_MSG_RESULT([yes])
else
- if test "x$enable_opengl" != "xno"; then
- if test "$_os" != "WINNT"; then
- save_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -lm"
- AC_MSG_RESULT([yes])
- AC_CHECK_LIB([GL], [main], [:],
- [AC_MSG_ERROR(libGL not installed or functional)], [])
- AC_CHECK_LIB([GLU], [main], [:],
- [AC_MSG_ERROR(libGLU not installed or functional)], [])
- ENABLE_OPENGL=TRUE
- LDFLAGS=$save_LDFLAGS
-
- dnl ===================================================================
- dnl Check for system Mesa
- dnl ===================================================================
- AC_MSG_CHECKING([which Mesa headers to use])
- if test "$with_system_mesa_headers" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_MESA_HEADERS=YES
- AC_LANG_PUSH(C)
- AC_CHECK_HEADER(GL/glxext.h, [],
- [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
- AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
- AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
- AC_LANG_POP(C)
- else
- AC_MSG_RESULT([internal])
- SYSTEM_MESA_HEADERS=NO
- BUILD_TYPE="$BUILD_TYPE MESA"
- fi
- else
- AC_MSG_RESULT([not on Windows])
- fi
+ save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -lm"
+ AC_MSG_RESULT([yes])
+ AC_CHECK_LIB([GL], [main], [:],
+ [AC_MSG_ERROR(libGL not installed or functional)], [])
+ AC_CHECK_LIB([GLU], [main], [:],
+ [AC_MSG_ERROR(libGLU not installed or functional)], [])
+ ENABLE_OPENGL=TRUE
+ LDFLAGS=$save_LDFLAGS
+
+ dnl ===================================================================
+ dnl Check for system Mesa
+ dnl ===================================================================
+ AC_MSG_CHECKING([which Mesa headers to use])
+ if test "$with_system_mesa_headers" = "yes"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_MESA_HEADERS=YES
+ AC_LANG_PUSH(C)
+ AC_CHECK_HEADER(GL/glxext.h, [],
+ [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
+ AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
+ AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
+ AC_LANG_POP(C)
else
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([internal])
+ SYSTEM_MESA_HEADERS=NO
+ BUILD_TYPE="$BUILD_TYPE MESA"
fi
fi
More information about the Libreoffice-commits
mailing list