RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: popt Date: 25-Feb-2012 23:18:49
Branch: HEAD Handle: 2012022522184800
Modified files:
popt CHANGES autogen.sh
Log:
- autofu: fix: MacPorts uses glibtool/gliboolize. test earlier.
Summary:
Revision Changes Path
1.176 +1 -0 popt/CHANGES
1.25 +12 -11 popt/autogen.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: popt/CHANGES
============================================================================
$ cvs diff -u -r1.175 -r1.176 CHANGES
--- popt/CHANGES 19 Feb 2012 17:10:14 -0000 1.175
+++ popt/CHANGES 25 Feb 2012 22:18:48 -0000 1.176
@@ -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
@@ .
patch -p0 <<'@@ .'
Index: popt/autogen.sh
============================================================================
$ cvs diff -u -r1.24 -r1.25 autogen.sh
--- popt/autogen.sh 10 Feb 2012 13:49:29 -0000 1.24
+++ popt/autogen.sh 25 Feb 2012 22:18:48 -0000 1.25
@@ -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 <devzero2...@rpm5.org>
@@ -157,19 +157,10 @@
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 @@
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
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
