From cbc5bd5f96d5264a81a04cada13effbd1974ca6f Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Sun, 17 Jul 2011 09:56:52 +1000 Subject: [PATCH] only build the LD_PRELOAD hack on linux --- Makefile.in | 2 +- configure.ac | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 9134801..a5b4e8f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,7 +19,7 @@ LIBISCSI_SO_NAME=libiscsi.so.1 VERSION=1.0.0 LIBISCSI_SO=libiscsi.so.$(VERSION) -all: bin/iscsi-inq bin/iscsi-ls lib/$(LIBISCSI_SO) bin/ld_iscsi.so +all: bin/iscsi-inq bin/iscsi-ls lib/$(LIBISCSI_SO) @ld_iscsi@ bin/ld_iscsi.so: src/ld_iscsi.o lib/libiscsi.a mkdir -p bin diff --git a/configure.ac b/configure.ac index 1108fdd..8e5c438 100644 --- a/configure.ac +++ b/configure.ac @@ -16,9 +16,11 @@ fi is_solaris="no" install="/usr/bin/install" ldconfig="ldconfig" +ld_iscsi="" case `uname` in Linux*) + ld_iscsi="bin/ld_iscsi.so" ;; AIX*) ;; @@ -28,6 +30,9 @@ case `uname` in ldconfig="echo no ldconfig on solaris" LIBS="$LIBS -lsocket -lnsl" ;; + CYGWIN*) + ldconfig="echo no ldconfig on cygwin" + ;; *) ;; esac @@ -110,6 +115,7 @@ fi AC_SUBST(libdir) AC_SUBST(install) AC_SUBST(ldconfig) +AC_SUBST(ld_iscsi) #AC_SUBST(LIBISCSI_LDFLAGS) AC_OUTPUT(Makefile)