X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=configure;h=72566125f418e2f658c97abd089bc40d21c6c736;hb=d7a04a4e113b3d08aa0fde66ee658b7abe02e714;hp=a4f2c486f4d4b37e9ac829d625e4e6f8ab6a5f33;hpb=548845673bdbe52a3cb2d7c6c2818d3202fffcba;p=pkg%2Fabook.git diff --git a/configure b/configure index a4f2c48..7256612 100755 --- a/configure +++ b/configure @@ -695,7 +695,7 @@ fi PACKAGE=abook -VERSION=2002-xx-xx +VERSION=2002-03-11 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -2303,7 +2303,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_readline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ORIG_LIBS=$LIBS + ORIG_LIBS="$LIBS" for readline_lib in readline edit editline; do for termcap_lib in "" termcap curses ncurses; do if test -z "$termcap_lib"; then @@ -2342,14 +2342,15 @@ rm -f conftest* done if test -z "$ac_cv_lib_readline"; then ac_cv_lib_readline="no" - LIBS=$ORIG_LIBS fi + LIBS="$ORIG_LIBS" fi echo "$ac_t""$ac_cv_lib_readline" 1>&6 if test "$ac_cv_lib_readline" != "no"; then + LIBS="$LIBS $ac_cv_lib_readline" cat >> confdefs.h <<\EOF #define HAVE_LIBREADLINE 1 EOF @@ -2358,17 +2359,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2362: checking for $ac_hdr" >&5 +echo "configure:2363: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2395,14 +2396,14 @@ fi done echo $ac_n "checking whether readline supports history""... $ac_c" 1>&6 -echo "configure:2399: checking whether readline supports history" >&5 +echo "configure:2400: checking whether readline supports history" >&5 if eval "test \"`echo '$''{'ac_cv_lib_readline_history'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_lib_readline_history="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_lib_readline_history="yes" else @@ -2434,17 +2435,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2438: checking for $ac_hdr" >&5 +echo "configure:2439: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2474,12 +2475,11 @@ done fi -if test x$ac_lib_readline = xno -o x$ac_cv_lib_readline_history = xno; then + +if test x$ac_cv_lib_readline = xno -o x$ac_cv_lib_readline_history = xno; then { echo "configure: error: *** readline library not found or it doesn't support history ***" 1>&2; exit 1; } fi -LDFLAGS="$ac_cv_lib_readline $LDFLAGS" - for ac_func in resizeterm do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6