Merge branch 'tmp-macosx-fix' into 'master'

bootstrap.conf: do not override GNULIB_SRCDIR

See merge request gnutls/gnutls!925

1 files changed, 12 insertions, 10 deletions

diff --git a/bootstrap.conf b/bootstrap.conf
index 7d10d5c792..2b04d686ec 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -24,7 +24,6 @@ use_libtool=1
 checkout_only_file=
 local_gl_dir=gl/override/
 required_submodules="tests/suite/tls-fuzzer/python-ecdsa tests/suite/tls-fuzzer/tlsfuzzer tests/suite/tls-fuzzer/tlslite-ng"
-GNULIB_SRCDIR="${GNULIB_SRCDIR:-./gnulib/}"
 
 # Reproduce by: gnulib-tool --import --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --avoid=alignof-tests --avoid=lock-tests --avoid=lseek-tests --lgpl=2 --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files alloca byteswap c-ctype extensions func gendocs getline gettext-h gettimeofday hash-pjw-bare havelib intprops lib-msvc-compat lib-symbol-versions maintainer-makefile manywarnings memmem-simple minmax netdb netinet_in pmccabe2html read-file secure_getenv snprintf stdint strcase strndup strtok_r strverscmp sys_socket sys_stat time_r unistd vasprintf vsnprintf warnings
 
@@ -74,15 +73,18 @@ for mod in $required_submodules;do
 	git submodule update --init $git_options $mod
 done
 
-
-deps=$(${GNULIB_SRCDIR}/gnulib-tool --extract-recursive-dependencies ${gnulib_modules})
-deps="echo -n ${deps} ${gnulib_modules}|sort -u"
-case ${deps} in
-  *select*|*poll*|*sockets*|*recv*|*send*)
-	echo "******************************************************************"
-	die "the library cannot include the gnulib sockets; see CONTRIBUTION.md"
-    ;;
-esac
+if test -d ./gnulib;then
+	TMP_GNULIB_SRCDIR="${GNULIB_SRCDIR:-./gnulib/}"
+
+	deps=$(${TMP_GNULIB_SRCDIR}/gnulib-tool --extract-recursive-dependencies ${gnulib_modules})
+	deps="echo -n ${deps} ${gnulib_modules}|sort -u"
+	case ${deps} in
+	  *select*|*poll*|*sockets*|*recv*|*send*)
+		echo "******************************************************************"
+		die "the library cannot include the gnulib sockets; see CONTRIBUTION.md"
+	    ;;
+	esac
+fi
 
 bootstrap_post_import_hook ()
 {