diff options
Diffstat (limited to 'meta/packages/quilt/quilt-0.47/aclocal.patch')
-rw-r--r-- | meta/packages/quilt/quilt-0.47/aclocal.patch | 126 |
1 files changed, 126 insertions, 0 deletions
diff --git a/meta/packages/quilt/quilt-0.47/aclocal.patch b/meta/packages/quilt/quilt-0.47/aclocal.patch new file mode 100644 index 0000000000..15b174c6d8 --- /dev/null +++ b/meta/packages/quilt/quilt-0.47/aclocal.patch | |||
@@ -0,0 +1,126 @@ | |||
1 | Add the aclocal.m4 as acinclude.m4 | ||
2 | |||
3 | Index: quilt-0.47/acinclude.m4 | ||
4 | =================================================================== | ||
5 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
6 | +++ quilt-0.47/acinclude.m4 2006-10-10 17:05:56.000000000 +0100 | ||
7 | @@ -0,0 +1,119 @@ | ||
8 | +dnl Allow configure to specify a specific binary | ||
9 | +dnl 1: Environment variable | ||
10 | +dnl 2: binary name | ||
11 | +dnl 3: optional list of alternative binary names | ||
12 | +dnl 4: optional list of additional search directories | ||
13 | +AC_DEFUN([QUILT_COMPAT_PROG_PATH],[ | ||
14 | + m4_define([internal_$2_cmd],[esyscmd(ls compat/$2.in 2>/dev/null)]) | ||
15 | + | ||
16 | + AC_ARG_WITH($2, AC_HELP_STRING( | ||
17 | + [--with-$2], [name of the $2 executable to use] | ||
18 | + m4_if(internal_$2_cmd,[],[],[ (use --without-$2 | ||
19 | + to use an internal mechanism)])), | ||
20 | + [ | ||
21 | + if test x"$withval" = xnone; then | ||
22 | + AC_MSG_ERROR([Invalid configure argument. use --without-$2]) | ||
23 | + fi | ||
24 | + if test x"$withval" != xno; then | ||
25 | + AC_MSG_CHECKING(for $2) | ||
26 | + $1="$withval" | ||
27 | + if test -e "$$1"; then | ||
28 | + if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then | ||
29 | + AC_MSG_ERROR([$$1 is not an executable file]) | ||
30 | + fi | ||
31 | + fi | ||
32 | + AC_MSG_RESULT([$$1]) | ||
33 | + if test ! -e "$$1"; then | ||
34 | + AC_MSG_WARN([$$1 does not exist]) | ||
35 | + fi | ||
36 | + COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" | ||
37 | + fi | ||
38 | + ],[ | ||
39 | + m4_if([$3],[],[ | ||
40 | + AC_PATH_PROG($1,$2,,$PATH:$4) | ||
41 | + ],[ | ||
42 | + AC_PATH_PROGS($1,$3,,$PATH:$4) | ||
43 | + if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then | ||
44 | + COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" | ||
45 | + fi | ||
46 | + ]) | ||
47 | + m4_if([$4],[],[],[ | ||
48 | + if test -n "$$1"; then | ||
49 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
50 | + for dir in "$4"; do | ||
51 | + if test "`dirname $$1`" = "$dir"; then | ||
52 | + COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" | ||
53 | + break | ||
54 | + fi | ||
55 | + done | ||
56 | + IFS="$as_save_IFS" | ||
57 | + fi | ||
58 | + ]) | ||
59 | + ]) | ||
60 | + if test -z "$$1"; then | ||
61 | + m4_if(internal_$2_cmd,[],[ | ||
62 | + AC_MSG_ERROR([Please specify the location of $2 with the option '--with-$2']) | ||
63 | + ],[ | ||
64 | + AC_MSG_WARN([Using internal $2 mechanism. Use option '--with-$2' to override]) | ||
65 | + COMPAT_PROGRAMS="$COMPAT_PROGRAMS $2" | ||
66 | + $1=$2 | ||
67 | + INTERNAL_$1=1 | ||
68 | + ]) | ||
69 | + fi | ||
70 | + AC_SUBST($1) | ||
71 | +]) | ||
72 | + | ||
73 | +dnl Allow configure to specify a specific binary | ||
74 | +dnl This variant is for optional binaries. | ||
75 | +dnl 1: Environment variable | ||
76 | +dnl 2: binary name | ||
77 | +dnl 3: optional list of alternative binary names | ||
78 | +dnl 4: optional list of additional search directories | ||
79 | +AC_DEFUN([QUILT_COMPAT_PROG_PATH_OPT],[ | ||
80 | + AC_ARG_WITH($2, AC_HELP_STRING( | ||
81 | + [--with-$2], [name of the $2 executable to use]), | ||
82 | + [ | ||
83 | + if test x"$withval" != xno; then | ||
84 | + AC_MSG_CHECKING(for $2) | ||
85 | + $1="$withval" | ||
86 | + if test -e "$$1"; then | ||
87 | + if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then | ||
88 | + AC_MSG_ERROR([$$1 is not an executable file]) | ||
89 | + fi | ||
90 | + fi | ||
91 | + AC_MSG_RESULT([$$1]) | ||
92 | + if test ! -e "$$1"; then | ||
93 | + AC_MSG_WARN([$$1 does not exist]) | ||
94 | + fi | ||
95 | + COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" | ||
96 | + fi | ||
97 | + ],[ | ||
98 | + m4_if([$3],[],[ | ||
99 | + AC_PATH_PROG($1,$2,,$PATH:$4) | ||
100 | + ],[ | ||
101 | + AC_PATH_PROGS($1,$3,,$PATH:$4) | ||
102 | + if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then | ||
103 | + COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" | ||
104 | + fi | ||
105 | + ]) | ||
106 | + m4_if([$4],[],[],[ | ||
107 | + if test -n "$$1"; then | ||
108 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
109 | + for dir in "$4"; do | ||
110 | + if test "`dirname $$1`" = "$dir"; then | ||
111 | + COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" | ||
112 | + break | ||
113 | + fi | ||
114 | + done | ||
115 | + IFS="$as_save_IFS" | ||
116 | + fi | ||
117 | + ]) | ||
118 | + if test -z "$$1"; then | ||
119 | + AC_MSG_WARN([$2 not found, some optional functionalities will be missing]) | ||
120 | + fi | ||
121 | + ]) | ||
122 | + if test -z "$$1"; then | ||
123 | + $1=$2 | ||
124 | + fi | ||
125 | + AC_SUBST($1) | ||
126 | +]) | ||