diff --git a/ChangeLog b/ChangeLog index 2424b629b786df00f26bd270891935e9e361f0d2..ee697718a676921dce894ff866f0790202bd0a75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ CVS code - - General - Changed _POSIX_VERSION checks in regex code to HAVE_REGEX_H, added check for regex.h in configure.in. +- configure.in: + - Added default case for cross-compiling to get rid of annoying + AC_TRY_RUN warning. - cut.c: do_cut_text() - Don't immediately abort if we're on filebot and the marker is diff --git a/configure b/configure index 6f1c51855c17515a67335032d1c2d7fa2b40aeff..3a80e130e7ab28fee2accb618bd69c395d1ebf40 100755 --- a/configure +++ b/configure @@ -1330,7 +1330,7 @@ echo "configure:1330: checking for SLtt_initialize in -lslang" >&5 _libs=$LIBS LIBS="$LIBS -lslang" if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + echo "configure: warning: *** Can not use slang when cross-compiling" 1>&2 else cat > conftest.$ac_ext <<EOF #line 1337 "configure" @@ -1409,7 +1409,7 @@ fi echo "configure:1410: checking for SLtt_initialize in -lslang $tcap" >&5 LIBS="$LIBS $tcap" if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + echo "configure: warning: *** Can not use slang when cross-compiling" 1>&2 else cat > conftest.$ac_ext <<EOF #line 1416 "configure" @@ -1444,7 +1444,7 @@ else echo "configure:1445: checking for SLtt_initialize in -lslang $tcap -lm" >&5 LIBS="$LIBS -lm" if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + echo "configure: warning: *** Can not use slang when cross-compiling" 1>&2 else cat > conftest.$ac_ext <<EOF #line 1451 "configure" diff --git a/configure.in b/configure.in index 183707d52e6e8dfe527f87acd9ab680e1dce7373..5cc3b2338caf702efca52a41954b6cbafef227f9 100644 --- a/configure.in +++ b/configure.in @@ -94,7 +94,10 @@ int main () { SLtt_initialize (NULL); return 0; }], CURSES_LIB="-lslang $tcap -lm" fi CURSES_LIB_NAME=slang], - [AC_MSG_RESULT(no)])])]), + [AC_MSG_RESULT(no)], +AC_MSG_WARN([*** Can not use slang when cross-compiling]))], +AC_MSG_WARN([*** Can not use slang when cross-compiling]))], +AC_MSG_WARN([*** Can not use slang when cross-compiling])), AC_MSG_ERROR([ *** The header file slcurses.h was not found. If you wish to use *** slang support this header file is required. Please either