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
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
|
Add the aclocal.m4 as acinclude.m4
Index: quilt-0.46/acinclude.m4
===================================================================
--- /dev/null
+++ quilt-0.46/acinclude.m4
@@ -0,0 +1,119 @@
+dnl Allow configure to specify a specific binary
+dnl 1: Environment variable
+dnl 2: binary name
+dnl 3: optional list of alternative binary names
+dnl 4: optional list of additional search directories
+AC_DEFUN([QUILT_COMPAT_PROG_PATH],[
+ m4_define([internal_$2_cmd],[esyscmd(ls compat/$2.in 2>/dev/null)])
+
+ AC_ARG_WITH($2, AC_HELP_STRING(
+ [--with-$2], [name of the $2 executable to use]
+ m4_if(internal_$2_cmd,[],[],[ (use --without-$2
+ to use an internal mechanism)])),
+ [
+ if test x"$withval" = xnone; then
+ AC_MSG_ERROR([Invalid configure argument. use --without-$2])
+ fi
+ if test x"$withval" != xno; then
+ AC_MSG_CHECKING(for $2)
+ $1="$withval"
+ if test -e "$$1"; then
+ if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then
+ AC_MSG_ERROR([$$1 is not an executable file])
+ fi
+ fi
+ AC_MSG_RESULT([$$1])
+ if test ! -e "$$1"; then
+ AC_MSG_WARN([$$1 does not exist])
+ fi
+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
+ fi
+ ],[
+ m4_if([$3],[],[
+ AC_PATH_PROG($1,$2,,$PATH:$4)
+ ],[
+ AC_PATH_PROGS($1,$3,,$PATH:$4)
+ if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then
+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
+ fi
+ ])
+ m4_if([$4],[],[],[
+ if test -n "$$1"; then
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for dir in "$4"; do
+ if test "`dirname $$1`" = "$dir"; then
+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
+ break
+ fi
+ done
+ IFS="$as_save_IFS"
+ fi
+ ])
+ ])
+ if test -z "$$1"; then
+ m4_if(internal_$2_cmd,[],[
+ AC_MSG_ERROR([Please specify the location of $2 with the option '--with-$2'])
+ ],[
+ AC_MSG_WARN([Using internal $2 mechanism. Use option '--with-$2' to override])
+ COMPAT_PROGRAMS="$COMPAT_PROGRAMS $2"
+ $1=$2
+ INTERNAL_$1=1
+ ])
+ fi
+ AC_SUBST($1)
+])
+
+dnl Allow configure to specify a specific binary
+dnl This variant is for optional binaries.
+dnl 1: Environment variable
+dnl 2: binary name
+dnl 3: optional list of alternative binary names
+dnl 4: optional list of additional search directories
+AC_DEFUN([QUILT_COMPAT_PROG_PATH_OPT],[
+ AC_ARG_WITH($2, AC_HELP_STRING(
+ [--with-$2], [name of the $2 executable to use]),
+ [
+ if test x"$withval" != xno; then
+ AC_MSG_CHECKING(for $2)
+ $1="$withval"
+ if test -e "$$1"; then
+ if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then
+ AC_MSG_ERROR([$$1 is not an executable file])
+ fi
+ fi
+ AC_MSG_RESULT([$$1])
+ if test ! -e "$$1"; then
+ AC_MSG_WARN([$$1 does not exist])
+ fi
+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
+ fi
+ ],[
+ m4_if([$3],[],[
+ AC_PATH_PROG($1,$2,,$PATH:$4)
+ ],[
+ AC_PATH_PROGS($1,$3,,$PATH:$4)
+ if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then
+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
+ fi
+ ])
+ m4_if([$4],[],[],[
+ if test -n "$$1"; then
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for dir in "$4"; do
+ if test "`dirname $$1`" = "$dir"; then
+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
+ break
+ fi
+ done
+ IFS="$as_save_IFS"
+ fi
+ ])
+ if test -z "$$1"; then
+ AC_MSG_WARN([$2 not found, some optional functionalities will be missing])
+ fi
+ ])
+ if test -z "$$1"; then
+ $1=$2
+ fi
+ AC_SUBST($1)
+])
|
