darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

autogen.sh 0.4.6 fixes two bugs:

Browse Source 
1. Use --copy with libtoolize so that auto* can generate its files
     for libltdl.
  2. Determine the tool location to use before querying its version number.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8330 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Hans Ulrich Niedermann
2005-12-25 15:54:08 +00:00
parent 8c095af817
commit b91b0158d2
1 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
autogen.sh
View File

@@ -19,7 +19,7 @@ debug="false"
recursive="false"
dryrun="false"
self="$(basename "$0")"
autogen_version="0.4.5"
autogen_version="0.4.6"
########################################################################
@@ -305,7 +305,7 @@ if cd "${dir}"; then
if test "x$AG_LIBLTDL_DIR" != "x"; then
# We have to run libtoolize --ltdl ourselves because
# - autoreconf doesn't run it at all
execute_command "${LIBTOOLIZE-"libtoolize"}" --ltdl
execute_command "${LIBTOOLIZE-"libtoolize"}" --ltdl --copy
# And we have to clean up the generated files after libtoolize because
# - we still want symlinks for the files
# - but we want to (implicitly) AC_CONFIG_SUBDIR and that writes to
@@ -347,6 +347,53 @@ fi
}
########################################################################
# If not explicitly given, try to find most convenient tools in $PATH
#
# This method only works for tools made for parallel installation with
# a version suffix, i.e. autoconf and automake.
#
# libtool and gettext do not support that, so you'll still have to
# manually set the respective variables if the default does not work
# for you.
skip="false"
oldversion="oldversion"
while read flag variable binary version restofline; do
case "$flag" in
+)
if "$skip"; then skip=false; fi
if test -n "`eval echo \$\{$variable+"set"\}`"; then
skip=:
else
if test -x "`which ${binary}${version}`"; then
export "$variable"="${binary}${version}"
oldversion="${version}"
else
skip=:
fi
fi
;;
-)
if "$skip"; then :; else
export "$variable"="${binary}${oldversion}"
fi
;;
esac
done<<EOF
+ AUTOMAKE automake -1.9
- ACLOCAL aclocal
+ AUTOMAKE automake -1.8
- ACLOCAL aclocal
+ AUTOCONF autoconf 2.59
- AUTOHEADER autoheader
- AUTORECONF autoreconf
+ AUTOCONF autoconf 2.50
- AUTOHEADER autoheader
- AUTORECONF autoreconf
EOF
########################################################################
# Parse command line.
# This still accepts more than the help text says it does, but that
@@ -406,53 +453,6 @@ if test "x$pdirs" != "x"; then
fi
########################################################################
# If not explicitly given, try to find most convenient tools in $PATH
#
# This method only works for tools made for parallel installation with
# a version suffix, i.e. autoconf and automake.
#
# libtool and gettext do not support that, so you'll still have to
# manually set the respective variables if the default does not work
# for you.
skip="false"
oldversion="oldversion"
while read flag variable binary version restofline; do
case "$flag" in
+)
if "$skip"; then skip=false; fi
if test -n "`eval echo \$\{$variable+"set"\}`"; then
skip=:
else
if test -x "`which ${binary}${version}`"; then
export "$variable"="${binary}${version}"
oldversion="${version}"
else
skip=:
fi
fi
;;
-)
if "$skip"; then :; else
export "$variable"="${binary}${oldversion}"
fi
;;
esac
done<<EOF
+ AUTOMAKE automake -1.9
- ACLOCAL aclocal
+ AUTOMAKE automake -1.8
- ACLOCAL aclocal
+ AUTOCONF autoconf 2.59
- AUTOHEADER autoheader
- AUTORECONF autoreconf
+ AUTOCONF autoconf 2.50
- AUTOHEADER autoheader
- AUTORECONF autoreconf
EOF
########################################################################
# Check that tool versions satisfy our needs