1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
--- aclocal.in.orig Sat Apr 10 10:15:32 2004
+++ aclocal.in Wed May 26 14:33:27 2004
@@ -31,3 +31,3 @@
{
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
@@ -47,4 +47,5 @@
# Note also that the versioned directory is handled later.
-$acdir = '@datadir@/aclocal';
+$acdir = '@datadir@/aclocal@APIPVERSION@';
$default_acdir = $acdir;
+$acdir_x11 = '%%X11BASE%%/share/aclocal';
# contains a list of directories, one per line, to be added
@@ -411,3 +412,3 @@
- my $traces = ($ENV{AUTOM4TE} || 'autom4te');
+ my $traces = ($ENV{AUTOM4TE} || 'autom4te259');
$traces .= " --language Autoconf-without-aclocal-m4 ";
@@ -622,7 +623,3 @@
- # Search the versioned directory near the end, and then the
- # unversioned directory last. Only do this if the user didn't
- # override acdir.
- push (@dirlist, "$acdir-$APIVERSION")
- if $acdir eq $default_acdir;
+ unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
|
