|
Line
Link Here
|
| 0 |
-- configure.ac.old 2011-09-13 23:46:09.000000000 +0800 |
0 |
++ configure.ac 2011-09-13 23:46:51.000000000 +0800 |
|
Lines 30-56
Link Here
|
| 30 |
fi |
30 |
fi |
| 31 |
|
31 |
|
| 32 |
AC_CHECK_HEADERS([sys/select.h alloca.h]) |
32 |
AC_CHECK_HEADERS([sys/select.h alloca.h]) |
| 33 |
AC_CHECK_HEADER([slang.h], [], [ |
33 |
AC_CHECK_HEADER([slang.h]) |
| 34 |
old_CPPFLAGS=${CPPFLAGS} |
|
|
| 35 |
CPPFLAGS="${CPPFLAGS} -I/opt/local/include" |
| 36 |
unset ac_cv_header_slang_h |
| 37 |
AC_CHECK_HEADER([slang.h]) |
| 38 |
if test x$ac_cv_header_slang_h = x; then |
| 39 |
CPPFLAGS="${old_CPPFLAGS}" |
| 40 |
else |
| 41 |
LDFLAGS="${LDFLAGS} -L/opt/local/lib" |
| 42 |
fi |
| 43 |
]) |
| 44 |
if test x$ac_cv_header_slang_h = x; then |
| 45 |
old_CPPFLAGS=${CPPFLAGS} |
| 46 |
CPPFLAGS="${CPPFLAGS} -I/sw/include" |
| 47 |
AC_CHECK_HEADER([slang.h]) |
| 48 |
if test x$ac_cv_header_slang_h = x; then |
| 49 |
CPPFLAGS=${old_CPPFLAGS} |
| 50 |
else |
| 51 |
LDFLAGS="${LDFLAGS} -L/sw/lib" |
| 52 |
fi |
| 53 |
fi |
| 54 |
AC_CHECK_HEADERS([popt.h libintl.h]) |
34 |
AC_CHECK_HEADERS([popt.h libintl.h]) |
| 55 |
|
35 |
|
| 56 |
AC_MSG_CHECKING([for python versions]) |
36 |
AC_MSG_CHECKING([for python versions]) |
|
Lines 59-65
Link Here
|
| 59 |
AC_MSG_RESULT([skipped]) |
39 |
AC_MSG_RESULT([skipped]) |
| 60 |
PYTHONVERS= |
40 |
PYTHONVERS= |
| 61 |
else |
41 |
else |
| 62 |
PYTHONVERS=$(ls /usr/include/python*/Python.h 2> /dev/null | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null) |
42 |
PYTHONVERS=$(python --version 2>&1|awk '{print $2}'|cut -d. -f-2) |
| 63 |
AC_MSG_RESULT([$PYTHONVERS]) |
43 |
AC_MSG_RESULT([$PYTHONVERS]) |
| 64 |
fi |
44 |
fi |
| 65 |
AC_SUBST([PYTHONVERS]) |
45 |
AC_SUBST([PYTHONVERS]) |
|
Lines 73-88
Link Here
|
| 73 |
# check in a few common install locations |
53 |
# check in a few common install locations |
| 74 |
if test x"${ac_cv_c_tclconfig}" = x ; then |
54 |
if test x"${ac_cv_c_tclconfig}" = x ; then |
| 75 |
for i in `ls -d ${libdir} 2>/dev/null` \ |
55 |
for i in `ls -d ${libdir} 2>/dev/null` \ |
| 76 |
`ls -d /usr/lib 2>/dev/null` \ |
|
|
| 77 |
`ls -d /usr/lib64 2>/dev/null` \ |
| 78 |
`ls -d /usr/local/lib 2>/dev/null` \ |
| 79 |
`ls -d /usr/contrib/lib 2>/dev/null` \ |
| 80 |
`ls -d /usr/pkg/lib 2>/dev/null` \ |
| 81 |
`ls -d /usr/local/lib/tcl8.5 2>/dev/null` \ |
| 82 |
`ls -d /usr/local/lib/tcl8.4 2>/dev/null` \ |
| 83 |
`ls -d /usr/lib/tcl8.5 2>/dev/null` \ |
| 84 |
`ls -d /usr/lib/tcl8.4 2>/dev/null` \ |
| 85 |
`ls -d /opt/local/lib 2>/dev/null` \ |
| 86 |
; do |
56 |
; do |
| 87 |
if test -f "$i/tclConfig.sh" ; then |
57 |
if test -f "$i/tclConfig.sh" ; then |
| 88 |
ac_cv_c_tclconfig=`(cd $i; pwd)` |
58 |
ac_cv_c_tclconfig=`(cd $i; pwd)` |
