|
Check-in Number:
|
1602 | |
| Date: |
2002-Jan-21 19:00:07 (local)
2002-Jan-21 18:00:07 (UTC) |
| User: | ms |
| Branch: | |
| Comment: |
Changed autoconf and autoheader ordering, added automake and aclocal logic.
PR:
Submitted by:
Reviewed by:
Approved by:
Obtained from: |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/rc/devtool.conf 1.1 -> 1.2
--- devtool.conf 2002/01/18 16:47:17 1.1
+++ devtool.conf 2002/01/21 18:00:07 1.2
@@ -5,11 +5,15 @@
%autogen
@autogen shtool 1.5.4 "1.5.*" all
@autogen libtool 1.4.2 "1.4*"
+ @autogen aclocal 1.5 "1.4*" # Part of automake
+ @autogen automake 1.5 "1.4*"
@autogen autoconf 2.52 "2.5.*"
%autoclean
@autoclean shtool
@autoclean libtool
+ @autoclean aclocal
+ @autoclean automake
@autoclean autoconf
%configure
|
|
ossp-pkg/rc/devtool.func 1.1 -> 1.2
--- devtool.func 2002/01/18 16:47:17 1.1
+++ devtool.func 2002/01/21 18:00:07 1.2
@@ -28,16 +28,28 @@
tool=$1
shift
case $tool in
+ aclocal )
+ aclocal_version=`devtool_require aclocal --version 4 "$1" "$2"`
+ echo "generating (GNU Aclocal $aclocal_version): aclocal.m4"
+ aclocal
+ ;;
autoconf )
autoconf_version=`devtool_require autoconf --version 4 "$1" "$2"`
echo "generating (GNU Autoconf $autoconf_version): configure config.h.in"
autoconf
autoheader 2>&1 | grep -v "is unchanged"
;;
+ automake )
+ # We might depend on config.h.in
+ (autoheader --version) </dev/null >/dev/null 2>&1 && autoheader
+ automake_version=`devtool_require automake --version 4 "$1" "$2"`
+ echo "generating (GNU Automake $automake_version): INSTALL Makefile.in depcomp install-sh missing mkinstalldirs stamp-h.in"
+ automake --add-missing --copy --gnu
+ ;;
libtool )
libtoolize_version=`devtool_require libtoolize --version 4 "$1" "$2"`
echo "generating (GNU Libtool $libtoolize_version): ltmain.sh, libtool.m4, config.guess, config.sub"
- libtoolize --force --copy >/dev/null 2>&1
+ libtoolize --force --copy --automake >/dev/null 2>&1
cp `libtoolize --force --copy --dry-run | grep "add the contents of" |\
sed -e 's;^[^\`]*\`;;' -e "s;'.*;;"` libtool.m4
;;
@@ -59,6 +71,14 @@
echo "removing: configure config.h.in"
rm -f configure config.h.in
;;
+ automake )
+ echo "removing: INSTALL Makefile.in depcomp install-sh missing mkinstalldirs stamp-h.in"
+ rm -f INSTALL Makefile.in depcomp install-sh missing mkinstalldirs stamp-h.in
+ ;;
+ aclocal )
+ echo "removing: aclocal.m4"
+ rm -f aclocal.m4
+ ;;
libtool )
echo "removing: ltmain.sh libtool.m4 config.guess config.sub"
rm -f ltmain.sh libtool.m4 config.guess config.sub
|
|
