diff options
| author | jbj <jbj> | 2012-02-25 22:18:48 +0000 |
|---|---|---|
| committer | jbj <jbj> | 2012-02-25 22:18:48 +0000 |
| commit | 168eff2f3277fbad0b0c190792b8eb08dcfcabda (patch) | |
| tree | 1029d7d3ed7e0a3c3be647ee2d38a016e138ea8a | |
| parent | c89e03490326c5094244fa836bf4feab0a24e935 (diff) | |
| download | libpopt-168eff2f3277fbad0b0c190792b8eb08dcfcabda.tar.gz | |
- autofu: fix: MacPorts uses glibtool/gliboolize. test earlier.
| -rw-r--r-- | CHANGES | 1 | ||||
| -rwxr-xr-x | autogen.sh | 23 |
2 files changed, 13 insertions, 11 deletions
@@ -1,4 +1,5 @@ 1.17 -> 2.0: + - jbj: autofu: fix: MacPorts uses glibtool/gliboolize. test earlier. - jbj: i18n: msgmerge (Translation Project). - devzero2000: Enable many more gcc warnings for popt Inspired by http://www.spinics.net/lists/selinux/msg11726.html @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: autogen.sh,v 1.24 2012/02/10 13:49:29 devzero2000 Exp $ +# $Id: autogen.sh,v 1.25 2012/02/25 22:18:48 jbj Exp $ # autogen.sh: autogen.sh script for popt projects # # Copyright (c) 2010-2011 Elia Pinto <devzero2000@rpm5.org> @@ -157,19 +157,10 @@ else echo fi -if ! printf "$buildreq" | check_versions; then - test -f README-prereq && - echo - echo "See README-prereq for notes on obtaining these prerequisite programs:" >&2 - echo - print_versions - exit 1 -fi - # Libtool libtoolize=`which glibtoolize 2>/dev/null` case $libtoolize in - /*) ;; + /*) export LIBTOOL=glibtool;; *) libtoolize=`which libtoolize 2>/dev/null` case $libtoolize in /*) ;; @@ -180,6 +171,16 @@ if test -z "$libtoolize"; then Die "libtool not found." echo fi + +if ! printf "$buildreq" | check_versions; then + test -f README-prereq && + echo + echo "See README-prereq for notes on obtaining these prerequisite programs:" >&2 + echo + print_versions + exit 1 +fi + find . -name "autom4te.cache" | xargs rm -rf [ ! -d m4 ] && mkdir m4 [ ! -d build-aux ] && mkdir build-aux |