diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2004-07-01 17:06:41 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2004-07-01 17:06:41 +0000 |
| commit | 328b757bf2b6c173ce65d3872ea462f25a5d5f9b (patch) | |
| tree | 9a761809da3b45684b09bc2f0d6091132e77c78a /www | |
| parent | - Update xpenguins-daemon addon to 1.2 (diff) | |
Autotools cleanup. Remove autoconf257 (259), automake17 (18), and
libtool14 (13/15).
PR: 67768
Submitted by: ade
Approved by: 4-exp bento runs (thanks, kris!)
Notes
Notes:
svn path=/head/; revision=112679
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache2/Makefile | 7 | ||||
| -rw-r--r-- | www/apache20/Makefile | 7 | ||||
| -rw-r--r-- | www/tidy-devel/Makefile | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index bc49c1096203..4c7b58b4a71e 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -46,7 +46,12 @@ SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ AUTOHEADER=${AUTOHEADER} USE_ICONV= yes -USE_AUTOCONF_VER= 259 +SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ + LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \ + LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \ + AUTOHEADER=${AUTOHEADER} + +USE_AUTOCONF_VER= 257 USE_LIBTOOL_VER= 15 USE_PERL5= yes USE_RC_SUBR= yes diff --git a/www/apache20/Makefile b/www/apache20/Makefile index bc49c1096203..4c7b58b4a71e 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -46,7 +46,12 @@ SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ AUTOHEADER=${AUTOHEADER} USE_ICONV= yes -USE_AUTOCONF_VER= 259 +SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ + LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \ + LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \ + AUTOHEADER=${AUTOHEADER} + +USE_AUTOCONF_VER= 257 USE_LIBTOOL_VER= 15 USE_PERL5= yes USE_RC_SUBR= yes diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile index 5be3bd3978e0..7f8e34f29ec6 100644 --- a/www/tidy-devel/Makefile +++ b/www/tidy-devel/Makefile @@ -65,8 +65,8 @@ patch-autotools: @(cd ${PATCH_WRKSRC}; \ for file in ${LIBTOOLFILES}; do \ ${CP} $$file $$file.tmp; \ - ${SED} -e "s^\$$ac_aux_dir/ltconfig^${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}^g" \ - -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LIBTOOL_SHAREDIR}/ltmain.sh^g" \ + ${SED} -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \ + -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ $$file.tmp > $$file; \ done); .endif |