Fix linker script test.

diff --git a/configure.ac b/configure.ac
index 053095ecfbc2e2fad0acc52e85e0410c47522f33..59d55696b7272a5e64b6779caa283195880f34f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,7 @@ AC_DEFINE([HAVE_ERRNO_H], 1, [Hard-code for src/cfg/.])
 AM_CONDITIONAL(HAVE_FORK, test "$ac_cv_func_fork" != "no")
 
 sj_VALGRIND
+sj_LINKER_SCRIPT([$srcdir/lib/libgnutls.vers])
 
 AC_CHECK_TYPES(uint,,, [
 # include <sys/types.h>
@@ -202,7 +203,10 @@ gl_WARN_ADD([-Wno-sign-compare])     # Too many warnings for now
 gl_WARN_ADD([-Wno-pointer-sign])     # Too many warnings for now
 gl_WARN_ADD([-Wno-unused-parameter]) # Too many warnings for now
 gl_WARN_ADD([-fdiagnostics-show-option])
+
+# Export things for */configure.ac.
 export WARN_CFLAGS
+export have_ld_version_script
 
 AC_CONFIG_SUBDIRS([lib])
 AC_CONFIG_SUBDIRS([libextra])

diff --git a/lib/configure.ac b/lib/configure.ac
index a8f814f97a187d3c5a425e3d7c9bb1dff590444e..f2cbcc9c451fe1ece75349118b8dee1d7225522e 100644 (file)
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -86,7 +86,9 @@ LIBGNUTLS_CFLAGS="-I${includedir}"
 AC_SUBST(LIBGNUTLS_LIBS)
 AC_SUBST(LIBGNUTLS_CFLAGS)
 
+# Finish things from ../configure.ac.
 AC_SUBST([WARN_CFLAGS])
+AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
 
 AC_CONFIG_FILES([
   Makefile

diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index 45e62508db78985f11ee32ca59d267801ba85dc9..cce7145abfd82f3b107779d128f538fcd45e2b10 100644 (file)
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -227,7 +227,6 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   AM_CONDITIONAL(ENABLE_OPENPGP, test "$ac_enable_openpgp" = "yes")
 
   sj_OUTPUT_DEF
-  sj_LINKER_SCRIPT([$srcdir/libgnutls.vers])
 
   # For storing integers in pointers without warnings
   # http://developer.gnome.org/doc/API/2.0/glib/glib-Type-Conversion-Macros.html#desc

diff --git a/libextra/configure.ac b/libextra/configure.ac
index 99d0e35ccaa7a7fcb308e0ca899c09a9516ec0d9..40e6a4ead728f52a321a4a95be76680652c9c19d 100644 (file)
--- a/libextra/configure.ac
+++ b/libextra/configure.ac
@@ -45,7 +45,9 @@ LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
 AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
 AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
 
+# Finish things from ../configure.ac.
 AC_SUBST([WARN_CFLAGS])
+AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
 
 AC_CONFIG_FILES([
   Makefile

diff --git a/lib/m4/linker-script.m4 b/m4/linker-script.m4
similarity index 100%
rename from lib/m4/linker-script.m4
rename to m4/linker-script.m4