New configure option --disable-namespacing.

4 files changed, 34 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 681528d..6341f4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-03  Bruno Haible  <bruno@clisp.org>
+
+	New configure option --disable-namespacing.
+	* configure.ac: New option --disable-namespacing.
+	(NAMESPACING): New substituted variable.
+	* lib/Makefile.am (config.h): Don't alias any symbols if NAMESPACING is
+	set to empty.
+	* HACKING: New section "Building".
+
 2009-05-01  Bruno Haible  <bruno@clisp.org>
 
 	* doc/libunistring.texi: Enable the table of contents also in TeX mode.
diff --git a/HACKING b/HACKING
index 1796eab..5485a29 100644
--- a/HACKING
+++ b/HACKING
@@ -50,12 +50,24 @@ And, of course, the packages listed in the DEPENDENCIES file.
 
 Then you can run the 'autogen.sh' script 
 
+
 Sources
 =======
 
 Most of the sources have their origin in gnulib.
 
 
+Building
+========
+
+See the INSTALL file for generic instructions.
+
+You can use the configure option --disable-namespacing to speed up the build
+by a factor of 1.5.  The resulting library is not namespace-clean and
+therefore should not be installed (if you don't want to risk collisions
+with other libraries) and should certainly not be distributed.
+
+
 Running the testsuite in valgrind
 =================================
 
diff --git a/configure.ac b/configure.ac
index eaca4ec..22cdcf9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,6 +101,18 @@ if test $is_woe32dll = yes; then
     [Define when --enable-shared is used on mingw or Cygwin.])
 fi
 
+dnl Namespacing is the default: it builds a namespace clean library.
+dnl Allow the user to disable namespacing. This speeds up "make" considerably.
+AC_ARG_ENABLE([namespacing],
+  [  --disable-namespacing   build a library that exports undesired symbols],
+  [:], [enable_namespacing=yes])
+if test "$enable_namespacing" != no; then
+  NAMESPACING=yes
+else
+  NAMESPACING=
+fi
+AC_SUBST([NAMESPACING])
+
 dnl Check for prerequisites of exported.sh.
 gt_GLOBAL_SYMBOL_PIPE
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 199be73..9081bc1 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -202,7 +202,7 @@ config.h: $(BUILT_SOURCES) libunistring.sym
 	  echo; \
 	  echo '#endif /* UNISTRING_CONFIG_H */'; \
 	} > config.h && \
-	if test -n "$(HAVE_GLOBAL_SYMBOL_PIPE)"; then \
+	if test -n "$(NAMESPACING)" && test -n "$(HAVE_GLOBAL_SYMBOL_PIPE)"; then \
 	  { \
 	    for f in $(libunistring_la_SOURCES) $(libunistring_la_LIBADD); do \
 	      case $$f in \