diff options
| author | Lee Duncan <lduncan@suse.com> | 2022-04-10 11:20:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-10 11:20:24 -0700 |
| commit | 7de11c99ba1e4b9581376d5a9f805b007c133c43 (patch) | |
| tree | f3e6cbdc482ef15c39cdf9588a14434f4f25cc76 /iscsiuio | |
| parent | d169831fd5c5afa9c3f5c0b17789791dfcea5208 (diff) | |
| parent | ddcc4334c0c89547452510cd07046088c4839950 (diff) | |
| download | open-iscsi-7de11c99ba1e4b9581376d5a9f805b007c133c43.tar.gz | |
Merge pull request #333 from thesamesam/master
Build system tweaks from downstream
Diffstat (limited to 'iscsiuio')
| -rw-r--r-- | iscsiuio/configure.ac | 2 | ||||
| -rw-r--r-- | iscsiuio/src/unix/Makefile.am | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac index 9b85448..c53bd27 100644 --- a/iscsiuio/configure.ac +++ b/iscsiuio/configure.ac @@ -72,7 +72,7 @@ AC_ARG_WITH([systemd], *) AC_MSG_ERROR([bad value $withval for --with-systemd]) ;; esac],[with_libsystemd=auto]) AS_IF([test "$with_libsystemd" != no],[ - PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LDFLAGS=$LIBSYSTEMD_LIBS],[ + PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LIBS="${LIBS} $LIBSYSTEMD_LIBS"],[ if test "$with_libsystemd" = yes; then AC_MSG_ERROR([could not find libsystemd using pkg-config]) else diff --git a/iscsiuio/src/unix/Makefile.am b/iscsiuio/src/unix/Makefile.am index a989ef0..8a94371 100644 --- a/iscsiuio/src/unix/Makefile.am +++ b/iscsiuio/src/unix/Makefile.am @@ -27,13 +27,14 @@ iscsiuio_CFLAGS = $(AM_CFLAGS) \ $(LIBNL_CFLAGS) \ -DBYTE_ORDER=@ENDIAN@ -iscsiuio_LDFLAGS= $(AM_LDADD) \ +iscsiuio_LIBS = $(AM_LIBS) \ -ldl \ -rdynamic \ $(LIBNL_LIBS) \ -lpthread -iscsiuio_LDADD = ${top_srcdir}/src/uip/lib_iscsi_uip.a \ +iscsiuio_LDADD = $(AM_LDADD) \ + ${top_srcdir}/src/uip/lib_iscsi_uip.a \ ${top_srcdir}/src/apps/dhcpc/lib_apps_dhcpc.a\ ${top_srcdir}/src/apps/brcm-iscsi/lib_apps_brcm_iscsi.a \ ${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a |