Mercurial > hg > octave-nkf
changeset 2063:219cf611ff70
[project @ 1996-04-07 22:15:23 by jwe]
author | jwe |
---|---|
date | Sun, 07 Apr 1996 22:20:40 +0000 |
parents | 055ffed429b8 |
children | 424b95481a85 |
files | configure.in |
diffstat | 1 files changed, 28 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in +++ b/configure.in @@ -20,7 +20,7 @@ ### along with Octave; see the file COPYING. If not, write to the Free ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -AC_REVISION($Revision: 1.186 $) +AC_REVISION($Revision: 1.190 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -219,7 +219,7 @@ case "$gxx_version" in 2.6.*) case "$canonical_host_type" in - rs6000-ibm-aix*) + rs6000-ibm-aix* | powerpc-ibm-aix*) HOST_CXXFLAGS="-Wa,-u" AC_MSG_RESULT([defining HOST_CXXFLAGS to be $HOST_CXXFLAGS]) ;; @@ -678,20 +678,31 @@ OCTAVE_SMART_PUTENV OCTAVE_PROGRAM_INVOCATION_NAME +DLFCN_LIB= +DLFCN_INCLUDE= if test "$WITH_DL" = yes || test "$WITH_DL" = maybe; then - AC_CHECK_LIB(dl, dlopen) - AC_CHECK_FUNCS(dlopen dlsym dlerror dlclose) - if test "$ac_cv_func_dlopen" = yes \ - && test "$ac_cv_func_dlsym" = yes \ - && test "$ac_cv_func_dlerror" = yes \ - && test "$ac_cv_func_dlclose" = yes; then - WITH_DL=true - else - if test "$WITH_DL" = yes; then - AC_MSG_ERROR([--enable-dl specified, but functions are missing!]) - fi - WITH_DL=false - fi + case "$canonical_host_type" in + rs6000-ibm-aix* | powerpc-ibm-aix*) + DLFCN_LIB='$TOPDIR/dlfcn/dlfcn.a' + DLFCN_INCLUDE='-L$top_srcdir/dlfcn -L$TOPDIR/dlfcn' + WITH_DL=true + ;; + *) + AC_CHECK_LIB(dl, dlopen) + AC_CHECK_FUNCS(dlopen dlsym dlerror dlclose) + if test "$ac_cv_func_dlopen" = yes \ + && test "$ac_cv_func_dlsym" = yes \ + && test "$ac_cv_func_dlerror" = yes \ + && test "$ac_cv_func_dlclose" = yes; then + WITH_DL=true + else + if test "$WITH_DL" = yes; then + AC_MSG_ERROR([--enable-dl specified, but functions are missing!]) + fi + WITH_DL=false + fi + ;; + esac if $WITH_DL; then AC_DEFINE(WITH_DL, 1) fi @@ -699,6 +710,8 @@ WITH_DL=false fi AC_SUBST(WITH_DL) +AC_SUBST(DLFCN_LIB) +AC_SUBST(DLFCN_INCLUDE) if test "$WITH_SHL" = yes || test "$WITH_SHL" = maybe; then AC_CHECK_LIB(dld, shl_load)