Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix of the previous fix

Browse source 
Avoid empty macro argument to avoid default behavior.
This commit is contained in:
Ondrej Zajicek (work) 2017-05-18 13:29:38 +02:00
parent 271fa063a3
commit 7d5e61a66a
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile.in
View file

@ -130,9 +130,12 @@ $(objdir)/sysdep/paths.h: Makefile
tests_targets_ok = $(addsuffix .ok,$(tests_targets))
$(tests_targets): %: %.o $(tests_objs)
$(E)echo LD $(LDFLAGS) -o $@ $^ $(LIBS)
$(E)echo LD $(LDFLAGS) -o $@ $< "..." $(LIBS)
$(Q)$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
# Hack to avoid problems with tests linking everything
$(tests_targets): LIBS += $(DAEMON_LIBS)
$(tests_targets_ok): %.ok: %
$(Q)$* 2>/dev/null && touch $*.ok

4
configure.ac
View file

@ -222,8 +222,8 @@ DAEMON_LIBS=
AC_SUBST(DAEMON_LIBS)
if test "$enable_libssh" != no ; then
AC_CHECK_HEADER([libssh/libssh.h], [], [fail=yes], [ ])
AC_CHECK_LIB([ssh], [ssh_connect], [], [fail=yes])
AC_CHECK_HEADER([libssh/libssh.h], [true], [fail=yes], [ ])
AC_CHECK_LIB([ssh], [ssh_connect], [true], [fail=yes])
if test "$fail" != yes ; then
AC_DEFINE([HAVE_LIBSSH], [1], [Define to 1 if you have the `ssh' library (-lssh).])