Merge branch 'dev-api' into dev-package

[libucw.git] / debug / check-configs

diff --git a/debug/check-configs b/debug/check-configs
index 81cdc2aff3c95c2605bea4f7c77abff9a75c8a9b..65b3fd9ab10cd8b74783e9ce48a57bb60666a693 100755 (executable)
--- a/debug/check-configs
+++ b/debug/check-configs
@@ -29,7 +29,7 @@ function try
                cd $TDIR
                exec 3>&2 >>log 2>&1
                case $CONFIG in
                cd $TDIR
                exec 3>&2 >>log 2>&1
                case $CONFIG in

-                       *)                      ../../configure $CONFIG $ARGS || die "CANNOT CONFIGURE"
+                       *)                      ../../configure $CONFIG CONFIG_LOCAL $ARGS || die "CANNOT CONFIGURE"

                                                ;;
                esac
                make $MAKEOPTS || die FAILED
                                                ;;
                esac
                make $MAKEOPTS || die FAILED


@@ -44,7 +44,7 @@ function try
 rm -rf tests
 mkdir tests
 if [ "$1" == DARWIN ] ; then
 rm -rf tests
 mkdir tests
 if [ "$1" == DARWIN ] ; then

-       # All tests on Darwin need CONFIG_SHARED, due to libcharset collision
+       # All tests on Darwin need CONFIG_SHARED, due to libucw-charset collision

        # only visible with static linking.
        FLAGS="CONFIG_SHARED"
        try debug/default.cfg $FLAGS CONFIG_UCW_PCRE                                    # `make tests' does not work with non-local builds with shared libs
        # only visible with static linking.
        FLAGS="CONFIG_SHARED"
        try debug/default.cfg $FLAGS CONFIG_UCW_PCRE                                    # `make tests' does not work with non-local builds with shared libs


@@ -54,6 +54,7 @@ else
        try default.cfg                                                                 # default configuration
        try default.cfg -CONFIG_DEBUG                                                   # with no debugging code
        try debug/default.cfg                                                           # debugging configuration
        try default.cfg                                                                 # default configuration
        try default.cfg -CONFIG_DEBUG                                                   # with no debugging code
        try debug/default.cfg                                                           # debugging configuration

+       try debug/default.cfg -CONFIG_SHARED                                            # statically linked

        try debug/default.cfg -CONFIG_UCW_THREADS                                       # non-threaded configuration
        try debug/default.cfg -CONFIG_UCW_TLS                                           # threaded, but no TLS support in gcc
        try debug/default.cfg -CONFIG_UCW_EPOLL -CONFIG_UCW_MONOTONIC_CLOCK             # without epoll and monotonic clock
        try debug/default.cfg -CONFIG_UCW_THREADS                                       # non-threaded configuration
        try debug/default.cfg -CONFIG_UCW_TLS                                           # threaded, but no TLS support in gcc
        try debug/default.cfg -CONFIG_UCW_EPOLL -CONFIG_UCW_MONOTONIC_CLOCK             # without epoll and monotonic clock