diff --git a/aclocal.m4 b/aclocal.m4 index 52d70d53b..a775f3b81 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -597,6 +597,7 @@ dnl configure script, but here they are. AC_DEFUN([QTHREADS_CONFIGURE],[ AC_REQUIRE([AC_PROG_LN_S]) + AC_MSG_CHECKING(QuickThreads configuration) # How can we refer to the qt source directory from within the qt build # directory? For headers, we can rely on the fact that the qt src # directory appears in the #include path. @@ -607,36 +608,42 @@ AC_DEFUN([QTHREADS_CONFIGURE],[ THREAD_PACKAGE=QT case "$host" in i[3456]86-*-*) + port_name=i386 qtmd_h=md/i386.h qtmds_s=md/i386.s qtmdc_c=md/null.c qtdmdb_s= ;; mips-sgi-irix[56]*) + port_name=irix qtmd_h=md/mips.h qtmds_s=md/mips-irix5.s qtmdc_c=md/null.c qtdmdb_s=md/mips_b.s ;; mips-*-*) + port_name=mips qtmd_h=md/mips.h qtmds_s=md/mips.s qtmdc_c=md/null.c qtdmdb_s=md/mips_b.s ;; sparc-*-sunos*) + port_name=sparc-sunos qtmd_h=md/sparc.h qtmds_s=md/_sparc.s qtmdc_c=md/null.c qtdmdb_s=md/_sparc_b.s ;; sparc-*-*) + port_name=sparc qtmd_h=md/sparc.h qtmds_s=md/sparc.s qtmdc_c=md/null.c qtdmdb_s=md/sparc_b.s ;; alpha-*-*) + port_name=alpha qtmd_h=md/axp.h qtmds_s=md/axp.s qtmdc_c=md/null.c @@ -651,10 +658,13 @@ AC_DEFUN([QTHREADS_CONFIGURE],[ # Did configuration succeed? if test -n "$THREAD_PACKAGE"; then + AC_MSG_RESULT($port_name) QTHREAD_LTLIBS=libqthreads.la THREAD_CPPFLAGS="-I$qtsrcdir -I../qt" THREAD_LIBS_LOCAL="../qt/libqthreads.la" THREAD_LIBS_INSTALLED="-lqthreads" + else + AC_MSG_RESULT(none; disabled) fi AC_SUBST(QTHREAD_LTLIBS) diff --git a/configure b/configure index ea6346232..2bdb50395 100755 --- a/configure +++ b/configure @@ -4476,6 +4476,8 @@ fi ### Turn $with_threads into either the name of a threads package, like ### `qt', or `no', meaning that threads should not be supported. +echo $ac_n "checking whether to support threads""... $ac_c" 1>&6 +echo "configure:4481: checking whether to support threads" >&5 case "$with_threads" in "yes" | "qt" | "coop" | "") with_threads=qt @@ -4486,6 +4488,7 @@ case "$with_threads" in { echo "configure: error: invalid value for --with-threads: $with_threads" 1>&2; exit 1; } ;; esac +echo "$ac_t""$with_threads" 1>&6 ## Make sure the threads package we've chosen is actually supported on ## the present platform. @@ -4497,6 +4500,8 @@ case "${with_threads}" in + echo $ac_n "checking QuickThreads configuration""... $ac_c" 1>&6 +echo "configure:4505: checking QuickThreads configuration" >&5 # How can we refer to the qt source directory from within the qt build # directory? For headers, we can rely on the fact that the qt src # directory appears in the #include path. @@ -4506,36 +4511,42 @@ case "${with_threads}" in THREAD_PACKAGE=QT case "$host" in i[3456]86-*-*) + port_name=i386 qtmd_h=md/i386.h qtmds_s=md/i386.s qtmdc_c=md/null.c qtdmdb_s= ;; mips-sgi-irix[56]*) + port_name=irix qtmd_h=md/mips.h qtmds_s=md/mips-irix5.s qtmdc_c=md/null.c qtdmdb_s=md/mips_b.s ;; mips-*-*) + port_name=mips qtmd_h=md/mips.h qtmds_s=md/mips.s qtmdc_c=md/null.c qtdmdb_s=md/mips_b.s ;; sparc-*-sunos*) + port_name=sparc-sunos qtmd_h=md/sparc.h qtmds_s=md/_sparc.s qtmdc_c=md/null.c qtdmdb_s=md/_sparc_b.s ;; sparc-*-*) + port_name=sparc qtmd_h=md/sparc.h qtmds_s=md/sparc.s qtmdc_c=md/null.c qtdmdb_s=md/sparc_b.s ;; alpha-*-*) + port_name=alpha qtmd_h=md/axp.h qtmds_s=md/axp.s qtmdc_c=md/null.c @@ -4550,10 +4561,13 @@ case "${with_threads}" in # Did configuration succeed? if test -n "$THREAD_PACKAGE"; then + echo "$ac_t""$port_name" 1>&6 QTHREAD_LTLIBS=libqthreads.la THREAD_CPPFLAGS="-I$qtsrcdir -I../qt" THREAD_LIBS_LOCAL="../qt/libqthreads.la" THREAD_LIBS_INSTALLED="-lqthreads" + else + echo "$ac_t""none; disabled" 1>&6 fi @@ -4614,7 +4628,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4618: checking for $ac_word" >&5 +echo "configure:4632: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/configure.in b/configure.in index 0c4f88ae1..019deaa84 100644 --- a/configure.in +++ b/configure.in @@ -320,6 +320,7 @@ AC_ARG_WITH(threads, [ --with-threads thread interface], ### Turn $with_threads into either the name of a threads package, like ### `qt', or `no', meaning that threads should not be supported. +AC_MSG_CHECKING(whether to support threads) case "$with_threads" in "yes" | "qt" | "coop" | "") with_threads=qt @@ -330,6 +331,7 @@ case "$with_threads" in AC_MSG_ERROR(invalid value for --with-threads: $with_threads) ;; esac +AC_MSG_RESULT($with_threads) ## Make sure the threads package we've chosen is actually supported on ## the present platform. diff --git a/qthreads.m4 b/qthreads.m4 index 3da5b1295..adaf1aad8 100644 --- a/qthreads.m4 +++ b/qthreads.m4 @@ -43,6 +43,7 @@ dnl configure script, but here they are. AC_DEFUN([QTHREADS_CONFIGURE],[ AC_REQUIRE([AC_PROG_LN_S]) + AC_MSG_CHECKING(QuickThreads configuration) # How can we refer to the qt source directory from within the qt build # directory? For headers, we can rely on the fact that the qt src # directory appears in the #include path. @@ -53,36 +54,42 @@ AC_DEFUN([QTHREADS_CONFIGURE],[ THREAD_PACKAGE=QT case "$host" in i[3456]86-*-*) + port_name=i386 qtmd_h=md/i386.h qtmds_s=md/i386.s qtmdc_c=md/null.c qtdmdb_s= ;; mips-sgi-irix[56]*) + port_name=irix qtmd_h=md/mips.h qtmds_s=md/mips-irix5.s qtmdc_c=md/null.c qtdmdb_s=md/mips_b.s ;; mips-*-*) + port_name=mips qtmd_h=md/mips.h qtmds_s=md/mips.s qtmdc_c=md/null.c qtdmdb_s=md/mips_b.s ;; sparc-*-sunos*) + port_name=sparc-sunos qtmd_h=md/sparc.h qtmds_s=md/_sparc.s qtmdc_c=md/null.c qtdmdb_s=md/_sparc_b.s ;; sparc-*-*) + port_name=sparc qtmd_h=md/sparc.h qtmds_s=md/sparc.s qtmdc_c=md/null.c qtdmdb_s=md/sparc_b.s ;; alpha-*-*) + port_name=alpha qtmd_h=md/axp.h qtmds_s=md/axp.s qtmdc_c=md/null.c @@ -97,10 +104,13 @@ AC_DEFUN([QTHREADS_CONFIGURE],[ # Did configuration succeed? if test -n "$THREAD_PACKAGE"; then + AC_MSG_RESULT($port_name) QTHREAD_LTLIBS=libqthreads.la THREAD_CPPFLAGS="-I$qtsrcdir -I../qt" THREAD_LIBS_LOCAL="../qt/libqthreads.la" THREAD_LIBS_INSTALLED="-lqthreads" + else + AC_MSG_RESULT(none; disabled) fi AC_SUBST(QTHREAD_LTLIBS)