RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Pinto Elia
  Root:   /v/rpm/cvs                       Email:  devzero2000@rpm5.org
  Module: popt                             Date:   12-Aug-2010 18:56:37
  Branch: HEAD                             Handle: 2010081216563700

  Modified files:
    popt                    autogen.sh configure.ac

  Log:
    revert to libtool 1.x macros. Drop the libtool version control in
    autogen.sh

  Summary:
    Revision    Changes     Path
    1.21        +10 -71     popt/autogen.sh
    1.74        +1  -1      popt/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: popt/autogen.sh
  ============================================================================
  $ cvs diff -u -r1.20 -r1.21 autogen.sh
  --- popt/autogen.sh	10 Aug 2010 17:37:32 -0000	1.20
  +++ popt/autogen.sh	12 Aug 2010 16:56:37 -0000	1.21
  @@ -1,5 +1,5 @@
   #!/bin/sh
  -# $Id: autogen.sh,v 1.20 2010/08/10 17:37:32 devzero2000 Exp $
  +# $Id: autogen.sh,v 1.21 2010/08/12 16:56:37 devzero2000 Exp $
   # autogen.sh: autogen.sh script for popt projects
   #
   # Copyright (c) 2010-2011 Elia Pinto <devzero2000@rpm5.org>
  @@ -21,9 +21,6 @@
   
   # Version Used for building
   # 
  -# Check for needed features
  -libtool="`grep '^[ \t]*A._PROG_LIBTOOL' $conffile >/dev/null 2>&1 && echo yes || echo no`"
  -libtool2="`grep '^[ \t]*LT_INIT' $conffile >/dev/null 2>&1 && echo yes || echo no`"
   
   # Check for automake
   am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'`
  @@ -58,75 +55,17 @@
    exit 1
   fi
   # Libtool
  -if [ "$libtool" = "yes" -o "$libtool2" = "yes" ] 
  -then
  -	libtoolize=`which glibtoolize 2>/dev/null`
  -	case $libtoolize in
  +libtoolize=`which glibtoolize 2>/dev/null`
  +case $libtoolize in
   		/*) ;;
   		*)  libtoolize=`which libtoolize 2>/dev/null`
  -    		case $libtoolize in
  -    		/*) ;;
  -    		*)  libtoolize=libtoolize
  -    		esac
  -	esac
  -	if test -z "$libtoolize"; then
  - 		echo "$0: libtool not found."
  -	fi
  -fi
  -# Check for libtool 1.15.14 or newer if used
  -if test "$libtool" = "yes"; then
  -	lt_pversion=`${LIBTOOL:-libtool} --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
  -	if test -z "$lt_pversion"; then
  - 	echo "$0: libtool not found."
  - 	echo "You need libtool version 1.5.14 or newer installed"
  -	exit 1
  -	fi
  -	lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
  -	IFS=.; set $lt_version; IFS=' '
  -	lt_status="good"
  -	if test -z "$1"; then a=0 ; else a=$1;fi
  -	if test -z "$2"; then b=0 ; else b=$2;fi
  -	if test -z "$3"; then c=0 ; else c=$3;fi
  -
  -	if test "$a" -lt "2"; then
  -   		if test "$b" -lt "5" -o "$b" =  "5" -a "$c" -lt "14" ; then
  -      		lt_status="bad"
  -   		fi
  -	else
  -    		lt_status="bad"
  -	fi
  -	if test $lt_status != "good"; then
  -		echo "$0: libtool version $lt_pversion found."
  -		echo "You need libtool version 1.5.14 or newer installed"
  -		exit 1
  -	fi
  -fi
  -# Check for libtool 2.2.6 or newer
  -if test "$libtool2" = "yes"; then
  -	lt_pversion=`${LIBTOOL:-libtool} --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
  -	if test -z "$lt_pversion"; then
  - 	echo "$0: libtool not found."
  - 	echo "You need libtool version 2.2.6 or newer installed"
  -	exit 1
  -	fi
  -	lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
  -	IFS=.; set $lt_version; IFS=' '
  -	lt_status="good"
  -	if test -z "$1"; then a=0 ; else a=$1;fi
  -	if test -z "$2"; then b=0 ; else b=$2;fi
  -	if test -z "$3"; then c=0 ; else c=$3;fi
  -	if test "$a" -le "2"; then
  -   		if test "$b" -lt "2" -o "$b" =  "2" -a "$c" -lt "6" ; then
  -      		lt_status="bad"
  -   		fi
  -	else
  -    		lt_status="bad"
  -	fi
  -	if test $lt_status != "good"; then
  -		echo "$0: libtool version $lt_pversion found."
  -		echo "You need libtool version 2.2.6 or newer installed"
  -		exit 1
  -	fi
  +	case $libtoolize in
  +    	/*) ;;
  +    	*)  libtoolize=libtoolize
  +    	esac
  +esac
  +if test -z "$libtoolize"; then
  +		echo "$0: libtool not found."
   fi
   find . -name "autom4te.cache" | xargs rm -rf 
   [ ! -d m4 ]        && mkdir m4
  @@ .
  patch -p0 <<'@@ .'
  Index: popt/configure.ac
  ============================================================================
  $ cvs diff -u -r1.73 -r1.74 configure.ac
  --- popt/configure.ac	12 Aug 2010 12:06:53 -0000	1.73
  +++ popt/configure.ac	12 Aug 2010 16:56:37 -0000	1.74
  @@ -37,7 +37,7 @@
   AC_SYS_LARGEFILE
   AC_PROG_MAKE_SET
   AC_PROG_INSTALL
  -LT_INIT
  +AC_PROG_LIBTOOL
   
   # Turn gcc warning
   
  @@ .