[Libreoffice-commits] .: 10 commits - configure.in set_soenv.in
Sebastian Spaeth
spaetz at kemper.freedesktop.org
Fri Dec 10 04:54:46 PST 2010
configure.in | 580 +++++++++++++++++------------------------------------------
set_soenv.in | 4
2 files changed, 174 insertions(+), 410 deletions(-)
New commits:
commit d34e57de08062da3c36d3fb11392880535902986
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Fri Dec 10 13:51:28 2010 +0100
Simplify --disable-strip-solver
1) AC_MSG_RESULT something (we did not before)
2) Assume 'yes' if we have a value and it is not 'no'
Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
diff --git a/configure.in b/configure.in
index a784952..42ebaf4 100755
--- a/configure.in
+++ b/configure.in
@@ -1671,20 +1671,16 @@ AC_SUBST(ENABLE_SYMBOLS)
dnl Determine if the solver is to be stripped or not.
dnl ===================================================================
AC_MSG_CHECKING([whether to strip the solver or not.])
-if test -n "$enable_strip_solver"; then
- if test "$enable_strip_solver" = "yes"; then
- DISABLE_STRIP=
- else if test "$enable_strip_solver" = "no"; then
- DISABLE_STRIP="TRUE"
- else
- AC_MSG_ERROR([--disable-strip-solver only accepts yes or no as parameter.])
- fi
- fi
+if test "z$enable_strip_solver" = "zno"; then
+ DISABLE_STRIP="TRUE"
+ AC_MSG_RESULT([no])
else
if test -n "$ENABLE_SYMBOLS"; then
DISABLE_STRIP="TRUE"
+ AC_MSG_RESULT([no])
else
DISABLE_STRIP=
+ AC_MSG_RESULT([yes])
fi
fi
AC_SUBST(DISABLE_STRIP)
commit 692b5abd1d3de16da129f5b47351a58432b63e7b
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Fri Dec 10 13:49:16 2010 +0100
Simplify logic for checking --enable-symbols
1)Always enable when --enable-debug was chosen (as it says in the help)
2)Just check no,small,SMALL values and assume 'yes' for everything else.
Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
diff --git a/configure.in b/configure.in
index 6a07dbb..a784952 100755
--- a/configure.in
+++ b/configure.in
@@ -1625,9 +1625,7 @@ dnl ===================================================================
AC_MSG_CHECKING([whether to do a debug build])
if test -n "$enable_debug" && test "$enable_debug" != "no"; then
ENABLE_DEBUG="TRUE"
- if test -z "$enable_symbols"; then
- enable_symbols="yes"
- fi
+ enable_symbols="yes"
AC_MSG_RESULT([yes])
else
ENABLE_DEBUG="FALSE"
@@ -1655,22 +1653,14 @@ AC_SUBST(PROEXT)
dnl whether to include symbols into final build.
dnl ===================================================================
-AC_MSG_CHECKING([whether to include symbols into final build])
-if test -n "$enable_symbols" && test "$enable_symbols" != "no"; then
- if test "$enable_symbols" = "yes" -o "$enable_symbols" = "TRUE"; then
- ENABLE_SYMBOLS="TRUE"
- AC_MSG_RESULT([yes])
+AC_MSG_CHECKING([whether to include symbols])
+if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
+ if test "$enable_symbols" = "small" -o "$enable_symbols" = "SMALL"; then
+ ENABLE_SYMBOLS="SMALL"
+ AC_MSG_RESULT([yes, small])
else
- if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
- ENABLE_SYMBOLS="SMALL"
- AC_MSG_RESULT([yes, small ones])
- else if test "$enable_symbols" != "no" ; then
- echo enable symbols is: $enable_symbols
- AC_MSG_ERROR([--enable-symbols only accepts yes, TRUE or SMALL as parameter.])
- else
- ENABLE_SYMBOLS=
- fi
- fi
+ ENABLE_SYMBOLS="TRUE"
+ AC_MSG_RESULT([yes])
fi
else
ENABLE_SYMBOLS=
commit ebf9492f22bb18f73241e034418d9720b84a748a
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Fri Dec 10 13:46:22 2010 +0100
Minor beautifications/simplifications
Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
diff --git a/configure.in b/configure.in
index 6c87684..6a07dbb 100755
--- a/configure.in
+++ b/configure.in
@@ -1289,6 +1289,7 @@ echo "* Running ${PACKAGE_NAME} build configuration."
echo "*"
echo "********************************************************************"
echo ""
+
dnl ===================================================================
dnl check for required programs (grep, awk, sed, bash)
dnl ===================================================================
@@ -1381,8 +1382,6 @@ if echo "$build_os" | grep cygwin; then
if test "`echo $CygwinVer | $AWK -F . '{ print $1$2 }'`" -lt "15"; then
AC_MSG_ERROR([You need at least Cygwin V1.5.x])
fi
-else
- CygwinVer="false"
fi
dnl ===================================================================
@@ -1565,7 +1564,7 @@ if test "$_os" = "WINNT"; then
dnl Set the CL_X64 variable.
AC_MSG_CHECKING([whether to use the Microsoft C/C++ x64 compiler])
- if test "$enable_cl_x64" = "" -o "$enable_cl_x64" = "no"; then
+ if test "z$enable_cl_x64" = "z" -o "$enable_cl_x64" = "no"; then
CL_X64=""
AC_MSG_RESULT([no])
else
@@ -1753,7 +1752,7 @@ if test -z "$TARFILE_LOCATION"; then
fi
AC_SUBST(TARFILE_LOCATION)
-if test -z "$enable_fetch_external" || test "$enable_fetch_external" = "yes" \
+if test "z$enable_fetch_external" != "zno" \
&& test -z "$with_system_libs" -a "$with_system_jars" != "no"; then
DO_FETCH_TARBALLS="yes"
fi
commit 02840c8bf12df4a21ef6a9bdde0f9883fc3c27db
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Fri Dec 10 13:45:29 2010 +0100
Move Windows-specific tests into one location
rather than sprinkling them around.
Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
diff --git a/configure.in b/configure.in
index f4c4b8b..6c87684 100755
--- a/configure.in
+++ b/configure.in
@@ -1573,6 +1573,37 @@ if test "$_os" = "WINNT"; then
AC_MSG_RESULT([yes])
fi
AC_SUBST(CL_X64)
+
+ AC_MSG_CHECKING([whether to use DirectX])
+ if test "$enable_directx" = "yes" -o "$enable_directx" = "TRUE" -o "$enable_directx" = ""; then
+ ENABLE_DIRECTX="TRUE"
+ AC_MSG_RESULT([yes])
+ else
+ ENABLE_DIRECTX=""
+ AC_MSG_RESULT([no])
+ fi
+ AC_SUBST(ENABLE_DIRECTX)
+
+ AC_MSG_CHECKING([whether to use ActiveX])
+ if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then
+ DISABLE_ACTIVEX=""
+ AC_MSG_RESULT([yes])
+ else
+ DISABLE_ACTIVEX="TRUE"
+ AC_MSG_RESULT([no])
+ fi
+ AC_SUBST(DISABLE_ACTIVEX)
+
+ AC_MSG_CHECKING([whether to use ATL])
+ if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then
+ DISABLE_ATL=""
+ AC_MSG_RESULT([yes])
+ else
+ DISABLE_ATL="TRUE"
+ AC_MSG_RESULT([no])
+ fi
+ AC_SUBST(DISABLE_ATL)
+
fi
dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
@@ -1746,39 +1777,6 @@ else
fi
AC_SUBST(WITH_BINFILTER)
-if test "$_os" = "WINNT"; then
- AC_MSG_CHECKING([whether to use DirectX])
- if test "$enable_directx" = "yes" -o "$enable_directx" = "TRUE" -o "$enable_directx" = ""; then
- ENABLE_DIRECTX="TRUE"
- AC_MSG_RESULT([yes])
- else
- ENABLE_DIRECTX=""
- AC_MSG_RESULT([no])
- fi
- AC_SUBST(ENABLE_DIRECTX)
-
- AC_MSG_CHECKING([whether to use ActiveX])
- if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then
- DISABLE_ACTIVEX=""
- AC_MSG_RESULT([yes])
- else
- DISABLE_ACTIVEX="TRUE"
- AC_MSG_RESULT([no])
- fi
- AC_SUBST(DISABLE_ACTIVEX)
-
- AC_MSG_CHECKING([whether to use ATL])
- if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then
- DISABLE_ATL=""
- AC_MSG_RESULT([yes])
- else
- DISABLE_ATL="TRUE"
- AC_MSG_RESULT([no])
- fi
- AC_SUBST(DISABLE_ATL)
-
-fi
-
dnl ===================================================================
dnl Disable rpath in shared libraries?
dnl ===================================================================
commit 59899244a512c55a6656a932bc0df2b70976653f
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Fri Dec 10 13:43:31 2010 +0100
Combine all fontconfig tests in one place
Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
diff --git a/configure.in b/configure.in
index 2a1ef4e..f4c4b8b 100755
--- a/configure.in
+++ b/configure.in
@@ -1394,6 +1394,7 @@ dnl ===================================================================
test_cairo=yes
test_randr=yes
test_cups=yes
+test_fontconfig=yes
case "$build_os" in
solaris*)
@@ -1447,12 +1448,14 @@ case "$build_os" in
test_randr=no
test_freetype=no
test_cairo=no
+ test_fontconfig=no
_os=WINNT
;;
darwin*) # Mac OS X
test_gtk=yes
test_randr=no
test_freetype=no
+ test_fontconfig=no
test_cairo=no
_os=Darwin
if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
@@ -1686,9 +1689,25 @@ AC_SUBST(ENABLE_CUPS)
dnl check for fontconfig support
dnl ===================================================================
AC_MSG_CHECKING([whether to enable fontconfig support])
-if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a \( "$enable_fontconfig" = "yes" -o "$enable_fontconfig" = "TRUE" \); then
+if test "z$test_fontconfig" = "zyes" -a "z$enable_fontconfig" != "no"; then
ENABLE_FONTCONFIG="TRUE"
AC_MSG_RESULT([yes])
+
+ AC_CHECK_HEADER(fontconfig/fontconfig.h, [],
+ [AC_MSG_ERROR([fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?])], [])
+ AC_MSG_CHECKING([whether fontconfig is >= 2.2.0])
+ AC_TRY_RUN([
+#include <fontconfig/fontconfig.h>
+
+int main(int argc, char **argv) {
+ if(FC_MAJOR > 2 || (FC_MAJOR == 2 && FC_MINOR >= 2)) return 0;
+ else return 1;
+} ],
+ [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])
+ AC_MSG_ERROR([fontconfig >= 2.2.0 needed])
+ ])
+
else
ENABLE_FONTCONFIG=""
AC_MSG_RESULT([no])
@@ -5447,24 +5466,6 @@ fi
AC_SUBST(DISABLE_XAW)
-
-dnl ===================================================================
-dnl Check if fontconfig/fontconfig.h is available
-dnl ===================================================================
-if test "$ENABLE_FONTCONFIG" = "TRUE" ; then
- AC_CHECK_HEADER(fontconfig/fontconfig.h, [],
- [AC_MSG_ERROR([fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?])], [])
- AC_MSG_CHECKING([whether fontconfig is >= 2.2.0])
- AC_TRY_RUN([
-#include <fontconfig/fontconfig.h>
-
-int main(int argc, char **argv) {
- if(FC_MAJOR > 2 || (FC_MAJOR == 2 && FC_MINOR >= 2)) return 0;
- else return 1;
-}
-], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no, fontconfig >= 2.2.0 needed])])
-fi
-
dnl ===================================================================
dnl Check for system Xrender
dnl ===================================================================
commit 6326c91e795612067ffc1cef0e747608742a5a7f
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Fri Dec 10 13:41:53 2010 +0100
Move GNU tar check to the initial program availability checks
Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
diff --git a/configure.in b/configure.in
index 4e34924..2a1ef4e 100755
--- a/configure.in
+++ b/configure.in
@@ -1316,6 +1316,19 @@ if test -z "$BASH"; then
fi
AC_SUBST(BASH)
+AC_MSG_CHECKING([for GNU tar])
+for a in $GNUTAR gtar gnutar tar; do
+ $a --version 2> /dev/null | grep GNU 2>&1 > /dev/null
+ if test $? -eq 0; then
+ GNUTAR=$a
+ break
+ fi
+done
+AC_MSG_RESULT($GNUTAR)
+if test -z "$GNUTAR"; then
+ AC_MSG_ERROR([not found. install GNU tar.])
+fi
+AC_SUBST(GNUTAR)
dnl ===================================================================
dnl Checks for --with-local-solenv invocation
@@ -2040,23 +2053,6 @@ fi
AC_SUBST(GNUMAKE)
dnl ===================================================================
-dnl Search all the common names for GNU tar
-dnl ===================================================================
-AC_MSG_CHECKING([for GNU tar])
-for a in $GNUTAR gtar gnutar tar; do
- $a --version 2> /dev/null | grep GNU 2>&1 > /dev/null
- if test $? -eq 0; then
- GNUTAR=$a
- break
- fi
-done
-AC_MSG_RESULT($GNUTAR)
-if test -z "$GNUTAR"; then
- AC_MSG_ERROR([not found. install GNU tar.])
-fi
-
-AC_SUBST(GNUTAR)
-
dnl Test the solaris compiler version
dnl ===================================================================
if test "$_os" = "SunOS"; then
commit 2f60fe4aa62d3231a5ed382a38d831f4e43fce52
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Fri Dec 10 13:40:41 2010 +0100
Coment additions/removals rhroughout configure.in
Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
diff --git a/configure.in b/configure.in
index 0cb4ebf..4e34924 100755
--- a/configure.in
+++ b/configure.in
@@ -1283,9 +1283,6 @@ AC_ARG_WITH(max-jobs,
BUILD_TYPE="LibO"
-dnl ===================================================================
-dnl Message.
-dnl ===================================================================
echo "********************************************************************"
echo "*"
echo "* Running ${PACKAGE_NAME} build configuration."
@@ -1293,7 +1290,7 @@ echo "*"
echo "********************************************************************"
echo ""
dnl ===================================================================
-dnl Configure pre-requisites. (grep, awk, sed, bash)
+dnl check for required programs (grep, awk, sed, bash)
dnl ===================================================================
cat /dev/null > warn
@@ -1312,6 +1309,7 @@ AC_PATH_PROGS(SED, sed )
if test -z "$SED"; then
AC_MSG_ERROR([install sed to run this script])
fi
+
AC_PATH_PROG(BASH, bash)
if test -z "$BASH"; then
AC_MSG_ERROR([bash not found in \$PATH])
@@ -1319,6 +1317,10 @@ fi
AC_SUBST(BASH)
+dnl ===================================================================
+dnl Checks for --with-local-solenv invocation
+dnl TODO: Is this still required?
+dnl ===================================================================
AC_MSG_CHECKING([for solenv environment])
if test -z "$with_local_solenv"; then
LOCAL_SOLENV="DEFAULT"
@@ -1356,6 +1358,9 @@ if test "$build" != "$host" -o "$build" != "$target" \
echo "cross-compiling by any means is not supported (yet)!" >> warn
fi
+dnl ===================================================================
+dnl Checks for cygwin >= 1.5
+dnl ===================================================================
if echo "$build_os" | grep cygwin; then
AC_MSG_CHECKING([Cygwin version])
CygwinVer=`uname -r`
@@ -1533,14 +1538,16 @@ else
fi
AC_SUBST(ENABLE_CRASHDUMP)
+
+dnl ===================================================================
+dnl Windows specific tests and stuff
+dnl ===================================================================
if test "$_os" = "WINNT"; then
+
+ dnl Include twain scanners
BUILD_TYPE="$BUILD_TYPE TWAIN"
-fi
-if test "$_os" = "WINNT"; then
- dnl ===================================================================
dnl Set the CL_X64 variable.
- dnl ===================================================================
AC_MSG_CHECKING([whether to use the Microsoft C/C++ x64 compiler])
if test "$enable_cl_x64" = "" -o "$enable_cl_x64" = "no"; then
CL_X64=""
@@ -1552,7 +1559,6 @@ if test "$_os" = "WINNT"; then
AC_SUBST(CL_X64)
fi
-dnl ===================================================================
dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
dnl ===================================================================
AC_MSG_CHECKING([whether to turn warnings to errors])
@@ -1568,7 +1574,6 @@ else
fi
AC_SUBST(ENABLE_WERROR)
-dnl ===================================================================
dnl Set the ENABLE_DEBUG variable. (Activate --enable-symbols)
dnl ===================================================================
AC_MSG_CHECKING([whether to do a debug build])
@@ -1584,7 +1589,6 @@ else
fi
AC_SUBST(ENABLE_DEBUG)
-dnl ===================================================================
dnl Set the ENABLE_DBGUTIL variable
dnl ===================================================================
AC_MSG_CHECKING([whether to build with additional debug utilities])
@@ -1603,8 +1607,7 @@ AC_SUBST(PRODUCT)
AC_SUBST(PROFULLSWITCH)
AC_SUBST(PROEXT)
-dnl ===================================================================
-dnl First setting is whether to include symbols into final build.
+dnl whether to include symbols into final build.
dnl ===================================================================
AC_MSG_CHECKING([whether to include symbols into final build])
if test -n "$enable_symbols" && test "$enable_symbols" != "no"; then
@@ -1629,7 +1632,6 @@ else
fi
AC_SUBST(ENABLE_SYMBOLS)
-dnl ===================================================================
dnl Determine if the solver is to be stripped or not.
dnl ===================================================================
AC_MSG_CHECKING([whether to strip the solver or not.])
@@ -1668,6 +1670,8 @@ else
fi
AC_SUBST(ENABLE_CUPS)
+dnl check for fontconfig support
+dnl ===================================================================
AC_MSG_CHECKING([whether to enable fontconfig support])
if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a \( "$enable_fontconfig" = "yes" -o "$enable_fontconfig" = "TRUE" \); then
ENABLE_FONTCONFIG="TRUE"
@@ -1678,8 +1682,8 @@ else
fi
AC_SUBST(ENABLE_FONTCONFIG)
-dnl ===================================================================
-dnl find external tarballs.
+
+dnl whether to find & fetch external tarballs?
dnl ===================================================================
if test -z "$TARFILE_LOCATION"; then
TARFILE_LOCATION="DEFAULT"
@@ -1692,12 +1696,11 @@ if test -z "$enable_fetch_external" || test "$enable_fetch_external" = "yes" \
fi
AC_SUBST(DO_FETCH_TARBALLS)
-dnl ===================================================================
+
dnl git-new-workdir
dnl ===================================================================
AC_SUBST(GIT_LINK_SRC)
-dnl ===================================================================
dnl Disable legacy binary file formats filters
dnl ===================================================================
AC_MSG_CHECKING([whether to enable filters for legacy binary file formats (StarOffice 5.2)])
@@ -2054,7 +2057,6 @@ fi
AC_SUBST(GNUTAR)
-dnl ===================================================================
dnl Test the solaris compiler version
dnl ===================================================================
if test "$_os" = "SunOS"; then
commit b64067e4f8bc15b0fa9ab585890649add4185046
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Fri Dec 10 13:13:29 2010 +0100
Pull cups-related checks together in one place in configure.in
Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
diff --git a/configure.in b/configure.in
index 0c5c876..0cb4ebf 100755
--- a/configure.in
+++ b/configure.in
@@ -176,8 +176,7 @@ AC_ARG_ENABLE(evolution2,
AC_ARG_ENABLE(cups,
AS_HELP_STRING([--disable-cups],
- [Disable cups support in the psprint project.]),
-,enable_cups=yes)
+ [Disable cups support in the psprint project.]))
AC_ARG_ENABLE(fontconfig,
AS_HELP_STRING([--disable-fontconfig],
@@ -1376,13 +1375,13 @@ dnl ===================================================================
#defaults unless the os test overrides this:
test_cairo=yes
test_randr=yes
+test_cups=yes
case "$build_os" in
solaris*)
test_gtk=yes
build_gstreamer=yes
test_kde=yes
- test_cups=yes
test_freetype=yes
_os=SunOS
AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
@@ -1415,7 +1414,6 @@ case "$build_os" in
build_gstreamer=yes
test_kde=yes
test_kde4=yes
- test_cups=yes
test_freetype=yes
test_unix_quickstarter=yes
_os=Linux
@@ -1434,7 +1432,6 @@ case "$build_os" in
_os=WINNT
;;
darwin*) # Mac OS X
- test_cups=yes
test_gtk=yes
test_randr=no
test_freetype=no
@@ -1459,7 +1456,6 @@ case "$build_os" in
build_gstreamer=yes
test_kde=yes
test_kde4=yes
- test_cups=yes
test_freetype=yes
AC_MSG_CHECKING([the FreeBSD operating system release])
if test -n "$with_os_version"; then
@@ -1493,7 +1489,6 @@ case "$build_os" in
build_gstreamer=yes
test_kde=yes
test_kde4=yes
- test_cups=yes
test_freetype=yes
PTHREAD_CFLAGS="-pthread"
PTHREAD_LIBS="-pthread -lpthread"
@@ -1510,7 +1505,6 @@ case "$build_os" in
openbsd*)
test_gtk=yes
test_kde=yes
- test_cups=yes
test_freetype=yes
PTHREAD_CFLAGS="-pthread -D_THREAD_SAFE"
PTHREAD_LIBS="-pthread"
@@ -1657,13 +1651,17 @@ else
fi
AC_SUBST(DISABLE_STRIP)
+dnl check for cups support
dnl ===================================================================
-dnl Build options
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable native CUPS support])
-if test "$test_cups" = "yes" -a \( "$enable_cups" = "yes" -o "$enable_cups" = "TRUE" \) ; then
+AC_MSG_CHECKING([whether to enable native cups support])
+if test "$test_cups" = "yes" -a "z$enable_cups" != "zno"; then
ENABLE_CUPS="TRUE"
AC_MSG_RESULT([yes])
+ AC_CHECK_LIB(cups, cupsPrintFiles)
+ AC_CHECK_HEADER(cups/cups.h, AC_DEFINE(HAVE_CUPS_H))
+ if test "$ac_cv_lib_cups_cupsPrintFiles" != "yes" -a "$ac_cv_header_cups_cups_h" != "yes"; then
+ AC_MSG_ERROR([Could not find CUPS. Install libcupsys2-dev or cups???-devel.])
+ fi
else
ENABLE_CUPS=""
AC_MSG_RESULT([no])
@@ -2480,14 +2478,6 @@ dnl of the install
dnl ===================================================================
-dnl ===================================================================
-dnl Check if cups/cups.h is available
-dnl ===================================================================
-if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then
- AC_CHECK_HEADER(cups/cups.h, [],
- [AC_MSG_ERROR([cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?])], [])
-fi
-
if test "$_os" = "Linux"; then
AC_MSG_CHECKING([whether to link to libcrypt])
if test -n "$enable_crypt_link" -a "$enable_crypt_link" != "no"; then
commit 1e19e78d4f339cef65e6b103850d1eef579f8df2
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Fri Dec 10 13:10:14 2010 +0100
Don't "sed" bash away in configure just to add it back in set_soenv
Keep the full bash path. Made sure it is not used anywhere else.
No functional change at all.
Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
diff --git a/configure.in b/configure.in
index 01924f6..0c5c876 100755
--- a/configure.in
+++ b/configure.in
@@ -1294,7 +1294,7 @@ echo "*"
echo "********************************************************************"
echo ""
dnl ===================================================================
-dnl Configure pre-requisites.
+dnl Configure pre-requisites. (grep, awk, sed, bash)
dnl ===================================================================
cat /dev/null > warn
@@ -1313,6 +1313,12 @@ AC_PATH_PROGS(SED, sed )
if test -z "$SED"; then
AC_MSG_ERROR([install sed to run this script])
fi
+AC_PATH_PROG(BASH, bash)
+if test -z "$BASH"; then
+ AC_MSG_ERROR([bash not found in \$PATH])
+fi
+AC_SUBST(BASH)
+
AC_MSG_CHECKING([for solenv environment])
if test -z "$with_local_solenv"; then
@@ -1856,17 +1862,6 @@ fi
dnl ===================================================================
-dnl Check whether the bash shell can be used.
-dnl ===================================================================
-AC_PATH_PROG(SHELLPATH, bash)
-if test -z "$SHELLPATH"; then
- AC_MSG_ERROR([bash not found in \$PATH])
-else
- SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"`
-fi
-AC_SUBST(SHELLPATH)
-
-dnl ===================================================================
dnl Checks for c compiler,
dnl The check for the c++ compiler is later on.
dnl ===================================================================
diff --git a/set_soenv.in b/set_soenv.in
index 855d184..40e31a2 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -886,8 +886,8 @@ $JAVA_HOME = PathFormat('@JAVA_HOME@') ;
if ( $platform =~ m/cygwin|os2/ ) {
$JAVA_HOME =~ s/[\s\/]+$//; # remove trailing \n or \/ if there is any.
}
-# 3. shell path.
-$OOO_SHELL = '@SHELLPATH@'."\/bash";
+# 3. bash path.
+$OOO_SHELL = '@BASH@';
if ( '@STLPORT4@' eq $no_stl )
{
commit b047ca3f2992adfc5efd079b7092ee43a32f5f97
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Fri Dec 10 13:06:28 2010 +0100
Remove deprecated configure options that were not doing anything anymore.
Also some whitespace removal in the option definitions.
Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
diff --git a/configure.in b/configure.in
index 11083bb..01924f6 100755
--- a/configure.in
+++ b/configure.in
@@ -172,8 +172,7 @@ AC_ARG_ENABLE(mathmldtd,
AC_ARG_ENABLE(evolution2,
AS_HELP_STRING([--enable-evolution2],
[Allows the built-in evolution 2 addressbook connectivity build to be
- enabled.]),
-,)
+ enabled.]))
AC_ARG_ENABLE(cups,
AS_HELP_STRING([--disable-cups],
@@ -241,19 +240,16 @@ AC_ARG_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
- "build -- debug=true dbglevel=2".]),
-,)
+ "build -- debug=true dbglevel=2".]))
AC_ARG_ENABLE(dbgutil,
AS_HELP_STRING([--enable-dbgutil],
[Include additional debugging utilities, such as assertions, object
- counting, etc. Larger build. Independent from --enable-debug]),
-,)
+ counting, etc. Larger build. Independent from --enable-debug]))
AC_ARG_ENABLE(crashdump,
AS_HELP_STRING([--enable-crashdump],
- [Enable the crashdump feature code.]),
-,)
+ [Enable the crashdump feature.]))
AC_ARG_ENABLE(gtk,
AS_HELP_STRING([--disable-gtk],
@@ -487,64 +483,6 @@ AC_ARG_ENABLE(extra-font,
[Add extra font content.]),
,)
-dnl ---------- Deprecated since 2010-11-05 ----------
-
-AC_ARG_ENABLE(mysql-connector,
- AS_HELP_STRING([--enable-mysql-connector],
- [Deprecated: use --enable-ext-mysql-connector instead.]),
- if test -z "$enable_ext_mysql_connector"; then
- enable_ext_mysql_connector=$enable_mysql_connector;
- fi ,
-)
-
-AC_ARG_ENABLE(presenter-extra-ui,
- AS_HELP_STRING([--enable-presenter-extra-ui],
- [Deprecated: use --enable-ext-presenter-ui instead.]),
- if test -z "$enable_ext_presenter_ui"; then
- enable_ext_presenter_ui=$enable_presenter_extra_ui;
- fi ,
-)
-
-AC_ARG_ENABLE(minimizer,
- AS_HELP_STRING([--enable-minimizer],
- [Deprecated: use --enable-ext-presenter-minimizer instead.]),
- if test -z "$enable_ext_presenter_minimizer"; then
- enable_ext_presenter_minimizer=$enable_minimizer;
- fi ,
-)
-
-AC_ARG_ENABLE(presenter-console,
- AS_HELP_STRING([--enable-presenter-console],
- [Deprecated: use --enable-ext-presenter-console instead.]),
- if test -z "$enable_ext_presenter_console"; then
- enable_ext_presenter_console=$enable_presenter_console;
- fi ,
-)
-
-AC_ARG_ENABLE(pdfimport,
- AS_HELP_STRING([--enable-pdfimport],
- [Deprecated: use --enable-ext-pdfimport instead.]),
- if test -z "$enable_ext_pdfimport"; then
- enable_ext_pdfimport=$enable_pdfimport;
- fi ,
-)
-
-AC_ARG_ENABLE(wiki-publisher,
- AS_HELP_STRING([--enable-wiki-publisher],
- [Deprecated: use --enable-ext-wiki-publisher instead.]),
- if test -z "$enable_ext_wiki_publisher"; then
- enable_ext_wiki_publisher=$enable_wiki_publisher;
- fi ,
-)
-
-AC_ARG_ENABLE(report-builder,
- AS_HELP_STRING([--enable-report-builder],
- [Deprecated: use --enable-ext-report-builder instead.]),
- if test -z "$enable_ext_report_builder"; then
- enable_ext_report_builder=$enable_report_builder;
- fi ,
-)
-
dnl ===================================================================
dnl Optional Packages (--with/without-)
dnl ===================================================================
@@ -762,46 +700,38 @@ AC_ARG_WITH(system-python,
AC_ARG_WITH(system-icu,
AS_HELP_STRING([--with-system-icu],
- [Use icu already on system.]),
-,)
+ [Use icu already on system.]))
AC_ARG_WITH(system-poppler,
AS_HELP_STRING([--with-system-poppler],
- [Use system poppler. (only needed for pdfimport extension)]),
-,)
+ [Use system poppler. (only needed for pdfimport extension)]))
AC_ARG_WITH(system-db,
AS_HELP_STRING([--with-system-db],
- [Use berkeley db already on system.]),
-,)
+ [Use berkeley db already on system.]))
AC_ARG_WITH(system-lucene,
AS_HELP_STRING([--with-system-lucene],
- [Use lucene already on system.]),
-,)
+ [Use lucene already on system.]))
AC_ARG_WITH(system-apache-commons,
AS_HELP_STRING([--with-system-apache-commons],
- [Use apache commons libraries already on system.]),
-,)
+ [Use apache commons libraries already on system.]))
AC_ARG_WITH(lucene-core-jar,
AS_HELP_STRING([--with-lucene-core-jar=JARFILE],
[Specify path to jarfile manually.]),
- LUCENE_CORE_JAR=$withval ,
-)
+ LUCENE_CORE_JAR=$withval)
AC_ARG_WITH(lucene-analyzers-jar,
AS_HELP_STRING([--with-lucene-analyzers-jar=JARFILE],
[Specify path to jarfile manually.]),
- LUCENE_ANALYZERS_JAR=$withval ,
-)
+ LUCENE_ANALYZERS_JAR=$withval ,)
AC_ARG_WITH(system-mysql,
AS_HELP_STRING([--with-system-mysql],
[Use MySQL libraries already on system, for building the MySQL Connector/LibO
- extension. Requires MYSQLCONFIG to point to the mysql_config executable.]),
-,)
+ extension. Requires MYSQLCONFIG to point to the mysql_config executable.]))
AC_ARG_WITH(libmysql-path,
AS_HELP_STRING([--with-libmysql-path],
@@ -815,238 +745,195 @@ AC_ARG_WITH(libmysql-path,
AC_ARG_WITH(system-mysql-cppconn,
AS_HELP_STRING([--with-system-mysql-cppconn],
- [Use MySQL C++ Connector libraries already on system.]),
-,)
+ [Use MySQL C++ Connector libraries already on system.]))
AC_ARG_WITH(system-hsqldb,
AS_HELP_STRING([--with-system-hsqldb],
- [Use hsqldb already on system.]),
-,)
+ [Use hsqldb already on system.]))
AC_ARG_WITH(hsqldb-jar,
AS_HELP_STRING([--with-hsqldb-jar=JARFILE],
[Specify path to jarfile manually.]),
- HSQLDB_JAR=$withval ,
-)
+ HSQLDB_JAR=$withval)
AC_ARG_WITH(system-beanshell,
AS_HELP_STRING([--with-system-beanshell],
- [Use beanshell already on system.]),
-,)
+ [Use beanshell already on system.]))
AC_ARG_WITH(beanshell-jar,
AS_HELP_STRING([--with-beanshell-jar=JARFILE],
[Specify path to jarfile manually.]),
- BSH_JAR=$withval ,
-)
+ BSH_JAR=$withval)
AC_ARG_WITH(commons-codec-jar,
AS_HELP_STRING([--with-commons-codec-jar=JARFILE],
[Specify path to jarfile manually.]),
- COMMONS_CODEC_JAR=$withval ,
-)
+ COMMONS_CODEC_JAR=$withval)
AC_ARG_WITH(commons-lang-jar,
AS_HELP_STRING([--with-commons-lang-jar=JARFILE],
[Specify path to jarfile manually.]),
- COMMONS_LANG_JAR=$withval ,
-)
+ COMMONS_LANG_JAR=$withval)
AC_ARG_WITH(commons-httpclient-jar,
AS_HELP_STRING([--with-commons-httpclient-jar=JARFILE],
[Specify path to jarfile manually.]),
- COMMONS_HTTPCLIENT_JAR=$withval ,
-)
+ COMMONS_HTTPCLIENT_JAR=$withval)
AC_ARG_WITH(commons-logging-jar,
AS_HELP_STRING([--with-commons-logging-jar=JARFILE],
[Specify path to jarfile manually.]),
- COMMONS_LOGGING_JAR=$withval ,
-)
+ COMMONS_LOGGING_JAR=$withval)
AC_ARG_WITH(servlet-api-jar,
AS_HELP_STRING([--with-servlet-api-jar=JARFILE],
[Specify path to jarfile manually.]),
- SERVLETAPI_JAR=$withval ,
-)
+ SERVLETAPI_JAR=$withval)
AC_ARG_WITH(system-jfreereport,
AS_HELP_STRING([--with-system-jfreereport],
- [Use JFreeReport already on system.]),
-,)
+ [Use JFreeReport already on system.]))
AC_ARG_WITH(sac-jar,
AS_HELP_STRING([--with-sac-jar=JARFILE],
[Specify path to jarfile manually.]),
- SAC_JAR=$withval ,
-)
+ SAC_JAR=$withval)
AC_ARG_WITH(libxml-jar,
AS_HELP_STRING([--with-libxml-jar=JARFILE],
[Specify path to jarfile manually.]),
- LIBXML_JAR=$withval ,
-)
+ LIBXML_JAR=$withval)
AC_ARG_WITH(flute-jar,
AS_HELP_STRING([--with-flute-jar=JARFILE],
[Specify path to jarfile manually.]),
- FLUTE_JAR=$withval ,
-)
+ FLUTE_JAR=$withval)
AC_ARG_WITH(jfreereport-jar,
AS_HELP_STRING([--with-jfreereport-jar=JARFILE],
[Specify path to jarfile manually.]),
- JFREEREPORT_JAR=$withval ,
-)
+ JFREEREPORT_JAR=$withval)
AC_ARG_WITH(liblayout-jar,
AS_HELP_STRING([--with-liblayout-jar=JARFILE],
[Specify path to jarfile manually.]),
- LIBLAYOUT_JAR=$withval ,
-)
+ LIBLAYOUT_JAR=$withval)
AC_ARG_WITH(libloader-jar,
AS_HELP_STRING([--with-libloader-jar=JARFILE],
[Specify path to jarfile manually.]),
- LIBLOADER_JAR=$withval ,
-)
+ LIBLOADER_JAR=$withval)
AC_ARG_WITH(libloader-jar,
AS_HELP_STRING([--with-libloader-jar=JARFILE],
[Specify path to jarfile manually.]),
- LIBLOADER_JAR=$withval ,
-)
+ LIBLOADER_JAR=$withval)
AC_ARG_WITH(libformula-jar,
AS_HELP_STRING([--with-libformula-jar=JARFILE],
[Specify path to jarfile manually.]),
- LIBFORMULA_JAR=$withval ,
-)
+ LIBFORMULA_JAR=$withval)
AC_ARG_WITH(librepository-jar,
AS_HELP_STRING([--with-librepository-jar=JARFILE],
[Specify path to jarfile manually.]),
- LIBREPOSITORY_JAR=$withval ,
-)
+ LIBREPOSITORY_JAR=$withval)
AC_ARG_WITH(libfonts-jar,
AS_HELP_STRING([--with-libfonts-jar=JARFILE],
[Specify path to jarfile manually.]),
- LIBFONTS_JAR=$withval ,
-)
+ LIBFONTS_JAR=$withval)
AC_ARG_WITH(libserializer-jar,
AS_HELP_STRING([--with-libserializer-jar=JARFILE],
[Specify path to jarfile manually.]),
- LIBSERIALIZER_JAR=$withval ,
-)
+ LIBSERIALIZER_JAR=$withval)
AC_ARG_WITH(libbase-jar,
AS_HELP_STRING([--with-libbase-jar=JARFILE],
[Specify path to jarfile manually.]),
- LIBBASE_JAR=$withval ,
-)
+ LIBBASE_JAR=$withval)
AC_ARG_WITH(system-saxon,
AS_HELP_STRING([--with-system-saxon],
- [Use saxon already on system.]),
-,)
+ [Use saxon already on system.]))
AC_ARG_WITH(saxon-jar,
AS_HELP_STRING([--with-saxon-jar=JARFILE],
[Specify path to jarfile manually.]),
- SAXON_JAR=$withval ,
-)
+ SAXON_JAR=$withval)
AC_ARG_WITH(system-libxslt,
AS_HELP_STRING([--with-system-libxslt],
- [Use libxslt already on system.]),
-,)
+ [Use libxslt already on system.]))
AC_ARG_WITH(system-odbc,
AS_HELP_STRING([--with-system-odbc-headers],
- [Use the odbc headers already on system.]),
-,)
+ [Use the odbc headers already on system.]))
AC_ARG_WITH(system-sane,
AS_HELP_STRING([--with-system-sane-header],
- [Use sane.h already on system.]),
-,)
+ [Use sane.h already on system.]))
AC_ARG_WITH(system-xrender,
AS_HELP_STRING([--with-system-xrender-headers],
- [Use XRender headers already on system.]),
-,)
+ [Use XRender headers already on system.]))
AC_ARG_WITH(system-mesa-headers,
AS_HELP_STRING([--with-system-mesa-headers],
- [Use Mesa headers already on system.]),
-,)
+ [Use Mesa headers already on system.]))
AC_ARG_WITH(system-curl,
AS_HELP_STRING([--with-system-curl],
- [Use curl already on system.]),
-,)
+ [Use curl already on system.]))
AC_ARG_WITH(system-boost,
AS_HELP_STRING([--with-system-boost],
- [Use boost already on system.]),
-,)
+ [Use boost already on system.]))
AC_ARG_WITH(system-mdds,
AS_HELP_STRING([--with-system-mdds],
- [Use mdds already on system.]),
-,)
+ [Use mdds already on system.]))
AC_ARG_WITH(system-vigra,
AS_HELP_STRING([--with-system-vigra],
- [Use vigra already on system.]),
-,)
+ [Use vigra already on system.]))
AC_ARG_WITH(system-neon,
AS_HELP_STRING([--with-system-neon],
- [Use neon already on system.]),
-,)
+ [Use neon already on system.]))
AC_ARG_WITH(system-hunspell,
AS_HELP_STRING([--with-system-hunspell],
- [Use libhunspell already on system.]),
-,)
+ [Use libhunspell already on system.]))
AC_ARG_WITH(system-mythes,
AS_HELP_STRING([--with-system-mythes],
- [Use mythes already on system.]),
-,)
+ [Use mythes already on system.]))
AC_ARG_WITH(system-altlinuxhyph,
AS_HELP_STRING([--with-system-altlinuxhyph],
- [Use ALTLinuxhyph already on system.]),
-,)
+ [Use ALTLinuxhyph already on system.]))
AC_ARG_WITH(system-lpsolve,
AS_HELP_STRING([--with-system-lpsolve],
- [Use lpsolve already on system.]),
-,)
+ [Use lpsolve already on system.]))
AC_ARG_WITH(system-libtextcat,
AS_HELP_STRING([--with-system-libtextcat],
- [Use libtextcat already on system.]),
-,)
+ [Use libtextcat already on system.]))
AC_ARG_WITH(external-libtextcat-data,
AS_HELP_STRING([--with-external-libtextcat-data],
- [Use libtextcat data already on system.]),
-,)
+ [Use libtextcat data already on system.]))
AC_ARG_WITH(system-cppunit,
AS_HELP_STRING([--with-system-cppunit],
- [Use cppunit already on system.]),
-,)
+ [Use cppunit already on system.]))
AC_ARG_WITH(system-redland,
AS_HELP_STRING([--with-system-redland],
- [Use redland library already on system.]),
-,)
+ [Use redland library already on system.]))
AC_ARG_WITH(system-mozilla,
AS_HELP_STRING([--with-system-mozilla],
@@ -1395,96 +1282,6 @@ AC_ARG_WITH(max-jobs,
Defaults to 1, unless you configure --enable-icecream - then to 10.]),
,)
-dnl ---------- Deprecated since 2010-11-05 ----------
-
-AC_ARG_WITH(barcode,
- AS_HELP_STRING([--with-barcode],
- [Deprecated: use --enable-ext-barcode instead.]),
- if test -z "$enable_ext_barcode"; then
- enable_ext_barcode=$with_barcode;
- fi ,
-)
-
-AC_ARG_WITH(diagram,
- AS_HELP_STRING([--with-diagram],
- [Deprecated: use --enable-ext-diagram instead.]),
- if test -z "$enable_ext_diagram"; then
- enable_ext_diagram=$with_diagram;
- fi ,
-)
-
-AC_ARG_WITH(google-docs,
- AS_HELP_STRING([--with-google-docs],
- [Deprecated: use --enable-ext-google-docs instead.]),
- if test -z "$enable_ext_google_docs"; then
- enable_ext_google_docs=$with_google_docs;
- fi ,
-)
-
-AC_ARG_WITH(hunart,
- AS_HELP_STRING([--with-hunart],
- [Deprecated: use --enable-ext-hunart instead.]),
- if test -z "$enable_ext_hunart"; then
- enable_ext_hunart=$with_hunart;
- fi ,
-)
-
-AC_ARG_WITH(lightproof,
- AS_HELP_STRING([--with-lightproof],
- [Deprecated: use --enable-ext-lightproof instead.]),
- if test -z "$enable_ext_lightproof"; then
- enable_ext_lightproof=$with_lightproof;
- fi ,
-)
-
-AC_ARG_WITH(nlpsolver,
- AS_HELP_STRING([--with-nlpsolver],
- [Deprecated: use --enable-ext-nlpsolver instead.]),
- if test -z "$enable_ext_nlpsolver"; then
- enable_ext_nlpsolver=$with_nlpsolver;
- fi ,
-)
-
-AC_ARG_WITH(numbertext,
- AS_HELP_STRING([--with-numbertext],
- [Deprecated: use --enable-ext-numbertext instead.]),
- if test -z "$enable_ext_numbertext"; then
- enable_ext_numbertext=$with_numbertext;
- fi ,
-)
-
-AC_ARG_WITH(oooblogger,
- AS_HELP_STRING([--with-oooblogger],
- [Deprecated: use --enable-ext-oooblogger instead.]),
- if test -z "$enable_ext_oooblogger"; then
- enable_ext_oooblogger=$with_oooblogger;
- fi ,
-)
-
-AC_ARG_WITH(typo,
- AS_HELP_STRING([--with-typo],
- [Deprecated: use --enable-ext-typo instead.]),
- if test -z "$enable_ext_typo"; then
- enable_ext_typo=$with_typo;
- fi ,
-)
-
-AC_ARG_WITH(validator,
- AS_HELP_STRING([--with-validator],
- [Deprecated: use --enable-ext-validator instead.]),
- if test -z "$enable_ext_validator"; then
- enable_ext_validator=$with_validator;
- fi ,
-)
-
-AC_ARG_WITH(watch-window,
- AS_HELP_STRING([--with-watch-window],
- [Deprecated: use --enable-ext-watch-window instead.]),
- if test -z "$enable_ext_watch_window"; then
- enable_ext_watch_window=$with_watch_window;
- fi ,
-)
-
BUILD_TYPE="LibO"
dnl ===================================================================
More information about the Libreoffice-commits
mailing list