diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2001-06-26 06:01:47 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2001-06-26 06:01:47 +0000 |
| commit | 563fbed02c1fc4bdf43f261548a2c3f47a426ed2 (patch) | |
| tree | d07b3c171b0f1ec71ddcb8db027d752edc60feca /zshconfig.ac | |
| parent | cbf446701561ca5c14a7ca23ae51ac59b984a1ea (diff) | |
| download | zsh-563fbed02c1fc4bdf43f261548a2c3f47a426ed2.tar.gz zsh-563fbed02c1fc4bdf43f261548a2c3f47a426ed2.tar.xz zsh-563fbed02c1fc4bdf43f261548a2c3f47a426ed2.zip | |
More merges: 14973,14976, and some whitespace.
Diffstat (limited to 'zshconfig.ac')
| -rw-r--r-- | zshconfig.ac | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/zshconfig.ac b/zshconfig.ac index 0f6250cd8..09ab2be69 100644 --- a/zshconfig.ac +++ b/zshconfig.ac @@ -1485,6 +1485,12 @@ fi dnl --------------- +dnl check for the type of third argument of accept +dnl --------------- + +zsh_CHECK_SOCKLEN_T + +dnl --------------- dnl dynamic loading dnl --------------- L=N @@ -1496,29 +1502,30 @@ MOD_IMPORT_VARIABLE= MOD_IMPORT_FUNCTION= aixdynamic=no hpuxdynamic=no -if test "$ac_cv_func_dlopen" != yes || - test "$ac_cv_func_dlsym" != yes || - test "$ac_cv_func_dlerror" != yes; then - if test "$ac_cv_func_load" != yes || - test "$ac_cv_func_unload" != yes || - test "$ac_cv_func_loadbind" != yes || - test "$ac_cv_func_loadquery" != yes; then - if test "$ac_cv_func_shl_load" != yes || - test "$ac_cv_func_shl_unload" != yes || - test "$ac_cv_func_shl_findsym" != yes; then - dynamic=no - elif test "x$dynamic" = xyes; then - hpuxdynamic=yes - DL_EXT="${DL_EXT=sl}" - dnl autoheader won't allow us to define anything which isn't - dnl going into a header, and we can't undefine anything, so - dnl just define this anyway and rely on the later tests to - dnl define DYNAMIC or not. - AC_DEFINE(HPUXDYNAMIC)dnl - fi - elif test "x$dynamic" = xyes; then +if test "$ac_cv_func_load" = yes && + test "$ac_cv_func_unload" = yes && + test "$ac_cv_func_loadbind" = yes && + test "$ac_cv_func_loadquery" = yes; then + dnl Force AIXDYNAMIC even on newer versions that have dl family + if test "x$dynamic" = xyes; then aixdynamic=yes fi +elif test "$ac_cv_func_dlopen" != yes || + test "$ac_cv_func_dlsym" != yes || + test "$ac_cv_func_dlerror" != yes; then + if test "$ac_cv_func_shl_load" != yes || + test "$ac_cv_func_shl_unload" != yes || + test "$ac_cv_func_shl_findsym" != yes; then + dynamic=no + elif test "x$dynamic" = xyes; then + hpuxdynamic=yes + DL_EXT="${DL_EXT=sl}" + dnl autoheader won't allow us to define anything which isn't + dnl going into a header, and we can't undefine anything, so + dnl just define this anyway and rely on the later tests to + dnl define DYNAMIC or not. + AC_DEFINE(HPUXDYNAMIC)dnl + fi fi test -n "$GCC" && LDARG=-Wl, |