mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-03 09:48:00 -04:00
120 lines
3.9 KiB
Plaintext
120 lines
3.9 KiB
Plaintext
--- configure.orig Tue Mar 25 10:29:28 2014
|
|
+++ configure Fri Apr 18 15:44:26 2014
|
|
@@ -3641,6 +3641,7 @@ $as_echo "$as_me: $xc_bad_var_msg libraries. Use LIBS
|
|
;;
|
|
esac
|
|
done
|
|
+ xc_bad_var_cflags=no
|
|
if test $xc_bad_var_cflags = yes; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5
|
|
$as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;}
|
|
@@ -8381,7 +8382,7 @@ else
|
|
lt_cv_sys_max_cmd_len=8192;
|
|
;;
|
|
|
|
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
|
|
+ minix* | netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
|
|
# This has been around since 386BSD, at least. Likely further.
|
|
if test -x /sbin/sysctl; then
|
|
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
|
|
@@ -8872,7 +8873,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
|
lt_cv_deplibs_check_method=pass_all
|
|
;;
|
|
|
|
-netbsd* | netbsdelf*-gnu)
|
|
+minix* | netbsd* | netbsdelf*-gnu)
|
|
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
|
|
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
|
|
else
|
|
@@ -12641,7 +12642,7 @@ _LT_EOF
|
|
fi
|
|
;;
|
|
|
|
- netbsd* | netbsdelf*-gnu)
|
|
+ minix* | netbsd* | netbsdelf*-gnu)
|
|
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
|
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
|
|
wlarc=
|
|
@@ -13270,7 +13271,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
|
|
link_all_deplibs=yes
|
|
;;
|
|
|
|
- netbsd* | netbsdelf*-gnu)
|
|
+ minix* | netbsd* | netbsdelf*-gnu)
|
|
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
|
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
|
|
else
|
|
@@ -14286,6 +14287,18 @@ fi
|
|
dynamic_linker='GNU/Linux ld.so'
|
|
;;
|
|
|
|
+minix*)
|
|
+ version_type=linux
|
|
+ need_lib_prefix=no
|
|
+ need_version=no
|
|
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
+ shlibpath_var=LD_LIBRARY_PATH
|
|
+ shlibpath_overrides_runpath=no
|
|
+ hardcode_into_libs=yes
|
|
+ dynamic_linker='Minix ld.elf_so'
|
|
+ ;;
|
|
+
|
|
netbsdelf*-gnu)
|
|
version_type=linux
|
|
need_lib_prefix=no
|
|
@@ -16620,7 +16633,7 @@ squeeze() {
|
|
|
|
|
|
#
|
|
- if test "$compiler_id" != "unknown"; then
|
|
+ if false; then
|
|
#
|
|
if test "$compiler_id" = "GNU_C" ||
|
|
test "$compiler_id" = "CLANG"; then
|
|
@@ -21079,7 +21092,12 @@ $as_echo "yes" >&6; }
|
|
|
|
if test -z "$GSSAPI_INCS"; then
|
|
if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
|
|
- GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
|
|
+ if $GSSAPI_ROOT/bin/krb5-config --cflags gssapi 2>&1 | \
|
|
+ grep "Unknown option" > /dev/null ; then
|
|
+ GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags`
|
|
+ else
|
|
+ GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
|
|
+ fi
|
|
elif test "$GSSAPI_ROOT" != "yes"; then
|
|
GSSAPI_INCS="-I$GSSAPI_ROOT/include"
|
|
fi
|
|
@@ -21227,13 +21245,18 @@ $as_echo "#define HAVE_GSSAPI 1" >>confdefs.h
|
|
;;
|
|
*)
|
|
if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
|
|
- gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
|
|
+ if $GSSAPI_ROOT/bin/krb5-config --libs gssapi 2>&1 | \
|
|
+ grep "Unknown option" > /dev/null ; then
|
|
+ gss_libs="`$GSSAPI_ROOT/bin/krb5-config --libs` -lgss"
|
|
+ else
|
|
+ gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
|
|
+ fi
|
|
LIBS="$gss_libs $LIBS"
|
|
elif test "$GSSAPI_ROOT" != "yes"; then
|
|
LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
|
|
- LIBS="-lgssapi $LIBS"
|
|
+ LIBS="-lgssapi -lkrb5 $LIBS"
|
|
else
|
|
- LIBS="-lgssapi $LIBS"
|
|
+ LIBS="-lgssapi -lkrb5 $LIBS"
|
|
fi
|
|
;;
|
|
esac
|
|
@@ -21244,7 +21267,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confdefs.h
|
|
LIBS="-lgss $LIBS"
|
|
;;
|
|
*)
|
|
- LIBS="-lgssapi $LIBS"
|
|
+ LIBS="-lgssapi -lkrb5 $LIBS"
|
|
;;
|
|
esac
|
|
fi
|