Merge pull request #59 from bonzini/master

usual bunch of autotools fixes

Makefile.am

@@ -12,6 +12,9 @@ EXTRA_DIST = autogen.sh COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt \
 
 # Simplify conditions below by declaring variables as empty
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libiscsi.pc
+
 bin_PROGRAMS =
 noinst_PROGRAMS =
 EXTRA_PROGRAMS =
@@ -172,8 +175,7 @@ if ISCSITEST
 
 noinst_PROGRAMS += bin/iscsi-test-cu
 # dist_noinst_HEADERS += test-tool/iscsi-test-cu.h
-bin_iscsi_test_cu_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/test-tool \
-	-I/usr/local/include
+bin_iscsi_test_cu_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/test-tool
 bin_iscsi_test_cu_LDFLAGS = -ldl -lcunit
 bin_iscsi_test_cu_SOURCES = test-tool/iscsi-test-cu.c \
 	test-tool/iscsi-support.c \