summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.in6
-rw-r--r--m4/ld-O1.m424
-rw-r--r--m4/ld-as-needed.m424
4 files changed, 59 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 33a964fd..02ca7bb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-20 Thorsten Kukuk <kukuk@thkukuk.de>
+
+ * m4/ld-as-needed.m4: New.
+ * m4/ld-O1.m4: New.
+ * configure.in: Call PAM_LD_AS_NEEDED and PAM_LD_O1,
+ require docbook version 4.4.
+
2006-06-19 Thorsten Kukuk <kukuk@thkukuk.de>
* doc/man/pam.8.xml: Syntax cleanup.
diff --git a/configure.in b/configure.in
index ad1c9880..8850b4d9 100644
--- a/configure.in
+++ b/configure.in
@@ -67,6 +67,8 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
+PAM_LD_AS_NEEDED
+PAM_LD_O1
dnl Largefile support
AC_SYS_LARGEFILE
@@ -425,8 +427,8 @@ if test -z "$XSLTPROC"; then
fi
AC_PATH_PROG([XMLLINT], [xmllint],[/bin/true])
dnl check for DocBook DTD and stylesheets in the local catalog.
-JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.3//EN],
- [DocBook XML DTD V4.3], [], enable_man=no)
+JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.4//EN],
+ [DocBook XML DTD V4.4], [], enable_man=no)
JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
[DocBook XSL Stylesheets], [], enable_man=no)
diff --git a/m4/ld-O1.m4 b/m4/ld-O1.m4
new file mode 100644
index 00000000..c8630740
--- /dev/null
+++ b/m4/ld-O1.m4
@@ -0,0 +1,24 @@
+# ld-O1.m4 serial 2
+
+# Test if ld supports -O1
+
+AC_DEFUN([PAM_LD_O1],
+ [
+ AC_CACHE_CHECK(whether ld supports -O1,
+ pam_cv_ld_O1, [ dnl
+ cat > conftest.c <<EOF
+int main (void) { return 0; }
+EOF
+ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+ -o conftest.o conftest.c
+ -Wl,-O1 1>&AS_MESSAGE_LOG_FD])
+ then
+ pam_cv_ld_O1=yes
+ else
+ pam_cv_ld_O1=no
+ fi
+ rm -f conftest*])
+ AC_SUBST(pam_cv_ld_as_needed)
+ LDFLAGS="$LDFLAGS -Wl,-O1"
+ ]
+)
diff --git a/m4/ld-as-needed.m4 b/m4/ld-as-needed.m4
new file mode 100644
index 00000000..cd81f91b
--- /dev/null
+++ b/m4/ld-as-needed.m4
@@ -0,0 +1,24 @@
+# ld-as-needed.m4 serial 2
+
+# Test if ld supports --as-needed
+
+AC_DEFUN([PAM_LD_AS_NEEDED],
+ [
+ AC_CACHE_CHECK(whether ld supports --as-needed,
+ pam_cv_ld_as_needed, [ dnl
+ cat > conftest.c <<EOF
+int main (void) { return 0; }
+EOF
+ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+ -o conftest.o conftest.c
+ -Wl,--as-needed 1>&AS_MESSAGE_LOG_FD])
+ then
+ pam_cv_ld_as_needed=yes
+ else
+ pam_cv_ld_as_needed=no
+ fi
+ rm -f conftest*])
+ AC_SUBST(pam_cv_ld_as_needed)
+ LDFLAGS="$LDFLAGS -Wl,--as-needed"
+ ]
+)