- Better parsing of the "connect" command (tftp).

- Move missing header file stuff consistently into config.h.
- Make "make -j" work correctly.

configure.in

@@ -73,6 +73,23 @@ AC_CHECK_FUNCS(strtoull)
 PA_MSGHDR_MSG_CONTROL
 PA_STRUCT_IN_PKTINFO
 
+AH_TEMPLATE([HAVE_SIGSETJMP],
+[Define if we have sigsetjmp, siglongjmp and sigjmp_buf.])
+PA_SIGSETJMP([AC_DEFINE(HAVE_SIGSETJMP)])
+
+LIBXTRA=false
+AC_SEARCH_LIBS(xmalloc, iberty, , LIBXTRA=true LIBOBJS="$LIBOBJS xmalloc.o")
+AC_SEARCH_LIBS(xstrdup, iberty, , LIBXTRA=true LIBOBJS="$LIBOBJS xstrdup.o")
+AC_SEARCH_LIBS(bsd_signal, bsd, , LIBXTRA=true LIBOBJS="$LIBOBJS bsdsignal.o")
+if $LIBXTRA; then
+	LIBS="../lib/libxtra.a $LIBS"
+fi
+
+dnl
+dnl These libraries apply to the server only
+dnl
+
+common_libs="$LIBS"
 
 AH_TEMPLATE([HAVE_IPPORT_TFTP_DEFINITION],
 [Define if netinet/in.h defines IPPORT_TFTP.])
@@ -85,6 +102,7 @@ PA_WITH_BOOL(tcpwrappers, 1,
 	PA_HAVE_TCPWRAPPERS
 ],:)
 
+
 AH_TEMPLATE([WITH_REGEX],
 [Define if we are compiling with regex filename remapping.])
 
@@ -101,6 +119,13 @@ PA_WITH_BOOL(remap, 1,
 	])
 ],:)
 
+TFTPD_LIBS="$LIBS"
+LIBS="$common_libs"
+
+dnl
+dnl These libraries apply to the client only
+dnl
+
 AH_TEMPLATE([WITH_READLINE],
 [Define if we are compiling with readline command-line editing.])
 
@@ -119,18 +144,11 @@ PA_WITH_BOOL(readline, 1,
 	fi
 ],:)
 
-AH_TEMPLATE([HAVE_SIGSETJMP],
-[Define if we have sigsetjmp, siglongjmp and sigjmp_buf.])
-PA_SIGSETJMP([AC_DEFINE(HAVE_SIGSETJMP)])
-
-LIBXTRA=false
-AC_SEARCH_LIBS(xmalloc, iberty, , LIBXTRA=true LIBOBJS="$LIBOBJS xmalloc.o")
-AC_SEARCH_LIBS(xstrdup, iberty, , LIBXTRA=true LIBOBJS="$LIBOBJS xstrdup.o")
-AC_SEARCH_LIBS(bsd_signal, bsd, , LIBXTRA=true LIBOBJS="$LIBOBJS bsdsignal.o")
-if $LIBXTRA; then
-	LIBS="../lib/libxtra.a $LIBS"
-fi
+TFTP_LIBS="$LIBS"
+LIBS="$common_libs"
 
+AC_SUBST(TFTP_LIBS)
+AC_SUBST(TFTPD_LIBS)
 AC_SUBST(LIBOBJS)
 AC_SUBST(TFTPDOBJS)