[pkgsrc/trunk]: pkgsrc/mk/configure Introduce HAS_CONFIGURE_LIBDIR and GNU_CO...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b454f22eed4b
branches:  trunk
changeset: 629825:b454f22eed4b
user:      obache <obache%pkgsrc.org@localhost>
date:      Tue Jan 28 11:32:30 2014 +0000

description:
Introduce HAS_CONFIGURE_LIBDIR and GNU_CONFIGURE_LIBDIR for gnu configure
--libdir handling, same as for --mandir and --infodir.

Currently, HAS_CONFIGURE_LIBDIR=no by default unless libdir related variables
are set, but it will be switched to "yes" after all packages have been checked
(and SET_LIBDIR will be deprecated).

diffstat:

 mk/configure/gnu-configure.mk |  22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r e620ba6f2702 -r b454f22eed4b mk/configure/gnu-configure.mk
--- a/mk/configure/gnu-configure.mk     Tue Jan 28 10:53:43 2014 +0000
+++ b/mk/configure/gnu-configure.mk     Tue Jan 28 11:32:30 2014 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: gnu-configure.mk,v 1.15 2013/08/31 20:22:49 rillig Exp $
+# $NetBSD: gnu-configure.mk,v 1.16 2014/01/28 11:32:30 obache Exp $
 
 _VARGROUPS+=                   gnu-configure
 _USER_VARS.gnu-configure=      # none
 _PKG_VARS.gnu-configure=       GNU_CONFIGURE GNU_CONFIGURE_PREFIX \
        SET_LIBDIR GNU_CONFIGURE_LIBSUBDIR \
-       GNU_CONFIGURE_INFODIR GNU_CONFIGURE_MANDIR \
-       CONFIGURE_HAS_MANDIR CONFIGURE_HAS_INFODIR \
+       GNU_CONFIGURE_LIBDIR GNU_CONFIGURE_INFODIR GNU_CONFIGURE_MANDIR \
+       CONFIGURE_HAS_LIBDIR CONFIGURE_HAS_MANDIR CONFIGURE_HAS_INFODIR \
        OVERRIDE_DIRDEPTH.configure \
        USE_GNU_CONFIGURE_HOST
 
@@ -29,10 +29,20 @@
 GNU_CONFIGURE_PREFIX?= ${PREFIX}
 CONFIGURE_ARGS+=       --prefix=${GNU_CONFIGURE_PREFIX:Q}
 
+.if (defined(SET_LIBDIR) && !empty(SET_LIBDIR)) || \
+       (defined(GNU_CONFIGURE_LIBDIR) && !empty(GNU_CONFIGURE_LIBDIR)) || \
+       (defined(GNU_CONFIGURE_LIBSUBDIR) && !empty(GNU_CONFIGURE_LIBSUBDIR))
+CONFIGURE_HAS_LIBDIR=  yes
+.else
+CONFIGURE_HAS_LIBDIR?= no
+.endif
 .if defined(GNU_CONFIGURE_LIBSUBDIR) && !empty(GNU_CONFIGURE_LIBSUBDIR)
-CONFIGURE_ARGS+=       --libdir=${GNU_CONFIGURE_PREFIX}/lib/${GNU_CONFIGURE_LIBSUBDIR}
-.elif defined(SET_LIBDIR) && !empty(SET_LIBDIR)
-CONFIGURE_ARGS+=       --libdir=${GNU_CONFIGURE_PREFIX}/lib
+GNU_CONFIGURE_LIBDIR?= ${GNU_CONFIGURE_PREFIX}/lib/${GNU_CONFIGURE_LIBSUBDIR}
+.else
+GNU_CONFIGURE_LIBDIR?= ${GNU_CONFIGURE_PREFIX}/lib
+.endif
+.if !empty(CONFIGURE_HAS_LIBDIR:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+=       --libdir=${GNU_CONFIGURE_LIBDIR}
 .endif
 
 USE_GNU_CONFIGURE_HOST?=       yes