Mercurial > hg > octave-lyh
comparison aclocal.m4 @ 4102:cbac6756967e
[project @ 2002-10-14 20:16:44 by jwe]
author | jwe |
---|---|
date | Mon, 14 Oct 2002 20:16:45 +0000 |
parents | 8496ae60db8a |
children | 92f4552ea359 |
comparison
equal
deleted
inserted
replaced
4101:ea537559ab07 | 4102:cbac6756967e |
---|---|
599 else | 599 else |
600 echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD | 600 echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD |
601 cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD | 601 cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD |
602 fi | 602 fi |
603 AC_LANG_POP(C++) | 603 AC_LANG_POP(C++) |
604 ### XXX FIXME XXX -- Ignore test result for cygwin. Yes it prepends | |
605 ### underscore, but dlsym dnl seems to add it automatically. The | |
606 ### correct test is to build the shared library then try to grab the | |
607 ### symbol from it with and without underscore. | |
608 case "$canonical_host_type" in | |
609 *-*-cygwin*) | |
610 octave_cv_cxx_prepends_underscore=no | |
611 ;; | |
612 esac | |
604 ]) | 613 ]) |
605 AC_MSG_RESULT($octave_cv_cxx_prepends_underscore) | 614 AC_MSG_RESULT($octave_cv_cxx_prepends_underscore) |
606 if test $octave_cv_cxx_prepends_underscore = yes; then | 615 if test $octave_cv_cxx_prepends_underscore = yes; then |
607 AC_DEFINE(CXX_PREPENDS_UNDERSCORE, 1, [Define if your compiler prepends underscores to external names.]) | 616 AC_DEFINE(CXX_PREPENDS_UNDERSCORE, 1, [Define if your compiler prepends underscores to external names.]) |
608 fi | 617 fi |
650 dnl readline. | 659 dnl readline. |
651 dnl | 660 dnl |
652 dnl OCTAVE_ENABLE_READLINE | 661 dnl OCTAVE_ENABLE_READLINE |
653 AC_DEFUN(OCTAVE_ENABLE_READLINE, [ | 662 AC_DEFUN(OCTAVE_ENABLE_READLINE, [ |
654 USE_READLINE=true | 663 USE_READLINE=true |
664 LIBREADLINE= | |
655 AC_ARG_ENABLE(readline, | 665 AC_ARG_ENABLE(readline, |
656 [ --enable-readline use readline library (default is yes)], | 666 [ --enable-readline use readline library (default is yes)], |
657 [if test "$enableval" = no; then | 667 [if test "$enableval" = no; then |
658 USE_READLINE=false | 668 USE_READLINE=false |
659 warn_readline="command editing and history features require GNU Readline" | 669 warn_readline="command editing and history features require GNU Readline" |
660 fi]) | 670 fi]) |
661 if $USE_READLINE; then | 671 if $USE_READLINE; then |
662 AC_CHECK_LIB(readline, rl_set_keyboard_input_timeout, [ | 672 AC_CHECK_LIB(readline, rl_set_keyboard_input_timeout, [ |
663 LIBS="-lreadline $LIBS" | 673 LIBREADLINE="-lreadline" |
674 LIBS="$LIBREADLINE $LIBS" | |
664 AC_DEFINE(USE_READLINE, 1, [Define to use the readline library.]) | 675 AC_DEFINE(USE_READLINE, 1, [Define to use the readline library.]) |
665 ], [ | 676 ], [ |
666 AC_MSG_WARN([I need GNU Readline 4.2 or later]) | 677 AC_MSG_WARN([I need GNU Readline 4.2 or later]) |
667 AC_MSG_ERROR([this is fatal unless you specify --disable-readline]) | 678 AC_MSG_ERROR([this is fatal unless you specify --disable-readline]) |
668 ]) | 679 ]) |
669 fi | 680 fi |
681 AC_SUBST(LIBREADLINE) | |
670 ]) | 682 ]) |
671 dnl | 683 dnl |
672 dnl Determine the C++ compiler ABI. It sets the macro CXX_ABI to the | 684 dnl Determine the C++ compiler ABI. It sets the macro CXX_ABI to the |
673 dnl name of the ABI, and is used to mangle the C linkage loadable | 685 dnl name of the ABI, and is used to mangle the C linkage loadable |
674 dnl functions to avoid ABI mismatch. GNU C++ currently uses gnu_v2 | 686 dnl functions to avoid ABI mismatch. GNU C++ currently uses gnu_v2 |