diff options
| author | Francis Dupont <fdupont@isc.org> | 2016-10-06 20:45:50 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2016-10-06 20:45:50 +0200 |
| commit | bf6f8fcee913200e4c87bb660824c270e3aa8804 (patch) | |
| tree | 4d54aadebf146c68ba3a95976964bba1fb3e2519 /configure.ac-base | |
| parent | d113bc2ca69a6f6a33139c3708a4ea6818605b69 (diff) | |
| download | isc-dhcp-bf6f8fcee913200e4c87bb660824c270e3aa8804.tar.gz | |
Almost done (still aestetic fixes and of course doc, doc, doc)
Diffstat (limited to 'configure.ac-base')
| -rw-r--r-- | configure.ac-base | 44 |
1 files changed, 34 insertions, 10 deletions
diff --git a/configure.ac-base b/configure.ac-base index 4b109ced..347c8568 100644 --- a/configure.ac-base +++ b/configure.ac-base @@ -7,7 +7,7 @@ AC_CONFIG_MACRO_DIR([m4]) # we specify "foreign" to avoid having to have the GNU mandated files, # like AUTHORS, COPYING, and such -AM_INIT_AUTOMAKE([foreign subdir-objects]) +AM_INIT_AUTOMAKE([foreign]) # we specify AM_MAINTAINER_MODE to avoid problems with rebuilding # the configure and makefiles. Without it users doing things that @@ -805,13 +805,6 @@ AC_SUBST(BINDLIBISCDIR) AC_SUBST(DISTCHECK_LIBBIND_CONFIGURE_FLAG) AM_CONDITIONAL(HAVE_BINDDIR, test "$use_libbind" = "no") -AC_ARG_ENABLE(bind_install, - AS_HELP_STRING([--enable-bind-install],[install bind includes and libraries (default is no).])) -if test "$enable_bind_install" = "yes" -a "$use_libbind" != "no"; then - AC_MSG_WARN([--enable-bind-install does nothing when --with-libbind is set]) -fi -AM_CONDITIONAL(INSTALL_BIND, test "$enable_bind_install" = "yes") - # # GNU libtool support # @@ -832,8 +825,9 @@ want_libtool="yes" @END WITH LIBTOOL BINDLT= +DISTCHECK_LIBTOOL_CONFIGURE_FLAG= AC_ARG_ENABLE(libtool, - AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $default_libtool).]), + AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $want_libtool).]), want_libtool="$enableval") @BEGIN WITH LIBTOOL @@ -843,7 +837,8 @@ fi DHLIBS=LTLIBRARIES A=la -BINDLT=--with-libtool +BINDLT="--with-libtool --disable-symtable" +DISTCHECK_LIBTOOL_CONFIGURE_FLAG="--enable-libtool" @END WITH LIBTOOL @BEGIN WITHOUT LIBTOOL @@ -867,6 +862,35 @@ A=a AC_SUBST(DHLIBS) AC_SUBST(A) AC_SUBST(BINDLT) +AC_SUBST(DISTCHECK_LIBTOOL_CONFIGURE_FLAG) + +# quoting in Makefile.am.in +Q=@ +AC_SUBST(Q) + +# install bind includes and libraries + +want_install_bind="no" +@BEGIN WITH LIBTOOL +want_install_bind="yes" +@END WITH LIBTOOL +if test "$want_libtool" = "yes"; then + want_install_bind="yes" +fi +if test "$use_libbind" != "no"; then + want_install_bind="no" +fi +AC_ARG_ENABLE(bind_install, + AS_HELP_STRING([--enable-bind-install],[install bind includes and libraries (default is $want_install_bind).]), + want_install_bind="$enableval") +if test "$want_install_bind" = "yes"; then + if test "$use_libbind" != "no"; then + AC_MSG_WARN([--enable-bind-install does nothing when --with-libbind is set]) + fi +elif test "$want_libtool" = "yes" -a "$use_libbind" = "no"; then + AC_MSG_WARN([embedded dynamic bind libraries must be installed]) +fi +AM_CONDITIONAL(INSTALL_BIND, test "$want_install_bind" = "yes") # OpenLDAP support. AC_ARG_WITH(ldap, |