Commit 7d5e61a6 authored by Ondrej Zajicek (work)'s avatar Ondrej Zajicek (work)
Browse files

Fix of the previous fix 

Avoid empty macro argument to avoid default behavior.
parent 271fa063

Makefile.in

+4 −1
Original line number Diff line number Diff line
@@ -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

configure.ac

+2 −2
Original line number Diff line number Diff line
@@ -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).])

CRA Git | Maintained and supported by SUSTech CRA and CCSE