[gphoto-cvs] SF.net SVN: gphoto: [9005] branches/libgphoto2-2_2/gphoto2

[<hu...@us...>]

Revision: 9005
Author:   hun
Date:     2006-06-30 04:56:55 -0700 (Fri, 30 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gphoto/?rev=9005&view=rev

Log Message:
-----------
update autogen.sh to 0.4.8

Modified Paths:
--------------
    branches/libgphoto2-2_2/gphoto2/autogen.sh
    branches/libgphoto2-2_2/libgphoto2/autogen.sh
Modified: branches/libgphoto2-2_2/gphoto2/autogen.sh
===================================================================
--- branches/libgphoto2-2_2/gphoto2/autogen.sh	2006-06-30 11:48:43 UTC (rev 9004)
+++ branches/libgphoto2-2_2/gphoto2/autogen.sh	2006-06-30 11:56:55 UTC (rev 9005)
@@ -19,7 +19,7 @@
 recursive="false"
 dryrun="false"
 self="$(basename "$0")"
-autogen_version="0.4.6"
+autogen_version="0.4.8"
 
 
 ########################################################################
@@ -229,8 +229,9 @@
     "$debug" && echo " done."
 
     if "$debug"; then set | grep '^AG_'; fi
-    dryrun_param=""
-    if "$dryrun"; then dryrun_param="--dry-run"; fi
+    recurse_params=""
+    if "$dryrun"; then recurse_params="$recurse_params --dry-run"; fi
+    if "$debug";  then recurse_params="$recurse_params --verbose"; fi
 }
 
 
@@ -282,7 +283,7 @@
 		done
 		echo " done."
 		if test -n "${AG_SUBDIRS}"; then
-		    "$0" --clean ${dryrun_param} --recursive ${AG_SUBDIRS}
+		    "$0" --clean ${recurse_params} --recursive ${AG_SUBDIRS}
 		fi
 	    fi
 	)
@@ -318,7 +319,7 @@
 	(cd "${AG_LIBLTDL_DIR}" && execute_command rm -f aclocal.m4 config.guess config.sub configure install-sh ltmain.sh Makefile.in missing)
     fi
     if test -n "${AG_SUBDIRS}"; then
-	"$0" --init ${dryrun_param} --recursive ${AG_SUBDIRS}
+	"$0" --init ${recurse_params} --recursive ${AG_SUBDIRS}
 	status="$?"
 	if test "$status" -ne 0; then exit "$status"; fi
     fi
@@ -340,7 +341,7 @@
     status="$?"
     echo "$self:init: Left directory \`${dir}'"
     if "$recursive"; then 
-    	:
+	:
     elif test "$status" -ne "0"; then
 	exit "$status"
     fi
@@ -366,7 +367,7 @@
 		if test -n "`eval echo \$\{$variable+"set"\}`"; then
 			skip=:
 		else
-			if test -x "`which ${binary}${version}`"; then
+			if test -x "`which ${binary}${version} 2> /dev/null`"; then
 				export "$variable"="${binary}${version}"
 				oldversion="${version}"
 			else
@@ -461,21 +462,22 @@
 	errors=false
 	lf="
 "
-	while read tool minversion; do
+	while read tool minversion package; do
 		version="$("$tool" --version | sed 's/^.*(.*) *\(.*\)$/\1/g;1q')"
 		# compare version and minversion
 		first="$(echo "$version$lf$minversion" | sort -n | sed '1q')"
 		if test "x$minversion" != "x$first" && test "x$version" = "x$first"; then
-			echo "Version \`$version' of \`$tool' not sufficient. At least \`$minversion' required."
+			echo "Version \`$version' of \`$tool' from the \`$package' (dev/devel) package is not sufficient."
+			echo "At least \`$minversion' required."
 			errors=:
 		fi
 	done <<EOF
-${ACLOCAL-"aclocal"}	1.8
-${AUTOMAKE-"automake"}	1.8
-${AUTOCONF-"autoconf"}	2.59
-${AUTOHEADER-"autoheader"}	2.59
-${AUTOPOINT-"autopoint"}	0.14.1
-${LIBTOOLIZE-"libtoolize"}	1.4
+${ACLOCAL-"aclocal"}	1.8	automake
+${AUTOMAKE-"automake"}	1.8	automake
+${AUTOCONF-"autoconf"}	2.59	autoconf
+${AUTOHEADER-"autoheader"}	2.59	autoconf
+${AUTOPOINT-"autopoint"}	0.14.1	gettext
+${LIBTOOLIZE-"libtoolize"}	1.4	libtool
 EOF
 	if "$errors"; then
 		echo "Please update your toolset."

