]> granicus.if.org Git - sudo/commitdiff
Pass extra args on to configure
authorTodd C. Miller <Todd.Miller@courtesan.com>
Tue, 27 Jul 2010 18:49:53 +0000 (14:49 -0400)
committerTodd C. Miller <Todd.Miller@courtesan.com>
Tue, 27 Jul 2010 18:49:53 +0000 (14:49 -0400)
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

diff --git a/mkpkg b/mkpkg
index 47f877dbfe4568d2784a3209abc7fa14aca98019..4af7155bc4d6ace2642ee40e6ec04e19b8a9b8e3 100755 (executable)
--- 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