change libce + lib32|lib64 warning to be valid and cleaner logic
(r=nightstrike)
git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@1175 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in
index fbb8bdd..b3b0aba 100644
--- a/mingw-w64-crt/Makefile.in
+++ b/mingw-w64-crt/Makefile.in
@@ -1848,7 +1848,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
diff --git a/mingw-w64-crt/aclocal.m4 b/mingw-w64-crt/aclocal.m4
index 882b884..d8c135e 100644
--- a/mingw-w64-crt/aclocal.m4
+++ b/mingw-w64-crt/aclocal.m4
@@ -2485,13 +2485,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
diff --git a/mingw-w64-crt/configure b/mingw-w64-crt/configure
index 8866fd2..b31e960 100755
--- a/mingw-w64-crt/configure
+++ b/mingw-w64-crt/configure
Binary files differ
diff --git a/mingw-w64-crt/configure.ac b/mingw-w64-crt/configure.ac
index f098491..365a3ff 100644
--- a/mingw-w64-crt/configure.ac
+++ b/mingw-w64-crt/configure.ac
@@ -61,8 +61,10 @@
[enable_libce=no])
AM_CONDITIONAL([LIBCE], [test $enable_libce = yes])
-AS_IF([test $enable_libce = yes && {test $enable_lib32 = yes || test $enable_lib64 = yes}],
- [AC_MSG_WARN([Building the runtime to use libce with lib32 or lib64 is unsupported.])])
+AS_IF([test "$enable_lib32" = no && test "$enable_lib64" = no],
+ [],
+ [test "$enable_libce" = yes],
+ [AC_MSG_WARN([Building the runtime to use libce with lib32 or lib64 is unsupported.])])
AS_CASE([$host_cpu],
[x86_64],[
