forked from mirrors/tftp-hpa-google
Create a sensible solution to the libxtra path problem.
This commit is contained in:
parent
d05bd6fa96
commit
0740f97365
2 changed files with 16 additions and 3 deletions
|
@ -15,6 +15,10 @@
|
|||
## Basic Makefile definitions
|
||||
##
|
||||
|
||||
# Source and object root
|
||||
SRCROOT = @SRCROOT@
|
||||
OBJROOT = @OBJROOT@
|
||||
|
||||
# Prefixes
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
|
15
configure.in
15
configure.in
|
@ -122,12 +122,18 @@ AH_TEMPLATE([HAVE_SIGSETJMP],
|
|||
[Define if we have sigsetjmp, siglongjmp and sigjmp_buf.])
|
||||
PA_SIGSETJMP([AC_DEFINE(HAVE_SIGSETJMP)])
|
||||
|
||||
dnl
|
||||
dnl Get common paths
|
||||
dnl
|
||||
SRCROOT=`cd $srcdir && pwd`
|
||||
OBJROOT=`pwd`
|
||||
|
||||
LIBXTRA=false
|
||||
AC_SEARCH_LIBS(xmalloc, iberty, , LIBXTRA=true AC_LIBOBJ(xmalloc))
|
||||
AC_SEARCH_LIBS(xstrdup, iberty, , LIBXTRA=true AC_LIBOBJ(xstrdup))
|
||||
AC_SEARCH_LIBS(bsd_signal, bsd, , LIBXTRA=true AC_LIBOBJ(bsdsignal))
|
||||
if $LIBXTRA; then
|
||||
LIBS="../lib/libxtra.a $LIBS"
|
||||
XTRALIBS="$OBJROOT/lib/libxtra.a $XTRALIBS"
|
||||
fi
|
||||
|
||||
dnl
|
||||
|
@ -162,7 +168,7 @@ PA_WITH_BOOL(remap, 1,
|
|||
])
|
||||
],:)
|
||||
|
||||
TFTPD_LIBS="$LIBS"
|
||||
TFTPD_LIBS="$LIBS $XTRALIBS"
|
||||
LIBS="$common_libs"
|
||||
|
||||
dnl
|
||||
|
@ -190,9 +196,12 @@ PA_WITH_BOOL(readline, 1,
|
|||
])
|
||||
],:)
|
||||
|
||||
TFTP_LIBS="$LIBS"
|
||||
TFTP_LIBS="$LIBS $XTRALIBS"
|
||||
LIBS="$common_libs"
|
||||
|
||||
AC_SUBST(SRCROOT)
|
||||
AC_SUBST(OBJROOT)
|
||||
|
||||
AC_SUBST(TFTP_LIBS)
|
||||
AC_SUBST(TFTPD_LIBS)
|
||||
AC_SUBST(TFTPDOBJS)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue