--- configure.ac.old 2011-09-13 23:46:09.000000000 +0800 +++ configure.ac 2011-09-13 23:46:51.000000000 +0800 @@ -30,27 +30,7 @@ fi AC_CHECK_HEADERS([sys/select.h alloca.h]) -AC_CHECK_HEADER([slang.h], [], [ - old_CPPFLAGS=${CPPFLAGS} - CPPFLAGS="${CPPFLAGS} -I/opt/local/include" - unset ac_cv_header_slang_h - AC_CHECK_HEADER([slang.h]) - if test x$ac_cv_header_slang_h = x; then - CPPFLAGS="${old_CPPFLAGS}" - else - LDFLAGS="${LDFLAGS} -L/opt/local/lib" - fi -]) -if test x$ac_cv_header_slang_h = x; then - old_CPPFLAGS=${CPPFLAGS} - CPPFLAGS="${CPPFLAGS} -I/sw/include" - AC_CHECK_HEADER([slang.h]) - if test x$ac_cv_header_slang_h = x; then - CPPFLAGS=${old_CPPFLAGS} - else - LDFLAGS="${LDFLAGS} -L/sw/lib" - fi -fi +AC_CHECK_HEADER([slang.h]) AC_CHECK_HEADERS([popt.h libintl.h]) AC_MSG_CHECKING([for python versions]) @@ -59,7 +39,7 @@ AC_MSG_RESULT([skipped]) PYTHONVERS= else - PYTHONVERS=$(ls /usr/include/python*/Python.h 2> /dev/null | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null) + PYTHONVERS=$(python --version 2>&1|awk '{print $2}'|cut -d. -f-2) AC_MSG_RESULT([$PYTHONVERS]) fi AC_SUBST([PYTHONVERS]) @@ -73,16 +53,6 @@ # check in a few common install locations if test x"${ac_cv_c_tclconfig}" = x ; then for i in `ls -d ${libdir} 2>/dev/null` \ - `ls -d /usr/lib 2>/dev/null` \ - `ls -d /usr/lib64 2>/dev/null` \ - `ls -d /usr/local/lib 2>/dev/null` \ - `ls -d /usr/contrib/lib 2>/dev/null` \ - `ls -d /usr/pkg/lib 2>/dev/null` \ - `ls -d /usr/local/lib/tcl8.5 2>/dev/null` \ - `ls -d /usr/local/lib/tcl8.4 2>/dev/null` \ - `ls -d /usr/lib/tcl8.5 2>/dev/null` \ - `ls -d /usr/lib/tcl8.4 2>/dev/null` \ - `ls -d /opt/local/lib 2>/dev/null` \ ; do if test -f "$i/tclConfig.sh" ; then ac_cv_c_tclconfig=`(cd $i; pwd)`