Revision 7152e5ef configure.in
configure.in | ||
---|---|---|
23 | 23 |
if test "$srcdir" = . ; then |
24 | 24 |
# Building in current directory => create obj directory holding all objects |
25 | 25 |
objdir=obj |
26 |
mkdir -p obj |
|
27 |
srcdir_rel=.. |
|
28 |
makefiles="Makefile:tools/Makefile-top.in obj/Makefile:tools/Makefile.in obj/Rules:tools/Rules.in" |
|
29 |
exedir=.. |
|
30 | 26 |
else |
31 | 27 |
# Building in separate directory |
32 | 28 |
objdir=. |
33 |
srcdir_rel=$srcdir |
|
34 |
makefiles="Makefile:tools/Makefile.in Rules:tools/Rules.in" |
|
35 |
exedir=. |
|
36 | 29 |
fi |
37 |
case $srcdir_rel in |
|
38 |
/*) srcdir_rel_mf=$srcdir_rel ;; |
|
39 |
*) srcdir_rel_mf="\$(root-rel)$srcdir_rel" ;; |
|
40 |
esac |
|
30 |
|
|
31 |
exedir=. |
|
32 |
|
|
41 | 33 |
AC_SUBST(objdir) |
42 | 34 |
AC_SUBST(exedir) |
43 |
AC_SUBST(srcdir_rel_mf)
|
|
35 |
AC_SUBST(srcdir) |
|
44 | 36 |
AC_SUBST(runtimedir) |
45 | 37 |
|
46 | 38 |
|
... | ... | |
162 | 154 |
AC_DEFINE_UNQUOTED(SYSCONF_INCLUDE, "$sysdesc") |
163 | 155 |
|
164 | 156 |
AC_MSG_CHECKING([system-dependent directories]) |
165 |
sysdep_dirs="`sed <$sysdesc '/^Link: /!d;s/^Link: \(.*\)$/\1/' | tr '\012' ' '` lib"
|
|
157 |
sysdep_dirs="`sed <$sysdesc '/^Link: /!d;s/^Link: \(.*\)$/\1/' | tr '\012' ' '`" |
|
166 | 158 |
AC_MSG_RESULT($sysdep_dirs) |
167 | 159 |
AC_SUBST(sysdep_dirs) |
168 | 160 |
|
... | ... | |
234 | 226 |
fi |
235 | 227 |
fi |
236 | 228 |
|
237 |
CLIENT= |
|
229 |
CLIENT=birdcl
|
|
238 | 230 |
CLIENT_LIBS= |
239 | 231 |
if test "$enable_client" = yes ; then |
240 |
CLIENT=birdc
|
|
232 |
CLIENT="$CLIENT birdc"
|
|
241 | 233 |
AC_CHECK_LIB(history, add_history, CLIENT_LIBS="-lhistory") |
242 | 234 |
AC_CHECK_LIB(ncurses, tgetent, USE_TERMCAP_LIB=-lncurses, |
243 | 235 |
AC_CHECK_LIB(curses, tgetent, USE_TERMCAP_LIB=-lcurses, |
... | ... | |
255 | 247 |
|
256 | 248 |
mkdir -p $objdir/sysdep |
257 | 249 |
AC_CONFIG_HEADERS([$objdir/sysdep/autoconf.h:sysdep/autoconf.h.in]) |
258 |
AC_CONFIG_COMMANDS([merge],[[export CPP="$CPP" |
|
259 |
$srcdir/tools/mergedirs $srcdir $srcdir_rel $objdir $sysdep_dirs]], |
|
260 |
[[srcdir=$srcdir] |
|
261 |
[srcdir_rel=$srcdir_rel] |
|
262 |
[objdir=$objdir] |
|
263 |
[sysdep_dirs="$sysdep_dirs"]]) |
|
264 |
AC_CONFIG_FILES($makefiles) |
|
250 |
AC_CONFIG_FILES(Makefile:Makefile.in) |
|
265 | 251 |
AC_OUTPUT |
266 | 252 |
|
267 |
rm -f $objdir/sysdep/paths.h |
|
268 |
|
|
269 | 253 |
cat >&AC_FD_MSG <<EOF |
270 | 254 |
|
271 | 255 |
BIRD was configured with the following options: |
Also available in: Unified diff