forks/tftp-hpa-google
1
0
Fork 0
forked from mirrors/tftp-hpa-google
Code Pull requests Releases 1 Activity

Create a sensible solution to the libxtra path problem.

Browse source
This commit is contained in:
hpa 2004-01-14 18:37:56 +00:00
parent d05bd6fa96
commit 0740f97365
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MCONFIG.in
View file

@ -15,6 +15,10 @@
## Basic Makefile definitions ## Basic Makefile definitions
## ##
# Source and object root
SRCROOT = @SRCROOT@
OBJROOT = @OBJROOT@
# Prefixes # Prefixes
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@

15
configure.in
View file

@ -122,12 +122,18 @@ AH_TEMPLATE([HAVE_SIGSETJMP],
[Define if we have sigsetjmp, siglongjmp and sigjmp_buf.]) [Define if we have sigsetjmp, siglongjmp and sigjmp_buf.])
PA_SIGSETJMP([AC_DEFINE(HAVE_SIGSETJMP)]) PA_SIGSETJMP([AC_DEFINE(HAVE_SIGSETJMP)])
dnl
dnl Get common paths
dnl
SRCROOT=`cd $srcdir && pwd`
OBJROOT=`pwd`
LIBXTRA=false LIBXTRA=false
AC_SEARCH_LIBS(xmalloc, iberty, , LIBXTRA=true AC_LIBOBJ(xmalloc)) AC_SEARCH_LIBS(xmalloc, iberty, , LIBXTRA=true AC_LIBOBJ(xmalloc))
AC_SEARCH_LIBS(xstrdup, iberty, , LIBXTRA=true AC_LIBOBJ(xstrdup)) AC_SEARCH_LIBS(xstrdup, iberty, , LIBXTRA=true AC_LIBOBJ(xstrdup))
AC_SEARCH_LIBS(bsd_signal, bsd, , LIBXTRA=true AC_LIBOBJ(bsdsignal)) AC_SEARCH_LIBS(bsd_signal, bsd, , LIBXTRA=true AC_LIBOBJ(bsdsignal))
if $LIBXTRA; then if $LIBXTRA; then
LIBS="../lib/libxtra.a $LIBS" XTRALIBS="$OBJROOT/lib/libxtra.a $XTRALIBS"
fi fi
dnl dnl
@ -162,7 +168,7 @@ PA_WITH_BOOL(remap, 1,
]) ])
],:) ],:)
TFTPD_LIBS="$LIBS" TFTPD_LIBS="$LIBS $XTRALIBS"
LIBS="$common_libs" LIBS="$common_libs"
dnl dnl
@ -190,9 +196,12 @@ PA_WITH_BOOL(readline, 1,
]) ])
],:) ],:)
TFTP_LIBS="$LIBS" TFTP_LIBS="$LIBS $XTRALIBS"
LIBS="$common_libs" LIBS="$common_libs"
AC_SUBST(SRCROOT)
AC_SUBST(OBJROOT)
AC_SUBST(TFTP_LIBS) AC_SUBST(TFTP_LIBS)
AC_SUBST(TFTPD_LIBS) AC_SUBST(TFTPD_LIBS)
AC_SUBST(TFTPDOBJS) AC_SUBST(TFTPDOBJS)