diff options
author | adam <adam@pkgsrc.org> | 2007-02-20 15:08:47 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2007-02-20 15:08:47 +0000 |
commit | d8cb11d3eef50fa3a7e8536730a74afe2f7fd21c (patch) | |
tree | 6c32574b5473c58748697d2eebc7925b061ff6a7 /math/qalculate | |
parent | 84b5cf91e740713f22f2344c387efbc1420a4a2b (diff) | |
download | pkgsrc-d8cb11d3eef50fa3a7e8536730a74afe2f7fd21c.tar.gz |
Changes 0.9.5:
* French translation (not fully complete yet)
* Return value in save() and add "name := value" as shortcut
* Integer factorization
* Interpret 0x[0-9,a-f] as hexadecimal number (do not require first digit to be 0-9)
* Add "Engineering" display mode
* Several fixes to display of units and prefixes
* Show value for variables without title in expression completion
* New functions: cross(), heaviside(), rectangular(), triangular(), ramp() kronecker(), sigmoid(), and logit()
* Use radius as argument for circumference()
* Add optional upper and lower limit arguments to integrate() for definite integrals
* Fix precision in logn()
* Ability to set shortcuts for meta modes (KDE)
* Make separate options for "Sort Minus Last" and "Negative Exponents" in numerical display menu
* Add "Edit Expression", "Edit Result", and "Insert Result Variable" to history context menu (KDE)
* Global shortcut for show/hide (KDE)
* Use localized comma for insert matrix/vector
* Remove use of libgnomeui completely and add --with-libgnome configure option
* Fix parsing of "x!)!"
* Use Julian year for light-year value
* Add several accelerator keys (GTK+)
* Connect "Exp" button Exp RPN operation and add Ctrl+Shift+E shortcut
* Fixes for old KDE and Qt versions
* New command line options for qalc: -terse (-t), -nodefs (-n), -nocurrencies, -nodatasets, -nofunctions, -nounits, -novariables
Diffstat (limited to 'math/qalculate')
-rw-r--r-- | math/qalculate/Makefile | 11 | ||||
-rw-r--r-- | math/qalculate/PLIST | 3 | ||||
-rw-r--r-- | math/qalculate/distinfo | 9 | ||||
-rw-r--r-- | math/qalculate/patches/patch-ab | 4045 |
4 files changed, 13 insertions, 4055 deletions
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile index 599323e2c56..78a0f3cc783 100644 --- a/math/qalculate/Makefile +++ b/math/qalculate/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2006/07/05 05:37:43 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2007/02/20 15:08:47 adam Exp $ -DISTNAME= libqalculate-0.9.4 -PKGNAME= qalculate-0.9.4 +DISTNAME= libqalculate-0.9.5 +PKGNAME= qalculate-0.9.5 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qalculate/} @@ -13,7 +13,7 @@ USE_GNU_READLINE= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake intltool msgfmt pkg-config +USE_TOOLS+= autoconf gmake intltool msgfmt pkg-config GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= ${WRKSRC}/libqalculate.pc.in @@ -24,6 +24,9 @@ SUBST_FILES.pthread= libqalculate.pc.in SUBST_SED.pthread+= -e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g' SUBST_STAGE.pthread= post-patch +pre-configure: + cd ${WRKSRC}; autoconf + .include "../../devel/glib2/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../math/cln/buildlink3.mk" diff --git a/math/qalculate/PLIST b/math/qalculate/PLIST index bd8fd83da17..1d27c3c393d 100644 --- a/math/qalculate/PLIST +++ b/math/qalculate/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2006/06/14 20:14:21 adam Exp $ +@comment $NetBSD: PLIST,v 1.13 2007/02/20 15:08:47 adam Exp $ bin/qalc include/libqalculate/BuiltinFunctions.h include/libqalculate/Calculator.h @@ -203,6 +203,7 @@ share/doc/lib${PKGNAME}/reference/html/structPrintOptions.html share/doc/lib${PKGNAME}/reference/html/structSortOptions-members.html share/doc/lib${PKGNAME}/reference/html/structSortOptions.html share/doc/lib${PKGNAME}/reference/html/util_8h.html +share/locale/fr/LC_MESSAGES/libqalculate.mo share/locale/nl/LC_MESSAGES/libqalculate.mo share/locale/sv/LC_MESSAGES/libqalculate.mo share/qalculate/currencies.xml diff --git a/math/qalculate/distinfo b/math/qalculate/distinfo index d90485d6c31..5ba4691993c 100644 --- a/math/qalculate/distinfo +++ b/math/qalculate/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.13 2006/06/22 18:52:00 jlam Exp $ +$NetBSD: distinfo,v 1.14 2007/02/20 15:08:47 adam Exp $ -SHA1 (libqalculate-0.9.4.tar.gz) = 78468f5a0329b01e146a71ff8d1b9b823ed52262 -RMD160 (libqalculate-0.9.4.tar.gz) = 8d14a0ac6790eeab0d8fe2d7b8f87381d1ad223c -Size (libqalculate-0.9.4.tar.gz) = 1055947 bytes +SHA1 (libqalculate-0.9.5.tar.gz) = df44162bfb41907851817306b6599d27d74de0ce +RMD160 (libqalculate-0.9.5.tar.gz) = 7839c56e275979157f6bace072d1fc9f500c8953 +Size (libqalculate-0.9.5.tar.gz) = 1118827 bytes SHA1 (patch-aa) = fda2983150bbbdecc1578e747d8a6aa7ef965f3f -SHA1 (patch-ab) = 9888beca031650259fcb4f194e2ead39c73a9a70 SHA1 (patch-ac) = 98e817d60fc4cd521e7d227ecd330364ec072ecd SHA1 (patch-ad) = 192adfe4ca7c0752109e02cce3ce74a385554176 diff --git a/math/qalculate/patches/patch-ab b/math/qalculate/patches/patch-ab deleted file mode 100644 index dc3462c27a3..00000000000 --- a/math/qalculate/patches/patch-ab +++ /dev/null @@ -1,4045 +0,0 @@ -$NetBSD: patch-ab,v 1.8 2006/06/22 18:52:00 jlam Exp $ - ---- configure.orig 2006-06-01 16:14:56.000000000 -0400 -+++ configure -@@ -20042,12 +20042,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo - if test "x$GCC" = "xyes"; then - case $CFLAGS in - *-Os*) -- CFLAGS="$CFLAGS -O2" - ;; - esac - case $CXXFLAGS in - *-Os*) -- CXXFLAGS="$CXXFLAGS -O2" - ;; - esac - fi -@@ -20073,13 +20071,206 @@ QALCULATE_AGE=0 - - - --echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 --echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 --if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then -+ -+QALCULATE_TEXT="" -+LN_QALCULATE="" -+USE_READLINE="yes" -+READLINE_LIBS="" -+if test "x$enable_textport" = "xyes" ; then -+ QALCULATE_TEXT="qalc" -+ LN_QALCULATE="qalc" -+ -+ echo "$as_me:$LINENO: checking whether to use readline" >&5 -+echo $ECHO_N "checking whether to use readline... $ECHO_C" >&6 -+ -+# Check whether --with-readline or --without-readline was given. -+if test "${with_readline+set}" = set; then -+ withval="$with_readline" -+ case "${withval}" in -+ yes) USE_READLINE="yes" ; echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 ;; -+ no) USE_READLINE="no" ; echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 ;; -+ only) USE_READLINE="yes" -+ EXTRA_LIBREADLINE_DEPS=" " -+ echo "$as_me:$LINENO: result: yes (using only readline)" >&5 -+echo "${ECHO_T}yes (using only readline)" >&6 ;; -+ *) USE_READLINE="yes" -+ EXTRA_LIBREADLINE_DEPS="${withval}" -+ echo "$as_me:$LINENO: result: yes (using extra libraries ${withval})" >&5 -+echo "${ECHO_T}yes (using extra libraries ${withval})" >&6 ;; -+ esac -+else -+ echo "$as_me:$LINENO: result: ${USE_READLINE}" >&5 -+echo "${ECHO_T}${USE_READLINE}" >&6 -+fi; -+ -+ if test "$USE_READLINE" = yes ; then -+ -+ -+ -+for ac_header in readline/readline.h readline/history.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+else -+ # Is the header compilable? -+echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_header_compiler=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+# Is the header present? -+echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ ac_header_preproc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6 -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------------ ## -+## Report this to the AC_PACKAGE_NAME lists. ## -+## ------------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ -+fi -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ if test "x${ac_cv_header_readline_readline_h}" != "xyes" -o "x${ac_cv_header_readline_history_h}" != "xyes"; then -+ { echo "$as_me:$LINENO: WARNING: Could not find the headers for libreadline." >&5 -+echo "$as_me: WARNING: Could not find the headers for libreadline." >&2;} -+ else -+ if test "$EXTRA_LIBREADLINE_DEPS" = "" ; then -+ unset ac_cv_lib_readline_readline -+ echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 -+echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 -+if test "${ac_cv_lib_readline_readline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lpthread $LIBS" -+LIBS="-lreadline -lncurses $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -20093,11 +20284,11 @@ extern "C" - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char pthread_create (); -+char readline (); - int - main () - { --pthread_create (); -+readline (); - ; - return 0; - } -@@ -20111,7 +20302,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -+ { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 -@@ -20124,259 +20315,140 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_pthread_pthread_create=yes -+ ac_cv_lib_readline_readline=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_pthread_pthread_create=no -+ac_cv_lib_readline_readline=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 --echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 --if test $ac_cv_lib_pthread_pthread_create = yes; then -- LIBS="$LIBS -lpthread" -+echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 -+echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 -+if test $ac_cv_lib_readline_readline = yes; then -+ HAVE_LIBREADLINE=true -+else -+ HAVE_LIBREADLINE=false - fi - -+ if test x${HAVE_LIBREADLINE} = xtrue ; then -+ echo " Using -lreadline -lncurses" -+ EXTRA_LIBREADLINE_DEPS=-lncurses - --ac_ext=cc --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -- -- -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_LIBREADLINE 1 -+_ACEOF - --# Check whether --with-cln-prefix or --without-cln-prefix was given. --if test "${with_cln_prefix+set}" = set; then -- withval="$with_cln_prefix" -- cln_config_prefix="$withval" -+ else -+ unset ac_cv_lib_readline_readline -+ echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 -+echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 -+if test "${ac_cv_lib_readline_readline+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cln_config_prefix="" --fi; -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lreadline -lcurses $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --# Check whether --with-cln-exec-prefix or --without-cln-exec-prefix was given. --if test "${with_cln_exec_prefix+set}" = set; then -- withval="$with_cln_exec_prefix" -- cln_config_exec_prefix="$withval" --else -- cln_config_exec_prefix="" --fi; --# Check whether --enable-clntest or --disable-clntest was given. --if test "${enable_clntest+set}" = set; then -- enableval="$enable_clntest" -- --else -- enable_clntest=yes --fi; -- --if test x$cln_config_exec_prefix != x ; then -- cln_config_args="$cln_config_args --exec-prefix=$cln_config_exec_prefix" -- if test x${CLN_CONFIG+set} != xset ; then -- CLN_CONFIG=$cln_config_exec_prefix/bin/cln-config -- fi --fi --if test x$cln_config_prefix != x ; then -- cln_config_args="$cln_config_args --prefix=$cln_config_prefix" -- if test x${CLN_CONFIG+set} != xset ; then -- CLN_CONFIG=$cln_config_prefix/bin/cln-config -- fi --fi -- --# Extract the first word of "cln-config", so it can be a program name with args. --set dummy cln-config; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_CLN_CONFIG+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- case $CLN_CONFIG in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_CLN_CONFIG="$CLN_CONFIG" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_path_CLN_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -- test -z "$ac_cv_path_CLN_CONFIG" && ac_cv_path_CLN_CONFIG="no" -- ;; --esac --fi --CLN_CONFIG=$ac_cv_path_CLN_CONFIG -- --if test -n "$CLN_CONFIG"; then -- echo "$as_me:$LINENO: result: $CLN_CONFIG" >&5 --echo "${ECHO_T}$CLN_CONFIG" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --cln_min_version=1.1.0 --echo "$as_me:$LINENO: checking for CLN - version >= $cln_min_version" >&5 --echo $ECHO_N "checking for CLN - version >= $cln_min_version... $ECHO_C" >&6 --if test "$CLN_CONFIG" = "no" ; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- echo "*** The cln-config script installed by CLN could not be found" -- echo "*** If CLN was installed in PREFIX, make sure PREFIX/bin is in" -- echo "*** your path, or set the CLN_CONFIG environment variable to the" -- echo "*** full path to cln-config." -- { { echo "$as_me:$LINENO: error: No suitable installed version of CLN could be found." >&5 --echo "$as_me: error: No suitable installed version of CLN could be found." >&2;} -- { (exit 1); exit 1; }; } --else -- cln_min_major_version=`echo $cln_min_version | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -- cln_min_minor_version=`echo $cln_min_version | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -- cln_min_micro_version=`echo $cln_min_version | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -- CLN_CPPFLAGS=`$CLN_CONFIG $cln_config_args --cppflags` -- CLN_LIBS=`$CLN_CONFIG $cln_config_args --libs` -- cln_config_version=`$CLN_CONFIG $cln_config_args --version` -- cln_config_major_version=`echo $cln_config_version | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -- cln_config_minor_version=`echo $cln_config_version | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -- cln_config_micro_version=`echo $cln_config_version | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -- if test \( $cln_config_major_version -lt $cln_min_major_version \) -o \ -- \( $cln_config_major_version -eq $cln_min_major_version -a $cln_config_minor_version -lt $cln_min_minor_version \) -o \ -- \( $cln_config_major_version -eq $cln_min_major_version -a $cln_config_minor_version -eq $cln_min_minor_version -a $cln_config_micro_version -lt $cln_min_micro_version \); then -- echo -e "\n*** 'cln-config --version' returned $cln_config_major_version.$cln_config_minor_version.$cln_config_micro_version, but the minimum version" -- echo "*** of CLN required is $cln_min_major_version.$cln_min_minor_version.$cln_min_micro_version. If cln-config is correct, then it is" -- echo "*** best to upgrade to the required version." -- echo "*** If cln-config was wrong, set the environment variable CLN_CONFIG" -- echo "*** to point to the correct copy of cln-config, and remove the file" -- echo "*** config.cache before re-running configure." -- { { echo "$as_me:$LINENO: error: No suitable installed version of CLN could be found." >&5 --echo "$as_me: error: No suitable installed version of CLN could be found." >&2;} -- { (exit 1); exit 1; }; } -- else -- no_cln="" -- if test "x$enable_clntest" = "xyes" ; then -- ac_save_CPPFLAGS="$CPPFLAGS" -- ac_save_LIBS="$LIBS" -- CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS" -- LIBS="$LIBS $CLN_LIBS" -- rm -f conf.clntest -- if test "$cross_compiling" = yes; then -- echo $ac_n "cross compiling; assumed OK... $ac_c" --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --#include <stdio.h> --#include <string.h> --#include <cln/version.h> -- --/* we do not #include <stdlib.h> because autoconf in C++ mode inserts a -- prototype for exit() that conflicts with the one in stdlib.h */ --extern "C" int system(const char *); -- --int main(void) -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char readline (); -+int -+main () - { -- system("touch conf.clntest"); -- -- if ((CL_VERSION_MAJOR != $cln_config_major_version) || -- (CL_VERSION_MINOR != $cln_config_minor_version) || -- (CL_VERSION_PATCHLEVEL != $cln_config_micro_version)) { -- printf("\n*** 'cln-config --version' returned %d.%d.%d, but the header file I found\n", $cln_config_major_version, $cln_config_minor_version, $cln_config_micro_version); -- printf("*** corresponds to %d.%d.%d. This mismatch suggests your installation of CLN\n", CL_VERSION_MAJOR, CL_VERSION_MINOR, CL_VERSION_PATCHLEVEL); -- printf("*** is corrupted or you have specified some wrong -I compiler flags.\n"); -- printf("*** Please inquire and consider reinstalling CLN.\n"); -- return 1; -- } -- if ((cln::version_major != $cln_config_major_version) || -- (cln::version_minor != $cln_config_minor_version) || -- (cln::version_patchlevel != $cln_config_micro_version)) { -- printf("\n*** 'cln-config --version' returned %d.%d.%d, but the library I found\n", $cln_config_major_version, $cln_config_minor_version, $cln_config_micro_version); -- printf("*** corresponds to %d.%d.%d. This mismatch suggests your installation of CLN\n", cln::version_major, cln::version_minor, cln::version_patchlevel); -- printf("*** is corrupted or you have specified some wrong -L compiler flags.\n"); -- printf("*** Please inquire and consider reinstalling CLN.\n"); -- return 1; -- } -- return 0; -+readline (); -+ ; -+ return 0; - } -- - _ACEOF --rm -f conftest$ac_exeext -+rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- : -+ ac_cv_lib_readline_readline=yes - else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --( exit $ac_status ) --no_cln=yes -+ac_cv_lib_readline_readline=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 -+echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 -+if test $ac_cv_lib_readline_readline = yes; then -+ HAVE_LIBREADLINE=true -+else -+ HAVE_LIBREADLINE=false - fi -- CPPFLAGS="$ac_save_CPPFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- if test "x$no_cln" = x ; then -- echo "$as_me:$LINENO: result: yes, $cln_config_version" >&5 --echo "${ECHO_T}yes, $cln_config_version" >&6 - -- LIBS="$LIBS $CLN_LIBS" -- CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS" -+ if test x${HAVE_LIBREADLINE} = xtrue ; then -+ echo " Using -lreadline -lcurses" -+ EXTRA_LIBREADLINE_DEPS=-lcurses - - cat >>confdefs.h <<\_ACEOF --#define HAVE_LIBCLN 1 -+#define HAVE_LIBREADLINE 1 - _ACEOF - -- - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- if test ! -f conf.clntest ; then -- echo "*** Could not run CLN test program, checking why..." -- CPPFLAGS="$CFLAGS $CLN_CPPFLAGS" -- LIBS="$LIBS $CLN_LIBS" -- cat >conftest.$ac_ext <<_ACEOF -+ unset ac_cv_lib_readline_readline -+ echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 -+echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 -+if test "${ac_cv_lib_readline_readline+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lreadline -ltermcap $LIBS" -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --#include <stdio.h> --#include <cln/version.h> -- -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char readline (); - int - main () - { -- return 0; -+readline (); - ; - return 0; - } -@@ -20403,328 +20475,230 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "*** The test program compiled, but did not run. This usually means" -- echo "*** that the run-time linker is not finding CLN or finding the wrong" -- echo "*** version of CLN. If it is not finding CLN, you'll need to set your" -- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -- echo "*** to the installed location. Also, make sure you have run ldconfig if that" -- echo "*** is required on your system." -+ ac_cv_lib_readline_readline=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- echo "*** The test program failed to compile or link. See the file config.log for the" -- echo "*** exact error that occured. This usually means CLN was incorrectly installed" -- echo "*** or that you have moved CLN since it was installed. In the latter case, you" -- echo "*** may want to edit the cln-config script: $CLN_CONFIG." -+ac_cv_lib_readline_readline=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- CPPFLAGS="$ac_save_CPPFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- CLN_CPPFLAGS="" -- CLN_LIBS="" -- { { echo "$as_me:$LINENO: error: No suitable installed version of CLN could be found." >&5 --echo "$as_me: error: No suitable installed version of CLN could be found." >&2;} -- { (exit 1); exit 1; }; } -- fi -- fi -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 -+echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 -+if test $ac_cv_lib_readline_readline = yes; then -+ HAVE_LIBREADLINE=true -+else -+ HAVE_LIBREADLINE=false - fi - -+ if test x${HAVE_LIBREADLINE} = xtrue ; then -+ echo " Using -lreadline -ltermcap" -+ EXTRA_LIBREADLINE_DEPS=-ltermcap - --rm -f conf.clntest -- -- -- -- -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_LIBREADLINE 1 -+_ACEOF - --if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. --set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_PKG_CONFIG+set}" = set; then -+ else -+ unset ac_cv_lib_readline_readline -+ echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 -+echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 -+if test "${ac_cv_lib_readline_readline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- case $PKG_CONFIG in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -- ;; --esac --fi --PKG_CONFIG=$ac_cv_path_PKG_CONFIG -- --if test -n "$PKG_CONFIG"; then -- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 --echo "${ECHO_T}$PKG_CONFIG" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lreadline $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --fi --if test -z "$ac_cv_path_PKG_CONFIG"; then -- ac_pt_PKG_CONFIG=$PKG_CONFIG -- # Extract the first word of "pkg-config", so it can be a program name with args. --set dummy pkg-config; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char readline (); -+int -+main () -+{ -+readline (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_readline_readline=yes - else -- case $ac_pt_PKG_CONFIG in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- ;; --esac -+ac_cv_lib_readline_readline=no - fi --ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -- --if test -n "$ac_pt_PKG_CONFIG"; then -- echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 --echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi -- -- PKG_CONFIG=$ac_pt_PKG_CONFIG -+echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 -+echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 -+if test $ac_cv_lib_readline_readline = yes; then -+ HAVE_LIBREADLINE=true - else -- PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+ HAVE_LIBREADLINE=false - fi - --fi --if test -n "$PKG_CONFIG"; then -- _pkg_min_version=0.9.0 -- echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 --echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 -- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -- else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- PKG_CONFIG="" -- fi -- --fi -+ if test x${HAVE_LIBREADLINE} = xtrue ; then - --pkg_failed=no --echo "$as_me:$LINENO: checking for GLIB" >&5 --echo $ECHO_N "checking for GLIB... $ECHO_C" >&6 -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_LIBREADLINE 1 -+_ACEOF - --if test -n "$PKG_CONFIG"; then -- if test -n "$GLIB_CFLAGS"; then -- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" -+ fi -+ fi -+ fi -+ fi - else -- if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" -- glib-2.0 -- libxml-2.0 >= 2.3.8 -- \"") >&5 -- ($PKG_CONFIG --exists --print-errors " -- glib-2.0 -- libxml-2.0 >= 2.3.8 -- ") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags " -- glib-2.0 -- libxml-2.0 >= 2.3.8 -- " 2>/dev/null` --else -- pkg_failed=yes --fi -- fi -+ unset ac_cv_lib_readline_readline -+ echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 -+echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 -+if test "${ac_cv_lib_readline_readline+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- pkg_failed=untried --fi --if test -n "$PKG_CONFIG"; then -- if test -n "$GLIB_LIBS"; then -- pkg_cv_GLIB_LIBS="$GLIB_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" -- glib-2.0 -- libxml-2.0 >= 2.3.8 -- \"") >&5 -- ($PKG_CONFIG --exists --print-errors " -- glib-2.0 -- libxml-2.0 >= 2.3.8 -- ") 2>&5 -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lreadline ${EXTRA_LIBREADLINE_DEPS} $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char readline (); -+int -+main () -+{ -+readline (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs " -- glib-2.0 -- libxml-2.0 >= 2.3.8 -- " 2>/dev/null` -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_readline_readline=yes - else -- pkg_failed=yes -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_readline_readline=no - fi -- fi --else -- pkg_failed=untried -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi -- -- -- --if test $pkg_failed = yes; then -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes -+echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 -+echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 -+if test $ac_cv_lib_readline_readline = yes; then -+ HAVE_LIBREADLINE=true - else -- _pkg_short_errors_supported=no -+ HAVE_LIBREADLINE=false - fi -- if test $_pkg_short_errors_supported = yes; then -- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " -- glib-2.0 -- libxml-2.0 >= 2.3.8 -- "` -- else -- GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " -- glib-2.0 -- libxml-2.0 >= 2.3.8 -- "` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$GLIB_PKG_ERRORS" >&5 -- -- { { echo "$as_me:$LINENO: error: Package requirements ( -- glib-2.0 -- libxml-2.0 >= 2.3.8 -- ) were not met: - --$GLIB_PKG_ERRORS -- --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -+ if test x${HAVE_LIBREADLINE} = xtrue ; then -+ echo " Using -lreadline ${EXTRA_LIBREADLINE_DEPS}" - --Alternatively, you may set the environment variables GLIB_CFLAGS --and GLIB_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" >&5 --echo "$as_me: error: Package requirements ( -- glib-2.0 -- libxml-2.0 >= 2.3.8 -- ) were not met: -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_LIBREADLINE 1 -+_ACEOF - --$GLIB_PKG_ERRORS -+ fi -+ fi -+ if test x${HAVE_LIBREADLINE} = xtrue; then -+ READLINE_LIBS="-lreadline -lhistory ${EXTRA_LIBREADLINE_DEPS}" -+ else -+ { echo "$as_me:$LINENO: WARNING: Could not find libreadline." >&5 -+echo "$as_me: WARNING: Could not find libreadline." >&2;} -+ fi -+ fi -+ fi -+fi - --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. - --Alternatively, you may set the environment variables GLIB_CFLAGS --and GLIB_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" >&2;} -- { (exit 1); exit 1; }; } --elif test $pkg_failed = untried; then -- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. - --Alternatively, you may set the environment variables GLIB_CFLAGS --and GLIB_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. - --To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. --See \`config.log' for more details." >&5 --echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. - --Alternatively, you may set the environment variables GLIB_CFLAGS --and GLIB_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. - --To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else -- GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS -- GLIB_LIBS=$pkg_cv_GLIB_LIBS -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -- : -+QALCULATE_DEFS2DOC="" -+if test "x$enable_defs2doc" = "xyes" ; then -+ QALCULATE_DEFS2DOC="defs2doc" - fi - - - -+GETTEXT_PACKAGE=libqalculate - --QALCULATE_TEXT="" --LN_QALCULATE="" --USE_READLINE="yes" --READLINE_LIBS="" --if test "x$enable_textport" = "xyes" ; then -- QALCULATE_TEXT="qalc" -- LN_QALCULATE="qalc" -- -- echo "$as_me:$LINENO: checking whether to use readline" >&5 --echo $ECHO_N "checking whether to use readline... $ECHO_C" >&6 - --# Check whether --with-readline or --without-readline was given. --if test "${with_readline+set}" = set; then -- withval="$with_readline" -- case "${withval}" in -- yes) USE_READLINE="yes" ; echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 ;; -- no) USE_READLINE="no" ; echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 ;; -- only) USE_READLINE="yes" -- EXTRA_LIBREADLINE_DEPS=" " -- echo "$as_me:$LINENO: result: yes (using only readline)" >&5 --echo "${ECHO_T}yes (using only readline)" >&6 ;; -- *) USE_READLINE="yes" -- EXTRA_LIBREADLINE_DEPS="${withval}" -- echo "$as_me:$LINENO: result: yes (using extra libraries ${withval})" >&5 --echo "${ECHO_T}yes (using extra libraries ${withval})" >&6 ;; -- esac --else -- echo "$as_me:$LINENO: result: ${USE_READLINE}" >&5 --echo "${ECHO_T}${USE_READLINE}" >&6 --fi; -+cat >>confdefs.h <<_ACEOF -+#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" -+_ACEOF - -- if test "$USE_READLINE" = yes ; then - -+ALL_LINGUAS="nl sv" - - --for ac_header in readline/readline.h readline/history.h -+for ac_header in locale.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if eval "test \"\${$as_ac_Header+set}\" = set"; then -@@ -20873,44 +20847,102 @@ fi - - done - -- if test "x${ac_cv_header_readline_readline_h}" != "xyes" -o "x${ac_cv_header_readline_history_h}" != "xyes"; then -- { echo "$as_me:$LINENO: WARNING: Could not find the headers for libreadline." >&5 --echo "$as_me: WARNING: Could not find the headers for libreadline." >&2;} -- else -- if test "$EXTRA_LIBREADLINE_DEPS" = "" ; then -- unset ac_cv_lib_readline_readline -- echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 --echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 --if test "${ac_cv_lib_readline_readline+set}" = set; then -+ if test $ac_cv_header_locale_h = yes; then -+ echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 -+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 -+if test "${am_cv_val_LC_MESSAGES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lreadline -lncurses $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char readline (); -+#include <locale.h> - int - main () - { --readline (); -+return LC_MESSAGES - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ am_cv_val_LC_MESSAGES=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+am_cv_val_LC_MESSAGES=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 -+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 -+ if test $am_cv_val_LC_MESSAGES = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_LC_MESSAGES 1 -+_ACEOF -+ -+ fi -+ fi -+ USE_NLS=yes -+ -+ -+ gt_cv_have_gettext=no -+ -+ CATOBJEXT=NONE -+ XGETTEXT=: -+ INTLLIBS= -+ -+ if test "${ac_cv_header_libintl_h+set}" = set; then -+ echo "$as_me:$LINENO: checking for libintl.h" >&5 -+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 -+if test "${ac_cv_header_libintl_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 -+else -+ # Is the header compilable? -+echo "$as_me:$LINENO: checking libintl.h usability" >&5 -+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <libintl.h> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 -@@ -20924,146 +20956,131 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_readline_readline=yes -+ ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_readline_readline=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 --echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 --if test $ac_cv_lib_readline_readline = yes; then -- HAVE_LIBREADLINE=true --else -- HAVE_LIBREADLINE=false -+ac_header_compiler=no - fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6 - -- if test x${HAVE_LIBREADLINE} = xtrue ; then -- echo " Using -lreadline -lncurses" -- EXTRA_LIBREADLINE_DEPS=-lncurses -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_LIBREADLINE 1 --_ACEOF -- -- else -- unset ac_cv_lib_readline_readline -- echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 --echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 --if test "${ac_cv_lib_readline_readline+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lreadline -lcurses $LIBS" -+# Is the header present? -+echo "$as_me:$LINENO: checking libintl.h presence" >&5 -+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char readline (); --int --main () --{ --readline (); -- ; -- return 0; --} -+#include <libintl.h> - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_readline_readline=yes -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_readline_readline=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ ac_header_preproc=no - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 --echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 --if test $ac_cv_lib_readline_readline = yes; then -- HAVE_LIBREADLINE=true -+rm -f conftest.err conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6 -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------------ ## -+## Report this to the AC_PACKAGE_NAME lists. ## -+## ------------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+echo "$as_me:$LINENO: checking for libintl.h" >&5 -+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 -+if test "${ac_cv_header_libintl_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- HAVE_LIBREADLINE=false -+ ac_cv_header_libintl_h=$ac_header_preproc - fi -+echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 - -- if test x${HAVE_LIBREADLINE} = xtrue ; then -- echo " Using -lreadline -lcurses" -- EXTRA_LIBREADLINE_DEPS=-lcurses -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_LIBREADLINE 1 --_ACEOF -+fi -+if test $ac_cv_header_libintl_h = yes; then -+ gt_cv_func_dgettext_libintl="no" -+ libintl_extra_libs="" - -- else -- unset ac_cv_lib_readline_readline -- echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 --echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 --if test "${ac_cv_lib_readline_readline+set}" = set; then -+ # -+ # First check in libc -+ # -+ echo "$as_me:$LINENO: checking for ngettext in libc" >&5 -+echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6 -+if test "${gt_cv_func_ngettext_libc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lreadline -ltermcap $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char readline (); -+#include <libintl.h> -+ - int - main () - { --readline (); -+return !ngettext ("","", 1) - ; - return 0; - } -@@ -21090,60 +21107,39 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_readline_readline=yes -+ gt_cv_func_ngettext_libc=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_readline_readline=no -+gt_cv_func_ngettext_libc=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 --echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 --if test $ac_cv_lib_readline_readline = yes; then -- HAVE_LIBREADLINE=true --else -- HAVE_LIBREADLINE=false --fi - -- if test x${HAVE_LIBREADLINE} = xtrue ; then -- echo " Using -lreadline -ltermcap" -- EXTRA_LIBREADLINE_DEPS=-ltermcap -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_LIBREADLINE 1 --_ACEOF -+fi -+echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 -+echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6 - -- else -- unset ac_cv_lib_readline_readline -- echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 --echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 --if test "${ac_cv_lib_readline_readline+set}" = set; then -+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then -+ echo "$as_me:$LINENO: checking for dgettext in libc" >&5 -+echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6 -+if test "${gt_cv_func_dgettext_libc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lreadline $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char readline (); -+#include <libintl.h> -+ - int - main () - { --readline (); -+return !dgettext ("","") - ; - return 0; - } -@@ -21170,62 +21166,78 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_readline_readline=yes -+ gt_cv_func_dgettext_libc=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_readline_readline=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 --echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 --if test $ac_cv_lib_readline_readline = yes; then -- HAVE_LIBREADLINE=true --else -- HAVE_LIBREADLINE=false -+gt_cv_func_dgettext_libc=no - fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - -- if test x${HAVE_LIBREADLINE} = xtrue ; then -+fi -+echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 -+echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6 -+ fi - --cat >>confdefs.h <<\_ACEOF --#define HAVE_LIBREADLINE 1 --_ACEOF -+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then - -- fi -- fi -- fi -- fi -- else -- unset ac_cv_lib_readline_readline -- echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 --echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 --if test "${ac_cv_lib_readline_readline+set}" = set; then -+for ac_func in bind_textdomain_codeset -+do -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lreadline ${EXTRA_LIBREADLINE_DEPS} $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func - - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus - extern "C" -+{ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char readline (); -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+char (*f) () = $ac_func; -+#endif -+#ifdef __cplusplus -+} -+#endif -+ - int - main () - { --readline (); -+return f != $ac_func; - ; - return 0; - } -@@ -21252,94 +21264,67 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_readline_readline=yes -+ eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_readline_readline=no -+eval "$as_ac_var=no" - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 --echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 --if test $ac_cv_lib_readline_readline = yes; then -- HAVE_LIBREADLINE=true --else -- HAVE_LIBREADLINE=false - fi -- -- if test x${HAVE_LIBREADLINE} = xtrue ; then -- echo " Using -lreadline ${EXTRA_LIBREADLINE_DEPS}" -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_LIBREADLINE 1 -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - -- fi -- fi -- if test x${HAVE_LIBREADLINE} = xtrue; then -- READLINE_LIBS="-lreadline -lhistory ${EXTRA_LIBREADLINE_DEPS}" -- else -- { echo "$as_me:$LINENO: WARNING: Could not find libreadline." >&5 --echo "$as_me: WARNING: Could not find libreadline." >&2;} -- fi -- fi -- fi --fi -- -- -- -- -- -- --QALCULATE_DEFS2DOC="" --if test "x$enable_defs2doc" = "xyes" ; then -- QALCULATE_DEFS2DOC="defs2doc" - fi -+done - -+ fi - -+ # -+ # If we don't have everything we want, check in libintl -+ # -+ if test "$gt_cv_func_dgettext_libc" != "yes" \ -+ || test "$gt_cv_func_ngettext_libc" != "yes" \ -+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - --GETTEXT_PACKAGE=libqalculate -- -- --cat >>confdefs.h <<_ACEOF --#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" --_ACEOF -- -- --ALL_LINGUAS="nl sv" -- -- --for ac_header in locale.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 -+echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6 -+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lintl $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char bindtextdomain (); -+int -+main () -+{ -+bindtextdomain (); -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 -@@ -21353,132 +21338,51 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ ac_cv_lib_intl_bindtextdomain=yes - else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ac_cv_lib_intl_bindtextdomain=no - fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi -- --done -- -- if test $ac_cv_header_locale_h = yes; then -- echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 --echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 --if test "${am_cv_val_LC_MESSAGES+set}" = set; then -+echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6 -+if test $ac_cv_lib_intl_bindtextdomain = yes; then -+ echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6 -+if test "${ac_cv_lib_intl_ngettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lintl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <locale.h> -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char ngettext (); - int - main () - { --return LC_MESSAGES -+ngettext (); - ; - return 0; - } -@@ -21505,59 +21409,52 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- am_cv_val_LC_MESSAGES=yes -+ ac_cv_lib_intl_ngettext=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --am_cv_val_LC_MESSAGES=no -+ac_cv_lib_intl_ngettext=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 --echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 -- if test $am_cv_val_LC_MESSAGES = yes; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_LC_MESSAGES 1 --_ACEOF -- -- fi -- fi -- USE_NLS=yes -- -- -- gt_cv_have_gettext=no -- -- CATOBJEXT=NONE -- XGETTEXT=: -- INTLLIBS= -- -- if test "${ac_cv_header_libintl_h+set}" = set; then -- echo "$as_me:$LINENO: checking for libintl.h" >&5 --echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 --if test "${ac_cv_header_libintl_h+set}" = set; then -+echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6 -+if test $ac_cv_lib_intl_ngettext = yes; then -+ echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 -+echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6 -+if test "${ac_cv_lib_intl_dgettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 --echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 - else -- # Is the header compilable? --echo "$as_me:$LINENO: checking libintl.h usability" >&5 --echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lintl $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_includes_default --#include <libintl.h> -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dgettext (); -+int -+main () -+{ -+dgettext (); -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 -@@ -21571,131 +21468,129 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_header_compiler=yes -+ ac_cv_lib_intl_dgettext=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ac_cv_lib_intl_dgettext=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6 -+if test $ac_cv_lib_intl_dgettext = yes; then -+ gt_cv_func_dgettext_libintl=yes - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 - --# Is the header present? --echo "$as_me:$LINENO: checking libintl.h presence" >&5 --echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 -+fi -+ -+fi -+ -+ -+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then -+ echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 -+echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6 -+ echo "$as_me:$LINENO: result: " >&5 -+echo "${ECHO_T}" >&6 -+ echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6 -+if test "${ac_cv_lib_intl_ngettext+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lintl -liconv $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <libintl.h> -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char ngettext (); -+int -+main () -+{ -+ngettext (); -+ ; -+ return 0; -+} - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_intl_ngettext=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for libintl.h" >&5 --echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 --if test "${ac_cv_header_libintl_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_libintl_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 --echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 -- -+ac_cv_lib_intl_ngettext=no - fi --if test $ac_cv_header_libintl_h = yes; then -- gt_cv_func_dgettext_libintl="no" -- libintl_extra_libs="" -- -- # -- # First check in libc -- # -- echo "$as_me:$LINENO: checking for ngettext in libc" >&5 --echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6 --if test "${gt_cv_func_ngettext_libc+set}" = set; then -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6 -+if test $ac_cv_lib_intl_ngettext = yes; then -+ echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 -+echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6 -+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lintl -liconv $LIBS" -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --#include <libintl.h> -- -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dcgettext (); - int - main () - { --return !ngettext ("","", 1) -+dcgettext (); - ; - return 0; - } -@@ -21722,24 +21617,48 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- gt_cv_func_ngettext_libc=yes -+ ac_cv_lib_intl_dcgettext=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --gt_cv_func_ngettext_libc=no -+ac_cv_lib_intl_dcgettext=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6 -+if test $ac_cv_lib_intl_dcgettext = yes; then -+ gt_cv_func_dgettext_libintl=yes -+ libintl_extra_libs=-liconv -+else -+ : -+fi - -+else -+ : - fi --echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 --echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6 - -- if test "$gt_cv_func_ngettext_libc" = "yes" ; then -- echo "$as_me:$LINENO: checking for dgettext in libc" >&5 --echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6 --if test "${gt_cv_func_dgettext_libc+set}" = set; then -+ fi -+ -+ # -+ # If we found libintl, then check in it for bind_textdomain_codeset(); -+ # we'll prefer libc if neither have bind_textdomain_codeset(), -+ # and both have dgettext and ngettext -+ # -+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then -+ glib_save_LIBS="$LIBS" -+ LIBS="$LIBS -lintl $libintl_extra_libs" -+ unset ac_cv_func_bind_textdomain_codeset -+ -+for ac_func in bind_textdomain_codeset -+do -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -21748,13 +21667,47 @@ _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func - --#include <libintl.h> -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+{ -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+char (*f) () = $ac_func; -+#endif -+#ifdef __cplusplus -+} -+#endif - - int - main () - { --return !dgettext ("","") -+return f != $ac_func; - ; - return 0; - } -@@ -21781,24 +21734,94 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- gt_cv_func_dgettext_libc=yes -+ eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --gt_cv_func_dgettext_libc=no -+eval "$as_ac_var=no" - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF - - fi --echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 --echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6 -+done -+ -+ LIBS="$glib_save_LIBS" -+ -+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then -+ gt_cv_func_dgettext_libc=no -+ else -+ if test "$gt_cv_func_dgettext_libc" = "yes" \ -+ && test "$gt_cv_func_ngettext_libc" = "yes"; then -+ gt_cv_func_dgettext_libintl=no -+ fi -+ fi -+ fi - fi - -- if test "$gt_cv_func_ngettext_libc" = "yes" ; then -+ if test "$gt_cv_func_dgettext_libc" = "yes" \ -+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then -+ gt_cv_have_gettext=yes -+ fi - --for ac_func in bind_textdomain_codeset -+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then -+ INTLLIBS="-lintl $libintl_extra_libs" -+ fi -+ -+ if test "$gt_cv_have_gettext" = "yes"; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_GETTEXT 1 -+_ACEOF -+ -+ # Extract the first word of "msgfmt", so it can be a program name with args. -+set dummy msgfmt; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_path_MSGFMT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case "$MSGFMT" in -+ /*) -+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in $PATH; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then -+ ac_cv_path_MSGFMT="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" -+ ;; -+esac -+fi -+MSGFMT="$ac_cv_path_MSGFMT" -+if test "$MSGFMT" != "no"; then -+ echo "$as_me:$LINENO: result: $MSGFMT" >&5 -+echo "${ECHO_T}$MSGFMT" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ if test "$MSGFMT" != "no"; then -+ glib_save_LIBS="$LIBS" -+ LIBS="$LIBS $INTLLIBS" -+ -+for ac_func in dcgettext - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` - echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -21897,42 +21920,96 @@ if test `eval echo '${'$as_ac_var'}'` = - _ACEOF - - fi --done -- -- fi -- -- # -- # If we don't have everything we want, check in libintl -- # -- if test "$gt_cv_func_dgettext_libc" != "yes" \ -- || test "$gt_cv_func_ngettext_libc" != "yes" \ -- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then -+done -+ -+ # Extract the first word of "gmsgfmt", so it can be a program name with args. -+set dummy gmsgfmt; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_path_GMSGFMT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $GMSGFMT in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" -+ ;; -+esac -+fi -+GMSGFMT=$ac_cv_path_GMSGFMT -+ -+if test -n "$GMSGFMT"; then -+ echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -+echo "${ECHO_T}$GMSGFMT" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ # Extract the first word of "xgettext", so it can be a program name with args. -+set dummy xgettext; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_path_XGETTEXT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case "$XGETTEXT" in -+ /*) -+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in $PATH; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then -+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" -+ ;; -+esac -+fi -+XGETTEXT="$ac_cv_path_XGETTEXT" -+if test "$XGETTEXT" != ":"; then -+ echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -+echo "${ECHO_T}$XGETTEXT" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi - -- echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 --echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6 --if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char bindtextdomain (); - int - main () - { --bindtextdomain (); -+extern int _nl_msg_cat_cntr; -+ return _nl_msg_cat_cntr - ; - return 0; - } -@@ -21959,45 +22036,66 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_intl_bindtextdomain=yes -+ CATOBJEXT=.gmo -+ DATADIRNAME=share - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_intl_bindtextdomain=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 --echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6 --if test $ac_cv_lib_intl_bindtextdomain = yes; then -- echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 --echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6 --if test "${ac_cv_lib_intl_ngettext+set}" = set; then -+case $host in -+ *-*-solaris*) -+ echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6 -+if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char bind_textdomain_codeset (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef bind_textdomain_codeset - - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus - extern "C" -+{ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char ngettext (); -+char bind_textdomain_codeset (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset) -+choke me -+#else -+char (*f) () = bind_textdomain_codeset; -+#endif -+#ifdef __cplusplus -+} -+#endif -+ - int - main () - { --ngettext (); -+return f != bind_textdomain_codeset; - ; - return 0; - } -@@ -22024,105 +22122,176 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_intl_ngettext=yes -+ ac_cv_func_bind_textdomain_codeset=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_intl_ngettext=no -+ac_cv_func_bind_textdomain_codeset=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 --echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6 --if test $ac_cv_lib_intl_ngettext = yes; then -- echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 --echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6 --if test "${ac_cv_lib_intl_dgettext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6 -+if test $ac_cv_func_bind_textdomain_codeset = yes; then -+ CATOBJEXT=.gmo -+ DATADIRNAME=share - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ CATOBJEXT=.mo -+ DATADIRNAME=lib -+fi - --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char dgettext (); --int --main () --{ --dgettext (); -- ; -- return 0; --} -+ ;; -+ *) -+ CATOBJEXT=.mo -+ DATADIRNAME=lib -+ ;; -+ esac -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$glib_save_LIBS" -+ INSTOBJEXT=.mo -+ else -+ gt_cv_have_gettext=no -+ fi -+ fi -+ -+fi -+ -+ -+ -+ if test "$gt_cv_have_gettext" = "yes" ; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define ENABLE_NLS 1 - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_intl_dgettext=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_intl_dgettext=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 --echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6 --if test $ac_cv_lib_intl_dgettext = yes; then -- gt_cv_func_dgettext_libintl=yes --fi -+ fi -+ -+ if test "$XGETTEXT" != ":"; then -+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then -+ : ; -+ else -+ echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 -+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 -+ XGETTEXT=":" -+ fi -+ fi -+ -+ # We need to process the po/ directory. -+ POSUB=po -+ -+ ac_config_commands="$ac_config_commands default-1" -+ -+ -+ for lang in $ALL_LINGUAS; do -+ GMOFILES="$GMOFILES $lang.gmo" -+ POFILES="$POFILES $lang.po" -+ done -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ if test "$gt_cv_have_gettext" = "yes"; then -+ if test "x$ALL_LINGUAS" = "x"; then -+ LINGUAS= -+ else -+ echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 -+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 -+ NEW_LINGUAS= -+ for presentlang in $ALL_LINGUAS; do -+ useit=no -+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then -+ desiredlanguages="$LINGUAS" -+ else -+ desiredlanguages="$ALL_LINGUAS" -+ fi -+ for desiredlang in $desiredlanguages; do -+ # Use the presentlang catalog if desiredlang is -+ # a. equal to presentlang, or -+ # b. a variant of presentlang (because in this case, -+ # presentlang can be used as a fallback for messages -+ # which are not translated in the desiredlang catalog). -+ case "$desiredlang" in -+ "$presentlang"*) useit=yes;; -+ esac -+ done -+ if test $useit = yes; then -+ NEW_LINGUAS="$NEW_LINGUAS $presentlang" -+ fi -+ done -+ LINGUAS=$NEW_LINGUAS -+ echo "$as_me:$LINENO: result: $LINGUAS" >&5 -+echo "${ECHO_T}$LINGUAS" >&6 -+ fi -+ -+ if test -n "$LINGUAS"; then -+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -+ fi -+ fi -+ -+ MKINSTALLDIRS= -+ if test -n "$ac_aux_dir"; then -+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -+ fi -+ if test -z "$MKINSTALLDIRS"; then -+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" -+ fi -+ - --fi -+ test -d po || mkdir po -+ if test "x$srcdir" != "x."; then -+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -+ posrcprefix="$srcdir/" -+ else -+ posrcprefix="../$srcdir/" -+ fi -+ else -+ posrcprefix="../" -+ fi -+ rm -f po/POTFILES -+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -+ < $srcdir/po/POTFILES.in > po/POTFILES - -+ -+echo "$as_me:$LINENO: checking locale directory" >&5 -+echo $ECHO_N "checking locale directory... $ECHO_C" >&6 -+if test "x$prefix" = "xNONE"; then -+ PACKAGE_LOCALE_DIR=$ac_default_prefix/share/locale -+else -+ PACKAGE_LOCALE_DIR=$prefix/share/locale - fi - - -- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then -- echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 --echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6 -- echo "$as_me:$LINENO: result: " >&5 --echo "${ECHO_T}" >&6 -- echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 --echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6 --if test "${ac_cv_lib_intl_ngettext+set}" = set; then -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_LOCALE_DIR "$PACKAGE_LOCALE_DIR" -+_ACEOF -+ -+ echo "$as_me:$LINENO: result: \"$PACKAGE_LOCALE_DIR\"" >&5 -+echo "${ECHO_T}\"$PACKAGE_LOCALE_DIR\"" >&6 -+ -+INTLTOOL_QALCULATE_DEFINITIONS_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po-defs/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-defs/.intltool-merge-cache $(top_srcdir)/po-defs $< $@' -+ -+ -+ -+echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 -+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6 -+if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl -liconv $LIBS" -+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22136,11 +22305,11 @@ extern "C" - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char ngettext (); -+char pthread_create (); - int - main () - { --ngettext (); -+pthread_create (); - ; - return 0; - } -@@ -22154,7 +22323,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -+ { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 -@@ -22167,114 +22336,159 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_intl_ngettext=yes -+ ac_cv_lib_pthread_pthread_create=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_intl_ngettext=no -+ac_cv_lib_pthread_pthread_create=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 --echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6 --if test $ac_cv_lib_intl_ngettext = yes; then -- echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 --echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6 --if test "${ac_cv_lib_intl_dcgettext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 -+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 -+if test $ac_cv_lib_pthread_pthread_create = yes; then -+ LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" -+fi -+ -+ -+ac_ext=cc -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ -+ -+ -+# Check whether --with-cln-prefix or --without-cln-prefix was given. -+if test "${with_cln_prefix+set}" = set; then -+ withval="$with_cln_prefix" -+ cln_config_prefix="$withval" - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl -liconv $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ cln_config_prefix="" -+fi; - --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char dcgettext (); --int --main () --{ --dcgettext (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_intl_dcgettext=yes -+# Check whether --with-cln-exec-prefix or --without-cln-exec-prefix was given. -+if test "${with_cln_exec_prefix+set}" = set; then -+ withval="$with_cln_exec_prefix" -+ cln_config_exec_prefix="$withval" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ cln_config_exec_prefix="" -+fi; -+# Check whether --enable-clntest or --disable-clntest was given. -+if test "${enable_clntest+set}" = set; then -+ enableval="$enable_clntest" - --ac_cv_lib_intl_dcgettext=no -+else -+ enable_clntest=yes -+fi; -+ -+if test x$cln_config_exec_prefix != x ; then -+ cln_config_args="$cln_config_args --exec-prefix=$cln_config_exec_prefix" -+ if test x${CLN_CONFIG+set} != xset ; then -+ CLN_CONFIG=$cln_config_exec_prefix/bin/cln-config -+ fi - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+if test x$cln_config_prefix != x ; then -+ cln_config_args="$cln_config_args --prefix=$cln_config_prefix" -+ if test x${CLN_CONFIG+set} != xset ; then -+ CLN_CONFIG=$cln_config_prefix/bin/cln-config -+ fi - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 --echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6 --if test $ac_cv_lib_intl_dcgettext = yes; then -- gt_cv_func_dgettext_libintl=yes -- libintl_extra_libs=-liconv -+ -+# Extract the first word of "cln-config", so it can be a program name with args. -+set dummy cln-config; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_path_CLN_CONFIG+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- : -+ case $CLN_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_CLN_CONFIG="$CLN_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_path_CLN_CONFIG="$as_dir/$ac_word$ac_exec_ext" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+ test -z "$ac_cv_path_CLN_CONFIG" && ac_cv_path_CLN_CONFIG="no" -+ ;; -+esac - fi -+CLN_CONFIG=$ac_cv_path_CLN_CONFIG - -+if test -n "$CLN_CONFIG"; then -+ echo "$as_me:$LINENO: result: $CLN_CONFIG" >&5 -+echo "${ECHO_T}$CLN_CONFIG" >&6 - else -- : -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 - fi - -- fi -- -- # -- # If we found libintl, then check in it for bind_textdomain_codeset(); -- # we'll prefer libc if neither have bind_textdomain_codeset(), -- # and both have dgettext and ngettext -- # -- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then -- glib_save_LIBS="$LIBS" -- LIBS="$LIBS -lintl $libintl_extra_libs" -- unset ac_cv_func_bind_textdomain_codeset -- --for ac_func in bind_textdomain_codeset --do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+cln_min_version=1.1.0 -+echo "$as_me:$LINENO: checking for CLN - version >= $cln_min_version" >&5 -+echo $ECHO_N "checking for CLN - version >= $cln_min_version... $ECHO_C" >&6 -+if test "$CLN_CONFIG" = "no" ; then -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+ echo "*** The cln-config script installed by CLN could not be found" -+ echo "*** If CLN was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the CLN_CONFIG environment variable to the" -+ echo "*** full path to cln-config." -+ { { echo "$as_me:$LINENO: error: No suitable installed version of CLN could be found." >&5 -+echo "$as_me: error: No suitable installed version of CLN could be found." >&2;} -+ { (exit 1); exit 1; }; } -+else -+ cln_min_major_version=`echo $cln_min_version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -+ cln_min_minor_version=`echo $cln_min_version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -+ cln_min_micro_version=`echo $cln_min_version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ CLN_CPPFLAGS=`$CLN_CONFIG $cln_config_args --cppflags` -+ CLN_LIBS=`$CLN_CONFIG $cln_config_args --libs` -+ cln_config_version=`$CLN_CONFIG $cln_config_args --version` -+ cln_config_major_version=`echo $cln_config_version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -+ cln_config_minor_version=`echo $cln_config_version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -+ cln_config_micro_version=`echo $cln_config_version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ if test \( $cln_config_major_version -lt $cln_min_major_version \) -o \ -+ \( $cln_config_major_version -eq $cln_min_major_version -a $cln_config_minor_version -lt $cln_min_minor_version \) -o \ -+ \( $cln_config_major_version -eq $cln_min_major_version -a $cln_config_minor_version -eq $cln_min_minor_version -a $cln_config_micro_version -lt $cln_min_micro_version \); then -+ echo -e "\n*** 'cln-config --version' returned $cln_config_major_version.$cln_config_minor_version.$cln_config_micro_version, but the minimum version" -+ echo "*** of CLN required is $cln_min_major_version.$cln_min_minor_version.$cln_min_micro_version. If cln-config is correct, then it is" -+ echo "*** best to upgrade to the required version." -+ echo "*** If cln-config was wrong, set the environment variable CLN_CONFIG" -+ echo "*** to point to the correct copy of cln-config, and remove the file" -+ echo "*** config.cache before re-running configure." -+ { { echo "$as_me:$LINENO: error: No suitable installed version of CLN could be found." >&5 -+echo "$as_me: error: No suitable installed version of CLN could be found." >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ no_cln="" -+ if test "x$enable_clntest" = "xyes" ; then -+ ac_save_CPPFLAGS="$CPPFLAGS" -+ ac_save_LIBS="$LIBS" -+ CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS" -+ LIBS="$LIBS $CLN_LIBS" -+ rm -f conf.clntest -+ if test "$cross_compiling" = yes; then -+ echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -22282,215 +22496,99 @@ _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ - --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -+#include <stdio.h> -+#include <string.h> -+#include <cln/version.h> - --#undef $ac_func -+/* we do not #include <stdlib.h> because autoconf in C++ mode inserts a -+ prototype for exit() that conflicts with the one in stdlib.h */ -+extern "C" int system(const char *); - --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" -+int main(void) - { --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} --#endif -+ system("touch conf.clntest"); - --int --main () --{ --return f != $ac_func; -- ; -- return 0; -+ if ((CL_VERSION_MAJOR != $cln_config_major_version) || -+ (CL_VERSION_MINOR != $cln_config_minor_version) || -+ (CL_VERSION_PATCHLEVEL != $cln_config_micro_version)) { -+ printf("\n*** 'cln-config --version' returned %d.%d.%d, but the header file I found\n", $cln_config_major_version, $cln_config_minor_version, $cln_config_micro_version); -+ printf("*** corresponds to %d.%d.%d. This mismatch suggests your installation of CLN\n", CL_VERSION_MAJOR, CL_VERSION_MINOR, CL_VERSION_PATCHLEVEL); -+ printf("*** is corrupted or you have specified some wrong -I compiler flags.\n"); -+ printf("*** Please inquire and consider reinstalling CLN.\n"); -+ return 1; -+ } -+ if ((cln::version_major != $cln_config_major_version) || -+ (cln::version_minor != $cln_config_minor_version) || -+ (cln::version_patchlevel != $cln_config_micro_version)) { -+ printf("\n*** 'cln-config --version' returned %d.%d.%d, but the library I found\n", $cln_config_major_version, $cln_config_minor_version, $cln_config_micro_version); -+ printf("*** corresponds to %d.%d.%d. This mismatch suggests your installation of CLN\n", cln::version_major, cln::version_minor, cln::version_patchlevel); -+ printf("*** is corrupted or you have specified some wrong -L compiler flags.\n"); -+ printf("*** Please inquire and consider reinstalling CLN.\n"); -+ return 1; -+ } -+ return 0; - } -+ - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext -+rm -f conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- eval "$as_ac_var=yes" -+ : - else -- echo "$as_me: failed program was:" >&5 -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_var=no" --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+( exit $ac_status ) -+no_cln=yes - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 --if test `eval echo '${'$as_ac_var'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi --done -- -- LIBS="$glib_save_LIBS" -- -- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then -- gt_cv_func_dgettext_libc=no -- else -- if test "$gt_cv_func_dgettext_libc" = "yes" \ -- && test "$gt_cv_func_ngettext_libc" = "yes"; then -- gt_cv_func_dgettext_libintl=no -- fi -- fi -+ CPPFLAGS="$ac_save_CPPFLAGS" -+ LIBS="$ac_save_LIBS" - fi -- fi -- -- if test "$gt_cv_func_dgettext_libc" = "yes" \ -- || test "$gt_cv_func_dgettext_libintl" = "yes"; then -- gt_cv_have_gettext=yes -- fi -- -- if test "$gt_cv_func_dgettext_libintl" = "yes"; then -- INTLLIBS="-lintl $libintl_extra_libs" -- fi -+ if test "x$no_cln" = x ; then -+ echo "$as_me:$LINENO: result: yes, $cln_config_version" >&5 -+echo "${ECHO_T}yes, $cln_config_version" >&6 - -- if test "$gt_cv_have_gettext" = "yes"; then -+ LIBS="$LIBS $CLN_LIBS" -+ CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS" - - cat >>confdefs.h <<\_ACEOF --#define HAVE_GETTEXT 1 --_ACEOF -- -- # Extract the first word of "msgfmt", so it can be a program name with args. --set dummy msgfmt; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_MSGFMT+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- case "$MSGFMT" in -- /*) -- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. -- ;; -- *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in $PATH; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then -- ac_cv_path_MSGFMT="$ac_dir/$ac_word" -- break -- fi -- fi -- done -- IFS="$ac_save_ifs" -- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" -- ;; --esac --fi --MSGFMT="$ac_cv_path_MSGFMT" --if test "$MSGFMT" != "no"; then -- echo "$as_me:$LINENO: result: $MSGFMT" >&5 --echo "${ECHO_T}$MSGFMT" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- if test "$MSGFMT" != "no"; then -- glib_save_LIBS="$LIBS" -- LIBS="$LIBS $INTLLIBS" -- --for ac_func in dcgettext --do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+#define HAVE_LIBCLN 1 - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ - --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --{ --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} --#endif -+ else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+ if test ! -f conf.clntest ; then -+ echo "*** Could not run CLN test program, checking why..." -+ CPPFLAGS="$CFLAGS $CLN_CPPFLAGS" -+ LIBS="$LIBS $CLN_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#include <stdio.h> -+#include <cln/version.h> - - int - main () - { --return f != $ac_func; -+ return 0; - ; - return 0; - } -@@ -22517,36 +22615,54 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- eval "$as_ac_var=yes" -+ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding CLN or finding the wrong" -+ echo "*** version of CLN. If it is not finding CLN, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location. Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system." - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_var=no" -+ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means CLN was incorrectly installed" -+ echo "*** or that you have moved CLN since it was installed. In the latter case, you" -+ echo "*** may want to edit the cln-config script: $CLN_CONFIG." - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -+ CPPFLAGS="$ac_save_CPPFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ CLN_CPPFLAGS="" -+ CLN_LIBS="" -+ { { echo "$as_me:$LINENO: error: No suitable installed version of CLN could be found." >&5 -+echo "$as_me: error: No suitable installed version of CLN could be found." >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ fi - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 --if test `eval echo '${'$as_ac_var'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF - --fi --done - -- # Extract the first word of "gmsgfmt", so it can be a program name with args. --set dummy gmsgfmt; ac_word=$2 -+rm -f conf.clntest -+ -+ -+ -+ -+ -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 - echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_GMSGFMT+set}" = set; then -+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- case $GMSGFMT in -+ case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) -- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -22556,349 +22672,231 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" -+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done - -- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; - esac - fi --GMSGFMT=$ac_cv_path_GMSGFMT -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG - --if test -n "$GMSGFMT"; then -- echo "$as_me:$LINENO: result: $GMSGFMT" >&5 --echo "${ECHO_T}$GMSGFMT" >&6 -+if test -n "$PKG_CONFIG"; then -+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -+echo "${ECHO_T}$PKG_CONFIG" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -- # Extract the first word of "xgettext", so it can be a program name with args. --set dummy xgettext; ac_word=$2 -+fi -+if test -z "$ac_cv_path_PKG_CONFIG"; then -+ ac_pt_PKG_CONFIG=$PKG_CONFIG -+ # Extract the first word of "pkg-config", so it can be a program name with args. -+set dummy pkg-config; ac_word=$2 - echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_XGETTEXT+set}" = set; then -+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- case "$XGETTEXT" in -- /*) -- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. -+ case $ac_pt_PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in $PATH; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then -- ac_cv_path_XGETTEXT="$ac_dir/$ac_word" -- break -- fi -- fi -- done -- IFS="$ac_save_ifs" -- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ - ;; - esac - fi --XGETTEXT="$ac_cv_path_XGETTEXT" --if test "$XGETTEXT" != ":"; then -- echo "$as_me:$LINENO: result: $XGETTEXT" >&5 --echo "${ECHO_T}$XGETTEXT" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ --extern int _nl_msg_cat_cntr; -- return _nl_msg_cat_cntr -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- CATOBJEXT=.gmo -- DATADIRNAME=share --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --case $host in -- *-*-solaris*) -- echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 --echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6 --if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define bind_textdomain_codeset innocuous_bind_textdomain_codeset -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char bind_textdomain_codeset (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef bind_textdomain_codeset -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --{ --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char bind_textdomain_codeset (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset) --choke me --#else --char (*f) () = bind_textdomain_codeset; --#endif --#ifdef __cplusplus --} --#endif -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG - --int --main () --{ --return f != bind_textdomain_codeset; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_bind_textdomain_codeset=yes -+if test -n "$ac_pt_PKG_CONFIG"; then -+ echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_func_bind_textdomain_codeset=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 - fi --echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 --echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6 --if test $ac_cv_func_bind_textdomain_codeset = yes; then -- CATOBJEXT=.gmo -- DATADIRNAME=share -+ -+ PKG_CONFIG=$ac_pt_PKG_CONFIG - else -- CATOBJEXT=.mo -- DATADIRNAME=lib -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" - fi - -- ;; -- *) -- CATOBJEXT=.mo -- DATADIRNAME=lib -- ;; -- esac - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- LIBS="$glib_save_LIBS" -- INSTOBJEXT=.mo -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=0.9.0 -+ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 - else -- gt_cv_have_gettext=no -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+ PKG_CONFIG="" - fi -- fi - - fi - -+pkg_failed=no -+echo "$as_me:$LINENO: checking for GLIB" >&5 -+echo $ECHO_N "checking for GLIB... $ECHO_C" >&6 - -- -- if test "$gt_cv_have_gettext" = "yes" ; then -- --cat >>confdefs.h <<\_ACEOF --#define ENABLE_NLS 1 --_ACEOF -- -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GLIB_CFLAGS"; then -+ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" -+ glib-2.0 -+ libxml-2.0 >= 2.3.8 -+ \"") >&5 -+ ($PKG_CONFIG --exists --print-errors " -+ glib-2.0 -+ libxml-2.0 >= 2.3.8 -+ ") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags " -+ glib-2.0 -+ libxml-2.0 >= 2.3.8 -+ " 2>/dev/null` -+else -+ pkg_failed=yes -+fi - fi -- -- if test "$XGETTEXT" != ":"; then -- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then -- : ; -- else -- echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 --echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 -- XGETTEXT=":" -- fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GLIB_LIBS"; then -+ pkg_cv_GLIB_LIBS="$GLIB_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" -+ glib-2.0 -+ libxml-2.0 >= 2.3.8 -+ \"") >&5 -+ ($PKG_CONFIG --exists --print-errors " -+ glib-2.0 -+ libxml-2.0 >= 2.3.8 -+ ") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs " -+ glib-2.0 -+ libxml-2.0 >= 2.3.8 -+ " 2>/dev/null` -+else -+ pkg_failed=yes -+fi - fi -- -- # We need to process the po/ directory. -- POSUB=po -- -- ac_config_commands="$ac_config_commands default-1" -- -- -- for lang in $ALL_LINGUAS; do -- GMOFILES="$GMOFILES $lang.gmo" -- POFILES="$POFILES $lang.po" -- done -- -- -- -- -+else -+ pkg_failed=untried -+fi - - - -+if test $pkg_failed = yes; then - -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " -+ glib-2.0 -+ libxml-2.0 >= 2.3.8 -+ "` -+ else -+ GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " -+ glib-2.0 -+ libxml-2.0 >= 2.3.8 -+ "` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GLIB_PKG_ERRORS" >&5 - -+ { { echo "$as_me:$LINENO: error: Package requirements ( -+ glib-2.0 -+ libxml-2.0 >= 2.3.8 -+ ) were not met: - -+$GLIB_PKG_ERRORS - -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. - -+Alternatively, you may set the environment variables GLIB_CFLAGS -+and GLIB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+echo "$as_me: error: Package requirements ( -+ glib-2.0 -+ libxml-2.0 >= 2.3.8 -+ ) were not met: - -- if test "$gt_cv_have_gettext" = "yes"; then -- if test "x$ALL_LINGUAS" = "x"; then -- LINGUAS= -- else -- echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 --echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 -- NEW_LINGUAS= -- for presentlang in $ALL_LINGUAS; do -- useit=no -- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then -- desiredlanguages="$LINGUAS" -- else -- desiredlanguages="$ALL_LINGUAS" -- fi -- for desiredlang in $desiredlanguages; do -- # Use the presentlang catalog if desiredlang is -- # a. equal to presentlang, or -- # b. a variant of presentlang (because in this case, -- # presentlang can be used as a fallback for messages -- # which are not translated in the desiredlang catalog). -- case "$desiredlang" in -- "$presentlang"*) useit=yes;; -- esac -- done -- if test $useit = yes; then -- NEW_LINGUAS="$NEW_LINGUAS $presentlang" -- fi -- done -- LINGUAS=$NEW_LINGUAS -- echo "$as_me:$LINENO: result: $LINGUAS" >&5 --echo "${ECHO_T}$LINGUAS" >&6 -- fi -+$GLIB_PKG_ERRORS - -- if test -n "$LINGUAS"; then -- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -- fi -- fi -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. - -- MKINSTALLDIRS= -- if test -n "$ac_aux_dir"; then -- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -- fi -- if test -z "$MKINSTALLDIRS"; then -- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" -- fi -+Alternatively, you may set the environment variables GLIB_CFLAGS -+and GLIB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&2;} -+ { (exit 1); exit 1; }; } -+elif test $pkg_failed = untried; then -+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. - -+Alternatively, you may set the environment variables GLIB_CFLAGS -+and GLIB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. - -- test -d po || mkdir po -- if test "x$srcdir" != "x."; then -- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -- posrcprefix="$srcdir/" -- else -- posrcprefix="../$srcdir/" -- fi -- else -- posrcprefix="../" -- fi -- rm -f po/POTFILES -- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -- < $srcdir/po/POTFILES.in > po/POTFILES -+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. -+See \`config.log' for more details." >&5 -+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. - -+Alternatively, you may set the environment variables GLIB_CFLAGS -+and GLIB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. - --echo "$as_me:$LINENO: checking locale directory" >&5 --echo $ECHO_N "checking locale directory... $ECHO_C" >&6 --if test "x$prefix" = "xNONE"; then -- PACKAGE_LOCALE_DIR=$ac_default_prefix/share/locale -+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } - else -- PACKAGE_LOCALE_DIR=$prefix/share/locale -+ GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS -+ GLIB_LIBS=$pkg_cv_GLIB_LIBS -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+ : - fi - - --cat >>confdefs.h <<_ACEOF --#define PACKAGE_LOCALE_DIR "$PACKAGE_LOCALE_DIR" --_ACEOF -- -- echo "$as_me:$LINENO: result: \"$PACKAGE_LOCALE_DIR\"" >&5 --echo "${ECHO_T}\"$PACKAGE_LOCALE_DIR\"" >&6 -- --INTLTOOL_QALCULATE_DEFINITIONS_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po-defs/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-defs/.intltool-merge-cache $(top_srcdir)/po-defs $< $@' -- -- - - ac_config_files="$ac_config_files Makefile src/Makefile libqalculate/Makefile data/Makefile po/Makefile.in po-defs/Makefile docs/Makefile docs/reference/Makefile libqalculate.pc" - cat >confcache <<\_ACEOF |