diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-05-18 13:29:38 +0200 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-05-18 13:29:38 +0200 |
| commit | 7d5e61a66a3d4ecd004f3aa44a3d1bd3682ccf07 (patch) | |
| tree | c4e12f54bb719cb63060e5a5b689d533d635a92d | |
| parent | 271fa063a3e2078d7a046146ac2da3718b080cfa (diff) | |
Fix of the previous fix
Avoid empty macro argument to avoid default behavior.
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 25af140c..e1f8d9c2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 diff --git a/configure.ac b/configure.ac index 66e100df..9e375762 100644 --- a/configure.ac +++ b/configure.ac @@ -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).]) |