INN commit: trunk (configure.ac doc/pod/news.pod)

INN Commit rra at isc.org
Tue Apr 3 04:01:45 UTC 2012


    Date: Monday, April 2, 2012 @ 21:01:45
  Author: eagle
Revision: 9400

Make libtool support unconditional

The days when this was too slow on common systems have long past, and it
makes the build system unnecessarily complex to support having it be 
optional, particularly as we move forward with Automake.

Modified:
  trunk/configure.ac
  trunk/doc/pod/news.pod

------------------+
 configure.ac     |   48 ++++++++++++------------------------------------
 doc/pod/news.pod |    5 +++++
 2 files changed, 17 insertions(+), 36 deletions(-)

Modified: configure.ac
===================================================================
--- configure.ac	2012-03-04 15:08:17 UTC (rev 9399)
+++ configure.ac	2012-04-03 04:01:45 UTC (rev 9400)
@@ -71,48 +71,24 @@
 dnl Make sure $prefix is set so that we can use it internally.
 test x"$prefix" = xNONE && prefix="$ac_default_prefix"
 
-dnl A few tests need to happen before any of the libtool tests in order to
-dnl avoid error messages.  We therefore lift them up to the top of the file.
+dnl A few tests need to happen before any of the libtool tests.  avoid error
+dnl messages.  We therefore lift them up to the top of the file.
 AC_PROG_CC
 AC_USE_SYSTEM_EXTENSIONS
 AC_SEARCH_LIBS([strerror], [cposix])
 INN_PROG_CC_C_O
 AC_CANONICAL_HOST
-_LT_DECL_SED
 
-dnl Check to see if the user wants to use libtool.  We only invoke the libtool
-dnl setup macros if they do.  Keep this call together with the libtool setup
-dnl so that the arguments to configure will be together in configure --help.
-inn_use_libtool=no
-AC_ARG_ENABLE([libtool],
-    [AS_HELP_STRING([--enable-libtool],
-        [Use libtool for lib generation @<:@default=no@:>@])],
-    [if test x"$enableval" = xyes ; then
-        inn_use_libtool=yes
-    fi])
-if test x"$inn_use_libtool" = xyes ; then
-    LT_INIT
-    EXTLIB='la'
-    EXTOBJ='lo'
-    LIBTOOL='$(top)/libtool'
-    LIBTOOLCC='$(top)/libtool --mode=compile'
-    LIBTOOLINST='$(top)/libtool --mode=install'
-    LIBTOOLLD='$(top)/libtool --mode=link'
-    CCOUTPUT='-c -o $@ $<'
-else
-    EXTLIB='a'
-    EXTOBJ='o'
-    LIBTOOL=''
-    LIBTOOLCC=''
-    LIBTOOLINST=''
-    LIBTOOLLD=''
-    if test x"$compiler_c_o" = xyes ; then
-        CCOUTPUT='-c -o $@ $<'
-    else
-        CCOUTPUT='-c $< && if test x"$(@F)" != x"$@" ; then mv $(@F) $@ ; fi'
-    fi
-    AC_SUBST(LIBTOOL)
-fi
+dnl Configure libtool and set the variables that we used to use when we
+dnl supported builds without libtool.
+LT_INIT
+EXTLIB='la'
+EXTOBJ='lo'
+LIBTOOL='$(top)/libtool'
+LIBTOOLCC='$(top)/libtool --mode=compile'
+LIBTOOLINST='$(top)/libtool --mode=install'
+LIBTOOLLD='$(top)/libtool --mode=link'
+CCOUTPUT='-c -o $@ $<'
 AC_SUBST(EXTLIB)
 AC_SUBST(EXTOBJ)
 AC_SUBST(LIBTOOLCC)

Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod	2012-03-04 15:08:17 UTC (rev 9399)
+++ doc/pod/news.pod	2012-04-03 04:01:45 UTC (rev 9400)
@@ -110,6 +110,11 @@
 The name and location of the B<pullnews> configuration file is now
 F<pullnews.marks> in I<pathdb> (instead of F<.pullnews> in I<pathnews>).
 
+=item *
+
+Building with Libtool is no longer optional.  The B<--enable-libtool>
+option to B<configure> has been removed.
+
 =back
 
 =head1 Changes in 2.5.3



More information about the inn-committers mailing list