[Libreoffice-commits] .: configure.in .gitignore
Joseph Powers
jpowers at kemper.freedesktop.org
Mon May 30 07:48:56 PDT 2011
.gitignore | 1 +
configure.in | 50 +++++++++++++++++++++++++-------------------------
2 files changed, 26 insertions(+), 25 deletions(-)
New commits:
commit 89b6c5d28358fa2b422448eb2495dfc32aed058b
Author: Joseph Powers <jpowers27 at cox.net>
Date: Mon May 30 07:47:31 2011 -0700
It seams that $SYSTEM_LIBRSVG can be empty, so add quotes to avoid error.
Also, add instsetoo_native to the ignore list.
diff --git a/.gitignore b/.gitignore
index d82ad75..21ed840 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@
/*/unxand?
/*/unxand?.pro
/solver/*
+/instsetoo_native/*
# autoconf generated stuff
/aclocal.m4
diff --git a/configure.in b/configure.in
index bc6d4ba..366ff92 100755
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
dnl -*- Mode: Autoconf; tab-width: 8; indent-tabs-mode: nil -*-
-dnl configure.in serves as input for the GNU autoconf package
+dnl configure.in serves as input for the GNU autoconf package
dnl in order to create a configure script.
AC_INIT([LibreOffice], [3.5],,, [http://documentfoundation.org/])
@@ -246,7 +246,7 @@ AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug],
[Include debugging symbols from --enable-symbols plus extra debugging
code. Extra large build! (enables -g compiler flag and dmake debug=true)
- If you need even more verbose output, build a module with
+ If you need even more verbose output, build a module with
"build -- debug=true dbglevel=2".]))
AC_ARG_ENABLE(dbgutil,
@@ -522,7 +522,7 @@ AC_ARG_WITH(external-tar,
AC_ARG_WITH(linked-git,
AS_HELP_STRING([--with-linked-git=<OTHER_CLONE_DIR>],
- [Specify another checkout's clonedir to re-use. This makes use of
+ [Specify another checkout's clonedir to re-use. This makes use of
git-new-workdir, and saves a lot of diskspace when having multiple
trees side-by-side.]),
GIT_LINK_SRC=$withval ,
@@ -1302,7 +1302,7 @@ AC_ARG_WITH(icu-native-build-root,
When cross-compiling and not using a "system" ICU,
specify the path to the "source" directory of the
ICU build in a native LibreOffice build tree. For example
- --with-icu-native-build-root=/Users/tml/lo-macosx/icu/unxmacxi.pro/misc/build/icu/source
+ --with-icu-native-build-root=/Users/tml/lo-macosx/icu/unxmacxi.pro/misc/build/icu/source
],
,)
@@ -2189,14 +2189,14 @@ if test "$GCC" = "yes" ; then
],[
printf ("");
])],
- [ if ./conftest$EXEEXT; then
+ [ if ./conftest$EXEEXT; then
HAVE_LD_HASH_STYLE=TRUE
WITH_LINKER_HASH_STYLE=$hash_style
- fi],
+ fi],
[HAVE_LD_HASH_STYLE=FALSE])
LDFLAGS=$hash_style_ldflags_save
done
-
+
if test "$HAVE_LD_HASH_STYLE" = "TRUE"; then
AC_MSG_RESULT( $WITH_LINKER_HASH_STYLE )
else
@@ -2382,7 +2382,7 @@ if test "$_os" = "WINNT"; then
else
AC_MSG_RESULT(["$SHOWINCLUDES_PREFIX"])
fi
-
+
# Check for 64-bit (cross-)compiler to use to build the 64-bit
# version of the Explorer extension (and maybe other small
# bits, too) needed when installing a 32-bit LibreOffice on a
@@ -2423,7 +2423,7 @@ if test "$_os" = "WINNT"; then
fi
AC_SUBST(BUILD_X64)
- # These are passed to the environment through set_soenv.in as usual, and then
+ # These are passed to the environment through set_soenv.in as usual, and then
# used in set_wntx64.mk
AC_SUBST(CC_X64_BINARY)
AC_SUBST(CXX_X64_BINARY)
@@ -2617,7 +2617,7 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
m4_pattern_allow([AC_CHECK_ALIGNOF])
m4_ifdef([AC_CHECK_ALIGNOF],
,
- [
+ [
dnl We know that the ALIGNOF_ variables are used only when cross-compiling
dnl in sal/typesconfig/makefile.mk...
if test "$cross_compiling" = "yes"; then
@@ -2684,7 +2684,7 @@ AC_SUBST(ALIGNOF_LONG)
AC_SUBST(ALIGNOF_DOUBLE)
dnl ===================================================================
-dnl Check if valgrind.h is available
+dnl Check if valgrind.h is available
dnl ===================================================================
if test "$cross_compiling" != "yes" -a "$enable_dbgutil" != "no"; then
dnl Test $prefix (currently only testing for /usr and /usr/local)
@@ -4107,7 +4107,7 @@ if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then
if test -z "$with_mingw_cross_compiler"; then
dnl Guess...
AC_CHECK_PROGS(MINGWCXX,i386-mingw32msvc-g++ i586-pc-mingw32-g++ i686-pc-mingw32-g++ i686-w64-mingw32-g++,false)
- elif test -x "$with_mingw_cross_compiler"; then
+ elif test -x "$with_mingw_cross_compiler"; then
MINGWCXX="$with_mingw_cross_compiler"
else
AC_CHECK_TOOL(MINGWCXX, "$with_mingw_cross_compiler", false)
@@ -4565,20 +4565,20 @@ if test -n "$with_system_db" -o -n "$with_system_libs" && \
DB_LIB=
for dbver in 5.1 5.0 5 4.8 4.7 4 ''; do
for dash in - ''; do
- AC_CHECK_LIB(db$dash$dbver, dbopen,
+ AC_CHECK_LIB(db$dash$dbver, dbopen,
[ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ])
- AC_CHECK_LIB(db$dash$dbver, __db185_open,
+ AC_CHECK_LIB(db$dash$dbver, __db185_open,
[ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ])
done
test -n "$DB_LIB" && break
done
if test -z "$DB_LIB"; then
- AC_CHECK_LIB(db, dbopen,
+ AC_CHECK_LIB(db, dbopen,
[ DB_LIB="db"; DB_CPPLIB="db_cxx" ])
fi
- if test -z "$DB_LIB" ; then
+ if test -z "$DB_LIB" ; then
AC_MSG_ERROR([db library not found. Use the correct -L flag,
or install the Berkeley db development package.])
fi
@@ -6491,7 +6491,7 @@ dnl ===================================================================
dnl Now with librsvg we always need cairo (?), so hardcode ENABLE_CAIRO to TRUE
dnl Eventually should bin conditionals on ENABLE_CAIRO.
-ENABLE_CAIRO="TRUE"
+ENABLE_CAIRO="TRUE"
BUILD_PIXMAN=""
SYSTEM_CAIRO=""
@@ -6521,7 +6521,7 @@ int main(int argc, char **argv) {
#endif
}
],
- [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([yes])],
[AC_MSG_ERROR([no, X headers too old.])]
)
fi
@@ -7762,7 +7762,7 @@ else
WITH_EXTRA_GALLERY=YES
BUILD_TYPE="$BUILD_TYPE EXTRA_GALLERY"
SCPDEFS="$SCPDEFS -DWITH_EXTRA_GALLERY"
- OOOP_GALLERY_PACK="af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip"
+ OOOP_GALLERY_PACK="af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip"
fi
AC_SUBST(WITH_EXTRA_GALLERY)
AC_SUBST(OOOP_GALLERY_PACK)
@@ -7967,7 +7967,7 @@ dnl As long as the only thing we need gdk-pxbuf for is below
dnl librsvg, use the same --with-system-librsvg (possibly implied
dnl by --with-system-libs) to override this.
-if test $SYSTEM_LIBRSVG = YES; then
+if test "$SYSTEM_LIBRSVG" = YES; then
SYSTEM_GDKPIXBUF=YES
AC_MSG_RESULT([yes])
else
@@ -7994,7 +7994,7 @@ dnl As long as the only thing we need GLib for is below
dnl librsvg, use the same --with-system-librsvg (possibly implied
dnl by --with-system-libs) to override this.
-if test $SYSTEM_LIBRSVG = YES; then
+if test "$SYSTEM_LIBRSVG" = YES; then
SYSTEM_GLIB=YES
AC_MSG_RESULT([yes])
else
@@ -8045,7 +8045,7 @@ dnl As long as the only thing we need libcroco for is below
dnl librsvg, use the same --with-system-librsvg (possibly implied
dnl by --with-system-libs) to override this.
-if test $SYSTEM_LIBRSVG = YES; then
+if test "$SYSTEM_LIBRSVG" = YES; then
SYSTEM_LIBCROCO=YES
AC_MSG_RESULT([yes])
else
@@ -8072,7 +8072,7 @@ dnl As long as the only thing we need Pango for is below
dnl librsvg, use the same --with-system-librsvg (possibly implied
dnl by --with-system-libs) to override this.
-if test $SYSTEM_LIBRSVG = YES; then
+if test "$SYSTEM_LIBRSVG" = YES; then
SYSTEM_PANGO=YES
AC_MSG_RESULT([yes])
else
@@ -8099,7 +8099,7 @@ dnl As long as the only thing we need libgsf for is below librsvg (is
dnl it?), use the same --with-system-librsvg (possibly implied by
dnl --with-system-libs) to override this.
-if test $SYSTEM_LIBRSVG = YES; then
+if test "$SYSTEM_LIBRSVG" = YES; then
SYSTEM_LIBGSF=YES
AC_MSG_RESULT([yes])
else
@@ -8295,7 +8295,7 @@ if test "$ANT_HOME" != "NO_ANT_HOME"; then
else
AC_MSG_ERROR([Ant libraries not found!])
fi
- fi
+ fi
fi
fi
fi
More information about the Libreoffice-commits
mailing list