[Gc] Three minor build fixes

Petter Urkedal urkedal at nbi.dk
Fri Sep 25 13:42:13 PDT 2009


Here are three minor patches for the build:

gc-enable-tracetest.patch:
* configure.ac: Add AM conditional analog to KEEP_BACK_PTRS.
* tests/tests.am: Use it here to conditionally enable tracetest when
possibly.

gc-nodist-pkgconfig.patch:
* Makefile.am: Do not distribute the substituted bdw-gc.pc.

gc-underquoted-defun.patch:
* acinclude.m4: Fix underquoting of GC_SET_VERSION.
-------------- next part --------------
diff --git a/configure.ac b/configure.ac
index 3282e6a..fde4a23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -574,6 +574,7 @@ AC_ARG_ENABLE(gc-debug,
     AC_MSG_WARN("Should define GC_DEBUG and use debug alloc. in clients.")
     AC_DEFINE([KEEP_BACK_PTRS], 1,
 	      [Define to save back-pointers in debugging headers.])
+    keep_back_ptrs=true
     AC_DEFINE([DBG_HDRS_ALL], 1,
 	      [Define to force debug headers on all objects.])
     case $host in
@@ -596,6 +597,7 @@ AC_ARG_ENABLE(gc-debug,
       ;;
     esac ]
   fi)
+AM_CONDITIONAL([KEEP_BACK_PTRS], [test x"$keep_back_ptrs" = xtrue])
 
 AC_ARG_ENABLE(java-finalization,
     [AC_HELP_STRING([--disable-java-finalization],
diff --git a/tests/tests.am b/tests/tests.am
index a9c0e73..9ad3c74 100644
--- a/tests/tests.am
+++ b/tests/tests.am
@@ -46,10 +46,12 @@ check_PROGRAMS += hugetest
 hugetest_SOURCES = tests/huge_test.c
 hugetest_LDADD = $(test_ldadd)
 
-#TESTS += tracetest$(EXEEXT)
-#check_PROGRAMS += tracetest
-#tracetest_SOURCES = tests/trace_test.c
-#tracetest_LDADD = $(test_ldadd)
+if KEEP_BACK_PTRS
+TESTS += tracetest$(EXEEXT)
+check_PROGRAMS += tracetest
+tracetest_SOURCES = tests/trace_test.c
+tracetest_LDADD = $(test_ldadd)
+endif
 
 if THREADS
 TESTS += threadleaktest$(EXEEXT)
-------------- next part --------------
diff --git a/Makefile.am b/Makefile.am
index 6080a97..09c0b79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,7 @@ check_PROGRAMS =
 TESTS =
 
 pkgconfigdir = $(libdir)/pkgconfig
-dist_pkgconfig_DATA = bdw-gc.pc
+pkgconfig_DATA = bdw-gc.pc
 
 # C Library
 # ---------
-------------- next part --------------
diff --git a/acinclude.m4 b/acinclude.m4
index 070f85d..0c18172 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -17,7 +17,7 @@
 # [0-9]+[.][0-9]+(alpha[0.9]+)? 
 # in lex syntax; if there is no alpha number, GC_ALPHA_VERSION is empty
 #
-AC_DEFUN(GC_SET_VERSION, [
+AC_DEFUN([GC_SET_VERSION], [
   AC_MSG_CHECKING(GC version numbers)
   GC_VERSION_MAJOR=`echo $PACKAGE_VERSION | sed 's/^\([[0-9]][[0-9]]*\)[[.]].*$/\1/g'`
   GC_VERSION_MINOR=`echo $PACKAGE_VERSION | sed 's/^[[^.]]*[[.]]\([[0-9]][[0-9]]*\).*$/\1/g'`


More information about the Gc mailing list