Modified: branches/libgphoto2-2_2/libgphoto2/autogen.sh
===================================================================
--- branches/libgphoto2-2_2/libgphoto2/autogen.sh	2006-06-30 11:48:43 UTC (rev 9004)
+++ branches/libgphoto2-2_2/libgphoto2/autogen.sh	2006-06-30 11:56:55 UTC (rev 9005)
@@ -19,7 +19,7 @@
 recursive="false"
 dryrun="false"
 self="$(basename "$0")"
-autogen_version="0.4.6"
+autogen_version="0.4.8"
 
 
 ########################################################################
@@ -229,8 +229,9 @@
     "$debug" && echo " done."
 
     if "$debug"; then set | grep '^AG_'; fi
-    dryrun_param=""
-    if "$dryrun"; then dryrun_param="--dry-run"; fi
+    recurse_params=""
+    if "$dryrun"; then recurse_params="$recurse_params --dry-run"; fi
+    if "$debug";  then recurse_params="$recurse_params --verbose"; fi
 }
 
 
@@ -282,7 +283,7 @@
 		done
 		echo " done."
 		if test -n "${AG_SUBDIRS}"; then
-		    "$0" --clean ${dryrun_param} --recursive ${AG_SUBDIRS}
+		    "$0" --clean ${recurse_params} --recursive ${AG_SUBDIRS}
 		fi
 	    fi
 	)
@@ -318,7 +319,7 @@
 	(cd "${AG_LIBLTDL_DIR}" && execute_command rm -f aclocal.m4 config.guess config.sub configure install-sh ltmain.sh Makefile.in missing)
     fi
     if test -n "${AG_SUBDIRS}"; then
-	"$0" --init ${dryrun_param} --recursive ${AG_SUBDIRS}
+	"$0" --init ${recurse_params} --recursive ${AG_SUBDIRS}
 	status="$?"
 	if test "$status" -ne 0; then exit "$status"; fi
     fi
@@ -340,7 +341,7 @@
     status="$?"
     echo "$self:init: Left directory \`${dir}'"
     if "$recursive"; then 
-    	:
+	:
     elif test "$status" -ne "0"; then
 	exit "$status"
     fi
@@ -366,7 +367,7 @@
 		if test -n "`eval echo \$\{$variable+"set"\}`"; then
 			skip=:
 		else
-			if test -x "`which ${binary}${version}`"; then
+			if test -x "`which ${binary}${version} 2> /dev/null`"; then
 				export "$variable"="${binary}${version}"
 				oldversion="${version}"
 			else
@@ -461,21 +462,22 @@
 	errors=false
 	lf="
 "
-	while read tool minversion; do
+	while read tool minversion package; do
 		version="$("$tool" --version | sed 's/^.*(.*) *\(.*\)$/\1/g;1q')"
 		# compare version and minversion
 		first="$(echo "$version$lf$minversion" | sort -n | sed '1q')"
 		if test "x$minversion" != "x$first" && test "x$version" = "x$first"; then
-			echo "Version \`$version' of \`$tool' not sufficient. At least \`$minversion' required."
+			echo "Version \`$version' of \`$tool' from the \`$package' (dev/devel) package is not sufficient."
+			echo "At least \`$minversion' required."
 			errors=:
 		fi
 	done <<EOF
-${ACLOCAL-"aclocal"}	1.8
-${AUTOMAKE-"automake"}	1.8
-${AUTOCONF-"autoconf"}	2.59
-${AUTOHEADER-"autoheader"}	2.59
-${AUTOPOINT-"autopoint"}	0.14.1
-${LIBTOOLIZE-"libtoolize"}	1.4
+${ACLOCAL-"aclocal"}	1.8	automake
+${AUTOMAKE-"automake"}	1.8	automake
+${AUTOCONF-"autoconf"}	2.59	autoconf
+${AUTOHEADER-"autoheader"}	2.59	autoconf
+${AUTOPOINT-"autopoint"}	0.14.1	gettext
+${LIBTOOLIZE-"libtoolize"}	1.4	libtool
 EOF
 	if "$errors"; then
 		echo "Please update your toolset."


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.