OS-161: Integrate IPMP changes

*** 20,30 ****
--- 20,32 ----
  #
  #
  # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
+ # Copyright 2014 Nexenta Systems, Inc. All rights reserved.
  #
+ #
  
  PROG =          ipadm
  ROOTFS_PROG =   $(PROG)
  LOCALOBJS=      ipadm.o
  COMMONOBJS=
*** 39,49 ****
  SRCS=           $(LOCALSRCS) $(COMMONSRCS)
  
  CPPFLAGS +=     -I$(CMDINETCOMMONDIR)
  CERRWARN +=     -_gcc=-Wno-unused-label
  CERRWARN +=     -_gcc=-Wno-uninitialized
! LDLIBS +=       -lofmt -linetutil -lipadm -lnvpair
  LINTFLAGS +=    -m
  
  ROOTUSRSBINLINKS = $(PROG:%=$(ROOTUSRSBIN)/%)
  
  # ipadm uses the ancillary data feature which is available only through
--- 41,51 ----
  SRCS=           $(LOCALSRCS) $(COMMONSRCS)
  
  CPPFLAGS +=     -I$(CMDINETCOMMONDIR)
  CERRWARN +=     -_gcc=-Wno-unused-label
  CERRWARN +=     -_gcc=-Wno-uninitialized
! LDLIBS +=       -lofmt -linetutil -lipadm -lnvpair -lipmp -lcmdutils
  LINTFLAGS +=    -m
  
  ROOTUSRSBINLINKS = $(PROG:%=$(ROOTUSRSBIN)/%)
  
  # ipadm uses the ancillary data feature which is available only through