Mercurial > octave-nkf
changeset 4189:047d21dd1890
[project @ 2002-11-19 21:08:57 by jwe]
| author | jwe |
|---|---|
| date | Tue, 19 Nov 2002 21:08:57 +0000 |
| parents | cfe753a0ed6f |
| children | bc0edad7dda7 |
| files | ChangeLog configure.in kpathsea/klibtool.config src/ChangeLog src/oct-obj.h |
| diffstat | 5 files changed, 31 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Nov 19 20:17:44 2002 +0000 +++ b/ChangeLog Tue Nov 19 21:08:57 2002 +0000 @@ -1,3 +1,8 @@ +2002-11-19 John W. Eaton <jwe@bevo.che.wisc.edu> + + * configure.in: Check for dlopen last, to avoid broken + compatibility libraries. + 2002-11-15 John W. Eaton <jwe@bevo.che.wisc.edu> * configure.in (USE_EXCEPTIONS_FOR_INTERRUPTS): No need to define.
--- a/configure.in Tue Nov 19 20:17:44 2002 +0000 +++ b/configure.in Tue Nov 19 21:08:57 2002 +0000 @@ -22,7 +22,7 @@ ### 02111-1307, USA. AC_INIT -AC_REVISION($Revision: 1.390 $) +AC_REVISION($Revision: 1.391 $) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -926,23 +926,25 @@ if test $ac_cv_header_Mach_O_dyld_h = yes; then dyld_api=true else - AC_CHECK_LIB(dl, dlopen) - AC_CHECK_FUNCS(dlopen dlsym dlerror dlclose) - if test $ac_cv_func_dlclose = yes && test $ac_cv_func_dlerror = yes \ - && test $ac_cv_func_dlopen = yes && test $ac_cv_func_dlsym = yes; then - dlopen_api=true + AC_CHECK_LIB(dld, shl_load) + AC_CHECK_FUNCS(shl_load shl_findsym) + if test $ac_cv_func_shl_load = yes \ + && test $ac_cv_func_shl_findsym = yes; then + shl_load_api=true else - AC_CHECK_LIB(dld, shl_load) - AC_CHECK_FUNCS(shl_load shl_findsym) - if test $ac_cv_func_shl_load = yes \ - && test $ac_cv_func_shl_findsym = yes; then - shl_load_api=true + AC_CHECK_LIB(wsock32, LoadLibrary) + AC_CHECK_FUNCS(LoadLibrary) + if test $ac_cv_func_loadlibrary = yes; then + loadlibrary_api=true else - AC_CHECK_LIB(wsock32, LoadLibrary) - AC_CHECK_FUNCS(LoadLibrary) - if test $ac_cv_func_loadlibrary = yes; then - loadlibrary_api=true - else + AC_CHECK_LIB(dl, dlopen) + AC_CHECK_FUNCS(dlopen dlsym dlerror dlclose) + if test $ac_cv_func_dlclose = yes \ + && test $ac_cv_func_dlerror = yes \ + && test $ac_cv_func_dlopen = yes \ + && test $ac_cv_func_dlsym = yes; then + dlopen_api=true + else case "$canonical_host_type" in rs6000-ibm-aix* | powerpc-ibm-aix*) LIBDLFCN="-ldlfcn -ll -lld"
--- a/kpathsea/klibtool.config Tue Nov 19 20:17:44 2002 +0000 +++ b/kpathsea/klibtool.config Tue Nov 19 21:08:57 2002 +0000 @@ -1,5 +1,5 @@ LIBTOOL_OBJTYPES='STATIC:' -shared_support='true' +shared_support='' shared_ext='so' libpath_var='LD_LIBRARY_PATH' CC='gcc' @@ -9,4 +9,4 @@ STATIC_ranlib='ranlib' args_SHARED_archive='-shared' args_SHARED_link='' -SHARED_postinstall='ldconfig $libdir' +SHARED_postinstall=''
--- a/src/ChangeLog Tue Nov 19 20:17:44 2002 +0000 +++ b/src/ChangeLog Tue Nov 19 21:08:57 2002 +0000 @@ -1,3 +1,7 @@ +2002-11-19 test octave <oktave@mammut.ae.op.dlr.de> + + * oct-obj.h (octave_value_list::~octave_value_list): New function. + 2002-11-19 John W. Eaton <jwe@bevo.che.wisc.edu> * DLD-FUNCTIONS/odessa.cc (odessa_user_j): Put T in args(1), not
--- a/src/oct-obj.h Tue Nov 19 20:17:44 2002 +0000 +++ b/src/oct-obj.h Tue Nov 19 21:08:57 2002 +0000 @@ -97,6 +97,8 @@ octave_value_list (const octave_value_list& obj) : data (obj.data), names (obj.names) { } + ~octave_value_list (void) { } + void *operator new (size_t size) { return allocator.alloc (size); }