From 707246a34815917836929fab757e7385230baa7a Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Tue, 27 Jul 2010 14:49:53 -0400 Subject: [PATCH] Pass extra args on to configure on HP-UX, if we don't have the HP C compiler, disable zlib to prevent gcc from finding it in /usr/local/lib. --- mkpkg | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mkpkg b/mkpkg index 47f877dbf..4af7155bc 100755 --- a/mkpkg +++ b/mkpkg @@ -42,6 +42,10 @@ while test $# -gt 0; do PPFLAGS="${PPFLAGS}${PPFLAGS+ }--platform $2" shift ;; + *) + # Pass unknown options to configure + extra_opts="${extra_opts}${extra_opts+ }$1" + ;; esac shift done @@ -74,6 +78,8 @@ case "$platform" in if [ -z "$CFLAGS" ]; then CFLAGS=-O; export CFLAGS fi + else + extra_opts="--disable-zlib${extra_opts+ }${extra_opts}" fi ;; esac @@ -186,7 +192,7 @@ esac # Remove spaces from IFS when setting $@ so that passprompt may include them OIFS="$IFS" IFS=" $nl" -set -- $configure_opts +set -- $configure_opts $extra_opts IFS="$OIFS" $top_srcdir/configure "$@" || exit 1 make $make_opts && make $make_opts PPFLAGS="$PPFLAGS" PPVARS="$PPVARS" package -- 2.40.0