diff options
Diffstat (limited to 'pkgtools/libnbcompat')
| -rwxr-xr-x | pkgtools/libnbcompat/files/configure | 118 | ||||
| -rw-r--r-- | pkgtools/libnbcompat/files/configure.ac | 18 |
2 files changed, 20 insertions, 116 deletions
diff --git a/pkgtools/libnbcompat/files/configure b/pkgtools/libnbcompat/files/configure index d66dd466254..07b6a411426 100755 --- a/pkgtools/libnbcompat/files/configure +++ b/pkgtools/libnbcompat/files/configure @@ -11675,121 +11675,21 @@ if test `eval 'as_val=${'$as_ac_var'} cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - -fi -done - - - -for ac_func in getmode setmode -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" + : else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + need_setmode=yes fi +done -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if test `eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - : -else +if test $need_setmode = yes; then case " $LIBOBJS " in *" setmode.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS setmode.$ac_objext" ;; esac - break - fi -done - { $as_echo "$as_me:$LINENO: checking whether endgrent is declared" >&5 $as_echo_n "checking whether endgrent is declared... " >&6; } @@ -11928,6 +11828,7 @@ fi +need_pwcache=no @@ -12033,18 +11934,19 @@ if test `eval 'as_val=${'$as_ac_var'} _ACEOF : else + need_pwcache=yes +fi +done + +if test $need_pwcache = yes; then case " $LIBOBJS " in *" pwcache.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS pwcache.$ac_objext" ;; esac - break - fi -done - { $as_echo "$as_me:$LINENO: checking for fts_open" >&5 $as_echo_n "checking for fts_open... " >&6; } diff --git a/pkgtools/libnbcompat/files/configure.ac b/pkgtools/libnbcompat/files/configure.ac index 88dfe4a2a5f..a445381c3f0 100644 --- a/pkgtools/libnbcompat/files/configure.ac +++ b/pkgtools/libnbcompat/files/configure.ac @@ -1,4 +1,4 @@ -dnl $NetBSD: configure.ac,v 1.64 2008/09/08 20:20:23 joerg Exp $ +dnl $NetBSD: configure.ac,v 1.65 2008/09/12 13:47:26 joerg Exp $ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) @@ -254,20 +254,22 @@ AC_CHECK_FUNCS([mkdtemp mkstemp], [:], [ ]) AC_CHECK_FUNCS([bcopy bzero memset memcpy setlocale]) -AC_CHECK_FUNCS([getmode setmode]) -AC_CHECK_FUNCS([getmode setmode], [:], [ +AC_CHECK_FUNCS([getmode setmode], [:], [need_setmode=yes]) + +if test $need_setmode = yes; then AC_LIBOBJ(setmode) - break -]) +fi AC_CHECK_DECLS([endgrent, endpwent]) +need_pwcache=no AC_CHECK_FUNCS([gid_from_group group_from_gid pwcache_groupdb \ pwcache_userdb uid_from_user user_from_uid \ -], [:], [ +], [:], [need_pwcache=yes]) + +if test $need_pwcache = yes; then AC_LIBOBJ(pwcache) - break -]) +fi AC_CHECK_FUNC(fts_open, [:], [ AC_DEFINE(HAVE_NBCOMPAT_FTS, 1) |