From 3e8155728d2469ce44eb1ac742c551851bbe0d4f Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Sun, 20 Aug 2000 16:34:00 +0000 Subject: [PATCH] Added a check for libtermcap in configure script. --- CHANGES | 8 +++-- configure | 99 ++++++++++++++++++++++++++++++++++++++-------------- configure.in | 14 ++++++-- 3 files changed, 91 insertions(+), 30 deletions(-) diff --git a/CHANGES b/CHANGES index 1913989..ae7b438 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -$Id: CHANGES,v 1.75 2000/08/20 15:46:52 stelian Exp $ +$Id: CHANGES,v 1.76 2000/08/20 16:34:00 stelian Exp $ Changes between versions 0.4b17 and 0.4b19 (released ?????????????) =================================================================== @@ -30,9 +30,13 @@ Changes between versions 0.4b17 and 0.4b19 (released ?????????????) Thanks to Kenneth Porter for reporting the bug. -7. Update the RPM spec file to the latest RedHat version, +7. Updated the RPM spec file to the latest RedHat version, providing FHS packaging and other cosmetic changes. +8. Updated the configure script to check for libtermcap + before checking for libreadline, because we need this + library in order to compile the readline support. + Changes between versions 0.4b17 and 0.4b18 (released June 30, 2000) =================================================================== diff --git a/configure b/configure index e8d4d7c..44fa7a1 100755 --- a/configure +++ b/configure @@ -1678,19 +1678,66 @@ if test "$ext2fs_h" = no -o "$ext2fs_lib" = no; then { echo "configure: error: You need to install the Ext2fs libraries from the E2fsprogs distribution first - hint: make install-libs" 1>&2; exit 1; } fi +echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 +echo "configure:1683: checking for tgetent in -ltermcap" >&5 +ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ltermcap $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + termcap_lib=yes +else + echo "$ac_t""no" 1>&6 +termcap_lib=no +fi + +if test "$termcap_lib" = no; then + if test "$READLINE" = "-lreadline -ltermcap"; then + { echo "configure: error: You need to install the GNU termcap libraries first" 1>&2; exit 1; } + fi +fi + ac_safe=`echo "readline/readline.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for readline/readline.h""... $ac_c" 1>&6 -echo "configure:1684: checking for readline/readline.h" >&5 +echo "configure:1731: checking for readline/readline.h" >&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:1694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1741: \"$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* @@ -1713,15 +1760,15 @@ readline_h=no fi echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:1717: checking for readline in -lreadline" >&5 +echo "configure:1764: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lreadline $LIBS" +LIBS="-lreadline "-ltermcap" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1754,7 +1801,7 @@ readline_lib=no fi if test "$readline_h" = no -o "$readline_lib" = no; then - if test "$READLINE" = "-lreadline"; then + if test "$READLINE" = "-lreadline -ltermcap"; then { echo "configure: error: You need to install the GNU readline libraries first" 1>&2; exit 1; } fi fi @@ -1762,12 +1809,12 @@ fi for ac_func in err errx verr verrx vwarn vwarnx warn warnx realpath lchown do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1766: checking for $ac_func" >&5 +echo "configure:1813: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1815,12 +1862,12 @@ fi done echo $ac_n "checking for glob""... $ac_c" 1>&6 -echo "configure:1819: checking for glob" >&5 +echo "configure:1866: checking for glob" >&5 if eval "test \"`echo '$''{'ac_cv_func_glob'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_glob=yes" else @@ -1865,7 +1912,7 @@ fi if test "$ac_cv_func_glob" = "yes"; then cat > conftest.$ac_ext < @@ -1893,12 +1940,12 @@ rm -f conftest* fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1897: checking for ANSI C header files" >&5 +echo "configure:1944: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1906,7 +1953,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1957: \"$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* @@ -1923,7 +1970,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1941,7 +1988,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1962,7 +2009,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1973,7 +2020,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1997,12 +2044,12 @@ EOF fi echo $ac_n "checking for quad_t""... $ac_c" 1>&6 -echo "configure:2001: checking for quad_t" >&5 +echo "configure:2048: checking for quad_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_quad_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2030,12 +2077,12 @@ EOF fi echo $ac_n "checking for u_quad_t""... $ac_c" 1>&6 -echo "configure:2034: checking for u_quad_t" >&5 +echo "configure:2081: checking for u_quad_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_quad_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS diff --git a/configure.in b/configure.in index e41cf07..dcb6bfb 100644 --- a/configure.in +++ b/configure.in @@ -260,13 +260,23 @@ if test "$ext2fs_h" = no -o "$ext2fs_lib" = no; then AC_MSG_ERROR(You need to install the Ext2fs libraries from the E2fsprogs distribution first - hint: make install-libs) fi +dnl +dnl Check for termcap libraries +dnl +AC_CHECK_LIB(termcap, tgetent, [termcap_lib=yes], [termcap_lib=no]) +if test "$termcap_lib" = no; then + if test "$READLINE" = "-lreadline -ltermcap"; then + AC_MSG_ERROR(You need to install the GNU termcap libraries first) + fi +fi + dnl dnl Check for readline headers and libraries dnl AC_CHECK_HEADER(readline/readline.h, [readline_h=yes], [readline_h=no]) -AC_CHECK_LIB(readline, readline, [readline_lib=yes], [readline_lib=no]) +AC_CHECK_LIB(readline, readline, [readline_lib=yes], [readline_lib=no], "-ltermcap") if test "$readline_h" = no -o "$readline_lib" = no; then - if test "$READLINE" = "-lreadline"; then + if test "$READLINE" = "-lreadline -ltermcap"; then AC_MSG_ERROR(You need to install the GNU readline libraries first) fi fi -- 2.39.2