[Libreoffice-commits] .: 3 commits - configure.in
Sebastian Spaeth
spaetz at kemper.freedesktop.org
Wed Nov 10 05:58:22 PST 2010
configure.in | 44 ++++++++++++++++++++------------------------
1 file changed, 20 insertions(+), 24 deletions(-)
New commits:
commit 9d763c587c1b7ef80161a92527a6ad096454ac3f
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Wed Nov 10 14:57:55 2010 +0100
De-uglify the randr check output (not 2 tests on one line)
diff --git a/configure.in b/configure.in
index 3f707fa..d1d73a0 100644
--- a/configure.in
+++ b/configure.in
@@ -5620,8 +5620,9 @@ AC_MSG_CHECKING([whether to enable RandR support])
if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" = "TRUE" \) ; then
if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then
XRANDR_DLOPEN="TRUE"
- AC_MSG_RESULT([resorting to dlopen libXrandr at runtime])
+ AC_MSG_RESULT([configured to dlopen libXrandr at runtime])
else
+ AC_MSG_RESULT([yes])
XRANDR_DLOPEN="FALSE"
PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2, ENABLE_RANDR="TRUE", ENABLE_RANDR="")
if test "$ENABLE_RANDR" != "TRUE"; then
@@ -5632,7 +5633,6 @@ if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" =
[ AC_MSG_ERROR(libXrandr not found or functional) ], [])
XRANDR_LIBS="-lXrandr "
ENABLE_RANDR="TRUE"
- AC_MSG_RESULT([enabling RandR support])
fi
fi
else
commit 97b19b93ece08e10f021c619d39b41f680510db9
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Wed Nov 10 14:56:54 2010 +0100
Use $AWK and $SED consistently throughout configure
diff --git a/configure.in b/configure.in
index 318d77f..3f707fa 100644
--- a/configure.in
+++ b/configure.in
@@ -2240,7 +2240,7 @@ if test "$_os" = "SunOS"; then
COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
AC_MSG_CHECKING([the SunStudio C/C++ compiler version])
dnl cc -V outputs to standard error!!!!
- _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'`
+ _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | $SED -e 's/.* C //'`
_sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
_sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
if test "$_sunstudio_major" != "5"; then
@@ -2825,7 +2825,7 @@ _ACEOF
AC_MSG_CHECKING([whether to use dynamic libgcc])
if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then
AC_MSG_CHECKING([dynamic libgcc name])
- MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's at .* _libgcc\(.*\)_dll_iname at libgcc\1.dll at p' | uniq | sed -e 's at _@?@g'`
+ MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | $SED -ne 's at .* _libgcc\(.*\)_dll_iname at libgcc\1.dll at p' | uniq | $SED -e 's at _@?@g'`
MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null`
if test -n "$MINGW_GCCDLL"; then
MINGW_SHARED_GCCLIB=YES
@@ -2842,7 +2842,7 @@ _ACEOF
AC_MSG_CHECKING([whether to use dynamic libstdc++])
if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
AC_MSG_CHECKING([dynamic libstdc++ name])
- MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's at .* _libstdc__\(.*\)_dll_iname at libstdc++\1.dll at p' | uniq | sed -e 's at _@?@g'`
+ MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | $SED -ne 's at .* _libstdc__\(.*\)_dll_iname at libstdc++\1.dll at p' | uniq | $SED -e 's at _@?@g'`
MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
if test -n "$MINGW_GXXDLL"; then
MINGW_SHARED_GXXLIB=YES
@@ -3445,9 +3445,9 @@ if test "$SOLAR_JAVA" != ""; then
_gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
_gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
- elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then
+ elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | grep -c "BEA"` -gt 0; then
AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
- elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "IBM"` -gt 0; then
+ elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | grep -c "IBM"` -gt 0; then
JDK=ibm
dnl IBM JDK specific tests
@@ -4486,7 +4486,7 @@ fi
AC_SUBST(SYSTEM_PYTHON)
AC_SUBST(PYTHON_CFLAGS)
AC_SUBST(PYTHON_LIBS)
-HOME=`echo $HOME | sed 's:\\\\:/:g'`
+HOME=`echo $HOME | $SED 's:\\\\:/:g'`
AC_SUBST(HOME)
dnl ===================================================================
@@ -4634,7 +4634,7 @@ if test -n "$with_system_mysql" -o -n "$with_system_libs" && \
AC_MSG_CHECKING([for MySQL Client library])
MYSQL_INC=`$MYSQLCONFIG --include`
MYSQL_LIB=`$MYSQLCONFIG --libs`
- MYSQL_DEFINES=`$MYSQLCONFIG --cflags | sed -e s,$MYSQL_INC,,`
+ MYSQL_DEFINES=`$MYSQLCONFIG --cflags | $SED -e s,$MYSQL_INC,,`
AC_MSG_RESULT([includes $MYSQL_INC, libraries $MYSQL_LIB])
else
SYSTEM_MYSQL=NO
@@ -7643,7 +7643,7 @@ else
while test -h "$ANT"; do
a_cwd=`pwd`
a_basename=`basename "$ANT"`
- a_script=`ls -l "$ANT" | sed "s/.*${a_basename} -> //g"`
+ a_script=`ls -l "$ANT" | $SED "s/.*${a_basename} -> //g"`
cd "`dirname "$ANT"`"
cd "`dirname "$a_script"`"
ANT="`pwd`"/"`basename "$a_script"`"
commit 9ec5faad9cf562745aa6b2e3c96da158ca0ac4ea
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Wed Nov 10 14:55:56 2010 +0100
Pull some common options as defaults and only change them if needed
diff --git a/configure.in b/configure.in
index e477d2c..318d77f 100644
--- a/configure.in
+++ b/configure.in
@@ -1544,14 +1544,16 @@ dnl The following is a list of supported systems.
dnl Sequential to keep the logic very simple
dnl These values may be checked and reset later.
dnl ===================================================================
+#defaults unless the os test overrides this:
+test_cairo=yes
+test_randr=yes
+
case "$build_os" in
solaris*)
test_gtk=yes
- test_cairo=yes
build_gstreamer=yes
test_kde=yes
test_cups=yes
- test_randr=yes
test_freetype=yes
_os=SunOS
AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
@@ -1581,30 +1583,29 @@ case "$build_os" in
;;
linux-gnu*|k*bsd*-gnu*)
test_gtk=yes
- test_cairo=yes
build_gstreamer=yes
test_kde=yes
test_kde4=yes
test_cups=yes
- test_randr=yes
test_freetype=yes
test_unix_quickstarter=yes
_os=Linux
;;
gnu)
+ test_randr=no
+ test_cairo=no
test_cups=no
_os=GNU
;;
cygwin*) # Windows
test_cups=no
- test_cairo=yes
+ test_randr=no
test_freetype=no
_os=WINNT
;;
darwin*) # Mac OS X
test_cups=yes
test_gtk=yes
- test_cairo=yes
test_randr=no
test_freetype=no
_os=Darwin
@@ -1615,21 +1616,19 @@ case "$build_os" in
fi
;;
os2*)
- test_x=no
test_cups=no
test_randr=no
test_gtk=no
+ test_cairo=no
test_freetype=no
_os=OS2
;;
freebsd*)
test_gtk=yes
- test_cairo=yes
build_gstreamer=yes
test_kde=yes
test_kde4=yes
test_cups=yes
- test_randr=yes
test_freetype=yes
AC_MSG_CHECKING([the FreeBSD operating system release])
if test -n "$with_os_version"; then
@@ -1654,17 +1653,16 @@ case "$build_os" in
;;
osf)
test_cups=no
+ test_cairo=no
test_randr=no
_os=OSF1
;;
*netbsd*)
test_gtk=yes
- test_cairo=yes
build_gstreamer=yes
test_kde=yes
test_kde4=yes
test_cups=yes
- test_randr=yes
test_freetype=yes
PTHREAD_CFLAGS="-pthread"
PTHREAD_LIBS="-pthread -lpthread"
@@ -1673,18 +1671,16 @@ case "$build_os" in
aix*)
test_cups=no
test_randr=no
+ test_cairo=no
test_freetype=yes
PTHREAD_LIBS=-pthread
_os=AIX
;;
openbsd*)
- test_x=yes
test_gtk=yes
- build_cairo=yes
test_kde=yes
test_cups=yes
test_freetype=yes
- test_randr=yes
PTHREAD_CFLAGS="-pthread -D_THREAD_SAFE"
PTHREAD_LIBS="-pthread"
_os=OpenBSD
More information about the Libreoffice-commits
mailing list