From a22500cfd3e0edc93c992034ef25bec763beb33b Mon Sep 17 00:00:00 2001
From: William Brown <firstyear@redhat.com>
Date: Dec 28 2016 03:50:36 +0000
Subject: Update the build to allow include install and pkgconfig to work


---

diff --git a/Makefile.am b/Makefile.am
index 7992139..4abfdb7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,10 @@ ACLOCAL_AMFLAGS = -I m4
 
 CLEANFILES = external/*.gcno external/*.gcda src/*.gcno src/*.gcda test/*.gcno test/*.gcda
 
+if WITH_TESTS
+TESTS = test_sds
+endif
+
 DEBUG_DEFINES = @debug_defs@
 ASAN_DEFINES = @asan_defs@
 PROFILING_DEFINES = @profiling_defs@
@@ -35,8 +39,26 @@ else
 SDS_INCLUDES = -I$(srcdir)/src/sds/ -I$(srcdir)/src/external/
 endif
 
+pkgconfigdir= $(libdir)/pkgconfig
+pkgconfig_DATA= $(PACKAGE_NAME).pc
+
+libsdsincdir = $(includedir)/sds
+libsdsinc_HEADERS = src/sds/sds.h src/external/liblfds710/inc/liblfds710.h
+
+# Could reduce this if I edit the lfds headers.
+
+liblfdsincdir = $(includedir)/sds/liblfds710
+liblfdsinc_DATA = \
+	src/external/liblfds710/inc/liblfds710/lfds710_porting_abstraction_layer_compiler.h \
+	src/external/liblfds710/inc/liblfds710/lfds710_porting_abstraction_layer_operating_system.h \
+	src/external/liblfds710/inc/liblfds710/lfds710_porting_abstraction_layer_processor.h \
+	src/external/liblfds710/inc/liblfds710/lfds710_misc.h \
+	src/external/liblfds710/inc/liblfds710/lfds710_prng.h \
+	src/external/liblfds710/inc/liblfds710/lfds710_queue_unbounded_manyproducer_manyconsumer.h
+
+
 AM_CPPFLAGS = $(DEBUG_DEFINES) $(ASAN_DEFINES) $(PROFILING_DEFINES) $(SDS_INCLUDES) $(NSPR_INCLUDES) $(XSIXFOUR_DEFINES)
-AM_LDFLAGS = $(ASAN_DEFINES) $(PROFILING_LINKS) $(NSPR_LINKS)
+AM_LDFLAGS = $(ASAN_DEFINES) $(PROFILING_LINKS) $(NSPR_LINKS) -release @PACKAGE_VERSION@
 
 # Libraries are built here.
 
@@ -75,7 +97,7 @@ libsdsexternal_la_SOURCES = src/external/avl.c
 
 if WITH_TESTS
 
-bin_PROGRAMS = test_sds benchmark_sds
+check_PROGRAMS = test_sds benchmark_sds
 
 test_sds_SOURCES =  test/test_sds.c \
 					test/test_sds_bpt.c \
diff --git a/configure.ac b/configure.ac
index 9cf4ff4..cd1e146 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,6 @@ m4_include(m4/nspr.m4)
 m4_include(m4/cmocka.m4)
 
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile libsds.pc])
 AC_OUTPUT
 
diff --git a/libsds.pc.in b/libsds.pc.in
new file mode 100644
index 0000000..de54fd6
--- /dev/null
+++ b/libsds.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/sds
+
+Name: @PACKAGE_NAME@
+Description: Libsds is the Slapi Data Structures Library.
+Version: @PACKAGE_VERSION@
+Requires: nspr
+Libs: -lsds -L${libdir}
+Cflags: -I${includedir}
+
diff --git a/src/external/liblfds710/inc/liblfds710.h b/src/external/liblfds710/inc/liblfds710.h
index d4b533b..0753f70 100644
--- a/src/external/liblfds710/inc/liblfds710.h
+++ b/src/external/liblfds710/inc/liblfds710.h
@@ -15,16 +15,16 @@
 
   #include "liblfds710/lfds710_prng.h"                                       // TRD : misc requires prng
   #include "liblfds710/lfds710_misc.h"                                       // TRD : everything after depends on misc
-  #include "liblfds710/lfds710_btree_addonly_unbalanced.h"                   // TRD : hash_addonly depends on btree_addonly_unbalanced
-  #include "liblfds710/lfds710_freelist.h"
-  #include "liblfds710/lfds710_hash_addonly.h"
-  #include "liblfds710/lfds710_list_addonly_singlylinked_ordered.h"
-  #include "liblfds710/lfds710_list_addonly_singlylinked_unordered.h"
-  #include "liblfds710/lfds710_queue_bounded_manyproducer_manyconsumer.h"
-  #include "liblfds710/lfds710_queue_bounded_singleproducer_singleconsumer.h"
+  // #include "liblfds710/lfds710_btree_addonly_unbalanced.h"                   // TRD : hash_addonly depends on btree_addonly_unbalanced
+  // #include "liblfds710/lfds710_freelist.h"
+  // #include "liblfds710/lfds710_hash_addonly.h"
+  // #include "liblfds710/lfds710_list_addonly_singlylinked_ordered.h"
+  // #include "liblfds710/lfds710_list_addonly_singlylinked_unordered.h"
+  // #include "liblfds710/lfds710_queue_bounded_manyproducer_manyconsumer.h"
+  // #include "liblfds710/lfds710_queue_bounded_singleproducer_singleconsumer.h"
   #include "liblfds710/lfds710_queue_unbounded_manyproducer_manyconsumer.h"
-  #include "liblfds710/lfds710_ringbuffer.h"
-  #include "liblfds710/lfds710_stack.h"
+  // #include "liblfds710/lfds710_ringbuffer.h"
+  // #include "liblfds710/lfds710_stack.h"
 
   /***** pragmas off *****/
   // #pragma warning( pop )
diff --git a/test/test_sds.c b/test/test_sds.c
index 0cd8a0f..276d3d5 100644
--- a/test/test_sds.c
+++ b/test/test_sds.c
@@ -11,10 +11,10 @@
 int
 main ( int argc __attribute__((unused)), char **argv __attribute__((unused))) {
     int result = 0;
-    // result += run_bpt_tests();
-    // result += run_set_tests();
-    // result += run_cow_tests();
-    // result += run_queue_tests();
+    result += run_bpt_tests();
+    result += run_set_tests();
+    result += run_cow_tests();
+    result += run_queue_tests();
     result += run_tqueue_tests();
     result += run_lqueue_tests();
     return result;