head 1.1; access; symbols; locks; strict; comment @# @; 1.1 date 2026.09.26.07.45.28; author ryoon; state Exp; branches; next ; commitid ot7JSlsjQxXLu6XG; desc @@ 1.1 log @www/firefox52: Fix build with recent devel/nss @ text @$NetBSD$ * Remove broken NSS version check. pkgsrc/devel/nss is new enough. --- build/autoconf/nss.m4.orig 2017-04-11 02:13:08.000000000 +0000 +++ build/autoconf/nss.m4 @@@@ -34,56 +34,10 @@@@ AC_ARG_WITH(nss-exec-prefix, unset ac_cv_path_NSS_CONFIG AC_PATH_PROG(NSS_CONFIG, nss-config, no) - min_nss_version=ifelse([$1], ,3.0.0,$1) AC_MSG_CHECKING(for NSS - version >= $min_nss_version) - no_nss="" - if test "$NSS_CONFIG" = "no"; then - no_nss="yes" - else - NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags` - NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs` - - nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\1/'` - nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\2/'` - nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\4/'` - if test -z "$nss_config_micro_version"; then - nss_config_micro_version="0" - fi - - min_nss_major_version=`echo $min_nss_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\1/'` - min_nss_minor_version=`echo $min_nss_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\2/'` - min_nss_micro_version=`echo $min_nss_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\4/'` - if test -z "$min_nss_micro_version"; then - min_nss_micro_version="0" - fi - - if test "$nss_config_major_version" -lt "$min_nss_major_version"; then - no_nss="yes" - elif test "$nss_config_major_version" -eq "$min_nss_major_version" && - test "$nss_config_minor_version" -lt "$min_nss_minor_version"; then - no_nss="yes" - elif test "$nss_config_major_version" -eq "$min_nss_major_version" && - test "$nss_config_minor_version" -eq "$min_nss_minor_version" && - test "$nss_config_micro_version" -lt "$min_nss_micro_version"; then - no_nss="yes" - fi - fi - - if test -z "$no_nss"; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - ifelse([$3], , :, [$3]) - fi - + NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags` + NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs` AC_SUBST_LIST(NSS_CFLAGS) AC_SUBST_LIST(NSS_LIBS) @