From 1d2e04ec63239f1b343129f796050d99bf7ad04e Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Fri, 12 Sep 2008 18:06:41 +0000 Subject: A few changes: 1) Start using menuselect trunk 2) Bring in changes similar to those in asterisk trunk so that 'make menuselect' works as it should from the dahdi-tools directory. 3) Stop looking for curses/ncurses in the top level configure since nothing uses it (except menuselect which will find it on it's own). git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@4904 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- Makefile | 52 ++++- configure | 742 +++++++---------------------------------------------------- configure.ac | 4 - makeopts.in | 6 - 4 files changed, 124 insertions(+), 680 deletions(-) diff --git a/Makefile b/Makefile index 4a943ba..6efc5b6 100644 --- a/Makefile +++ b/Makefile @@ -331,16 +331,56 @@ config.status: configure @echo "****" @exit 1 -menuselect.makeopts: menuselect/menuselect menuselect-tree - @menuselect/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@ +menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts + menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuconfig: menuselect -menuselect: menuselect/menuselect menuselect-tree - -@menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!" +cmenuconfig: cmenuselect -menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h config.status - @CFLAGS="" $(MAKE) -C menuselect CC=$(HOSTCC) +gmenuconfig: gmenuselect + +nmenuconfig: nmenuselect + +menuselect: menuselect/cmenuselect menuselect/nmenuselect menuselect/gmenuselect + @if [ -x menuselect/nmenuselect ]; then \ + $(MAKE) nmenuselect; \ + elif [ -x menuselect/cmenuselect ]; then \ + $(MAKE) cmenuselect; \ + elif [ -x menuselect/gmenuselect ]; then \ + $(MAKE) gmenuselect; \ + else \ + echo "No menuselect user interface found. Install ncurses,"; \ + echo "newt or GTK libraries to build one and re-rerun"; \ + echo "'make menuselect'."; \ + fi + +cmenuselect: menuselect/cmenuselect menuselect-tree + -@menuselect/cmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!" + +gmenuselect: menuselect/gmenuselect menuselect-tree + -@menuselect/gmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!" + +nmenuselect: menuselect/nmenuselect menuselect-tree + -@menuselect/nmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!" + +# options for make in menuselect/ +MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent" + +menuselect/menuselect: menuselect/makeopts + $(MAKE_MENUSELECT) menuselect + +menuselect/cmenuselect: menuselect/makeopts + $(MAKE_MENUSELECT) cmenuselect + +menuselect/gmenuselect: menuselect/makeopts + $(MAKE_MENUSELECT) gmenuselect + +menuselect/nmenuselect: menuselect/makeopts + $(MAKE_MENUSELECT) nmenuselect + +menuselect/makeopts: makeopts + $(MAKE_MENUSELECT) makeopts menuselect-tree: dahdi.xml @echo "Generating input for menuselect ..." diff --git a/configure b/configure index e172fdc..48c55f4 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 4369 . +# From configure.ac Revision: 4845 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -677,18 +677,10 @@ FETCH DOWNLOAD DAHDI_DEVMODE DAHDI_DECLARATION_AFTER_STATEMENT -CURSES_LIB -CURSES_INCLUDE -CURSES_DIR -PBX_CURSES DAHDI_LIB DAHDI_INCLUDE DAHDI_DIR PBX_DAHDI -NCURSES_LIB -NCURSES_INCLUDE -NCURSES_DIR -PBX_NCURSES NEWT_LIB NEWT_INCLUDE NEWT_DIR @@ -1286,9 +1278,7 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-curses=PATH use curses files in PATH --with-dahdi=PATH use DAHDI files in PATH - --with-ncurses=PATH use ncurses files in PATH --with-newt=PATH use newt files in PATH --with-usb=PATH use usb files in PATH --with-selinux enable (with) / disable (without) SELinux @@ -3350,34 +3340,6 @@ fi - CURSES_DESCRIP="curses" - CURSES_OPTION="curses" - -# Check whether --with-curses was given. -if test "${with_curses+set}" = set; then - withval=$with_curses; - case ${withval} in - n|no) - USE_CURSES=no - ;; - y|ye|yes) - ac_mandatory_list="${ac_mandatory_list} CURSES" - ;; - *) - CURSES_DIR="${withval}" - ac_mandatory_list="${ac_mandatory_list} CURSES" - ;; - esac - -fi - - PBX_CURSES=0 - - - - - - DAHDI_DESCRIP="DAHDI" DAHDI_OPTION="dahdi" @@ -3406,34 +3368,6 @@ fi - NCURSES_DESCRIP="ncurses" - NCURSES_OPTION="ncurses" - -# Check whether --with-ncurses was given. -if test "${with_ncurses+set}" = set; then - withval=$with_ncurses; - case ${withval} in - n|no) - USE_NCURSES=no - ;; - y|ye|yes) - ac_mandatory_list="${ac_mandatory_list} NCURSES" - ;; - *) - NCURSES_DIR="${withval}" - ac_mandatory_list="${ac_mandatory_list} NCURSES" - ;; - esac - -fi - - PBX_NCURSES=0 - - - - - - NEWT_DESCRIP="newt" NEWT_OPTION="newt" @@ -3491,6 +3425,82 @@ fi + if test "x${PBX_DAHDI}" != "x1"; then + { echo "$as_me:$LINENO: checking for DAHDI_CODE in dahdi/user.h" >&5 +echo $ECHO_N "checking for DAHDI_CODE in dahdi/user.h... $ECHO_C" >&6; } + saved_cppflags="${CPPFLAGS}" + if test "x${DAHDI_DIR}" != "x"; then + DAHDI_INCLUDE="-I${DAHDI_DIR}/include" + fi + CPPFLAGS="${CPPFLAGS} ${DAHDI_INCLUDE}" + + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +#if defined(DAHDI_CODE) + int foo = 0; + #else + int foo = bar; + #endif + 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + PBX_DAHDI=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_DAHDI 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_DAHDI_VERSION +_ACEOF + + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="${saved_cppflags}" + fi + + + { echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } if test "${ac_cv_path_GREP+set}" = set; then @@ -3897,594 +3907,6 @@ done -if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then - pbxlibdir="" - # if --with-CURSES=DIR has been specified, use it. - if test "x${CURSES_DIR}" != "x"; then - if test -d ${CURSES_DIR}/lib; then - pbxlibdir="-L${CURSES_DIR}/lib" - else - pbxlibdir="-L${CURSES_DIR}" - fi - fi - pbxfuncname="initscr" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_CURSES_FOUND=yes - else - as_ac_Lib=`echo "ac_cv_lib_curses_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lcurses" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lcurses... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcurses ${pbxlibdir} $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 GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ${pbxfuncname} (); -int -main () -{ -return ${pbxfuncname} (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_Lib=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then - AST_CURSES_FOUND=yes -else - AST_CURSES_FOUND=no -fi - - fi - - # now check for the header. - if test "${AST_CURSES_FOUND}" = "yes"; then - CURSES_LIB="${pbxlibdir} -lcurses " - # if --with-CURSES=DIR has been specified, use it. - if test "x${CURSES_DIR}" != "x"; then - CURSES_INCLUDE="-I${CURSES_DIR}/include" - fi - CURSES_INCLUDE="${CURSES_INCLUDE} " - if test "xcurses.h" = "x" ; then # no header, assume found - CURSES_HEADER_FOUND="1" - else # check for the header - saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${CURSES_INCLUDE} " - if test "${ac_cv_header_curses_h+set}" = set; then - { echo "$as_me:$LINENO: checking for curses.h" >&5 -echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; } -if test "${ac_cv_header_curses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5 -echo "${ECHO_T}$ac_cv_header_curses_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking curses.h usability" >&5 -echo $ECHO_N "checking curses.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 -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; 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 core 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 curses.h presence" >&5 -echo $ECHO_N "checking curses.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. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.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_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: curses.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: curses.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: curses.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: curses.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: curses.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: curses.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: curses.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: curses.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for curses.h" >&5 -echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; } -if test "${ac_cv_header_curses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_curses_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5 -echo "${ECHO_T}$ac_cv_header_curses_h" >&6; } - -fi -if test $ac_cv_header_curses_h = yes; then - CURSES_HEADER_FOUND=1 -else - CURSES_HEADER_FOUND=0 -fi - - - CPPFLAGS="${saved_cppflags}" - fi - if test "x${CURSES_HEADER_FOUND}" = "x0" ; then - CURSES_LIB="" - CURSES_INCLUDE="" - else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - CURSES_LIB="" - fi - PBX_CURSES=1 - # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED - -cat >>confdefs.h <<_ACEOF -#define HAVE_CURSES 1 -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define HAVE_CURSES_VERSION -_ACEOF - - fi - fi -fi - - - if test "x${PBX_DAHDI}" != "x1"; then - { echo "$as_me:$LINENO: checking for DAHDI_CODE in dahdi/user.h" >&5 -echo $ECHO_N "checking for DAHDI_CODE in dahdi/user.h... $ECHO_C" >&6; } - saved_cppflags="${CPPFLAGS}" - if test "x${DAHDI_DIR}" != "x"; then - DAHDI_INCLUDE="-I${DAHDI_DIR}/include" - fi - CPPFLAGS="${CPPFLAGS} ${DAHDI_INCLUDE}" - - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -#if defined(DAHDI_CODE) - int foo = 0; - #else - int foo = bar; - #endif - 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - PBX_DAHDI=1 - -cat >>confdefs.h <<\_ACEOF -#define HAVE_DAHDI 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_DAHDI_VERSION -_ACEOF - - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="${saved_cppflags}" - fi - - - -if test "x${PBX_NCURSES}" != "x1" -a "${USE_NCURSES}" != "no"; then - pbxlibdir="" - # if --with-NCURSES=DIR has been specified, use it. - if test "x${NCURSES_DIR}" != "x"; then - if test -d ${NCURSES_DIR}/lib; then - pbxlibdir="-L${NCURSES_DIR}/lib" - else - pbxlibdir="-L${NCURSES_DIR}" - fi - fi - pbxfuncname="initscr" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_NCURSES_FOUND=yes - else - as_ac_Lib=`echo "ac_cv_lib_ncurses_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lncurses" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lncurses... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lncurses ${pbxlibdir} $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 GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ${pbxfuncname} (); -int -main () -{ -return ${pbxfuncname} (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_Lib=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then - AST_NCURSES_FOUND=yes -else - AST_NCURSES_FOUND=no -fi - - fi - - # now check for the header. - if test "${AST_NCURSES_FOUND}" = "yes"; then - NCURSES_LIB="${pbxlibdir} -lncurses " - # if --with-NCURSES=DIR has been specified, use it. - if test "x${NCURSES_DIR}" != "x"; then - NCURSES_INCLUDE="-I${NCURSES_DIR}/include" - fi - NCURSES_INCLUDE="${NCURSES_INCLUDE} " - if test "xcurses.h" = "x" ; then # no header, assume found - NCURSES_HEADER_FOUND="1" - else # check for the header - saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${NCURSES_INCLUDE} " - if test "${ac_cv_header_curses_h+set}" = set; then - { echo "$as_me:$LINENO: checking for curses.h" >&5 -echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; } -if test "${ac_cv_header_curses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5 -echo "${ECHO_T}$ac_cv_header_curses_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking curses.h usability" >&5 -echo $ECHO_N "checking curses.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 -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; 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 core 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 curses.h presence" >&5 -echo $ECHO_N "checking curses.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. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.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_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: curses.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: curses.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: curses.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: curses.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: curses.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: curses.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: curses.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: curses.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for curses.h" >&5 -echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; } -if test "${ac_cv_header_curses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_curses_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5 -echo "${ECHO_T}$ac_cv_header_curses_h" >&6; } - -fi -if test $ac_cv_header_curses_h = yes; then - NCURSES_HEADER_FOUND=1 -else - NCURSES_HEADER_FOUND=0 -fi - - - CPPFLAGS="${saved_cppflags}" - fi - if test "x${NCURSES_HEADER_FOUND}" = "x0" ; then - NCURSES_LIB="" - NCURSES_INCLUDE="" - else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - NCURSES_LIB="" - fi - PBX_NCURSES=1 - # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED - -cat >>confdefs.h <<_ACEOF -#define HAVE_NCURSES 1 -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define HAVE_NCURSES_VERSION -_ACEOF - - fi - fi -fi - - if test "x${PBX_NEWT}" != "x1" -a "${USE_NEWT}" != "no"; then pbxlibdir="" # if --with-NEWT=DIR has been specified, use it. @@ -5766,18 +5188,10 @@ FETCH!$FETCH$ac_delim DOWNLOAD!$DOWNLOAD$ac_delim DAHDI_DEVMODE!$DAHDI_DEVMODE$ac_delim DAHDI_DECLARATION_AFTER_STATEMENT!$DAHDI_DECLARATION_AFTER_STATEMENT$ac_delim -CURSES_LIB!$CURSES_LIB$ac_delim -CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim -CURSES_DIR!$CURSES_DIR$ac_delim -PBX_CURSES!$PBX_CURSES$ac_delim DAHDI_LIB!$DAHDI_LIB$ac_delim DAHDI_INCLUDE!$DAHDI_INCLUDE$ac_delim DAHDI_DIR!$DAHDI_DIR$ac_delim PBX_DAHDI!$PBX_DAHDI$ac_delim -NCURSES_LIB!$NCURSES_LIB$ac_delim -NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim -NCURSES_DIR!$NCURSES_DIR$ac_delim -PBX_NCURSES!$PBX_NCURSES$ac_delim NEWT_LIB!$NEWT_LIB$ac_delim NEWT_INCLUDE!$NEWT_INCLUDE$ac_delim NEWT_DIR!$NEWT_DIR$ac_delim @@ -5794,7 +5208,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index ce0669d..450d5c1 100644 --- a/configure.ac +++ b/configure.ac @@ -82,15 +82,11 @@ else fi AC_SUBST(DAHDI_DECLARATION_AFTER_STATEMENT) -AST_EXT_LIB_SETUP([CURSES], [curses], [curses]) AST_EXT_LIB_SETUP([DAHDI], [DAHDI], [dahdi]) -AST_EXT_LIB_SETUP([NCURSES], [ncurses], [ncurses]) AST_EXT_LIB_SETUP([NEWT], [newt], [newt]) AST_EXT_LIB_SETUP([USB], [usb], [usb]) -AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h]) AST_C_DEFINE_CHECK([DAHDI], [DAHDI_CODE], [dahdi/user.h]) -AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h]) AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h]) AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h]) diff --git a/makeopts.in b/makeopts.in index e92445c..a11777c 100644 --- a/makeopts.in +++ b/makeopts.in @@ -33,12 +33,6 @@ PBX_NEWT=@PBX_NEWT@ NEWT_LIB=@NEWT_LIB@ NEWT_INCLUDE=@NEWT_INCLUDE@ -CURSES_LIB=@CURSES_LIB@ -CURSES_INCLUDE=@CURSES_INCLUDE@ - -NCURSES_LIB=@NCURSES_LIB@ -NCURSES_INCLUDE=@NCURSES_INCLUDE@ - PBX_USB=@PBX_USB@ USB_LIB=@USB_LIB@ USB_INCLUDE=@USB_INCLUDE@ -- cgit v1.2.3