From 4818dab5964dddde93172d2552a7bd229645cf37 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sun, 27 Apr 2025 10:38:30 +0000
Subject:  New templated configure

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 configure | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index a5f37af..226b40d 100755
--- a/configure
+++ b/configure
@@ -147,7 +147,6 @@ libdir='$prefix/lib'
 includedir='$prefix/include'
 pkgconfdir='$prefix/lib/pkgconfig'
 shebangdir='$bindir'
-shebangisdefault=true
 sysdeps='$prefix/lib/skalibs/sysdeps'
 manualsysdeps=false
 shared=false
@@ -156,9 +155,6 @@ allpic=true
 slashpackage=false
 abspath=false
 pcw=false
-usensss=false
-pposix=false
-multicall=false
 sproot=
 home=
 exthome=
@@ -173,6 +169,10 @@ deplibpath=''
 vpaths=''
 vpathd=''
 build=
+shebangisdefault=true
+usensss=false
+pposix=false
+multicall=false
 
 for arg ; do
   case "$arg" in
@@ -185,10 +185,9 @@ for arg ; do
     --libdir=*) libdir=${arg#*=} ;;
     --includedir=*) includedir=${arg#*=} ;;
     --pkgconfigdir=*) pkgconfigdir=${arg#*=} ;;
-    --shebangdir=*) shebangisdefault=false ; shebangdir=${arg#*=} ;;
     --with-sysdeps=*) sysdeps=${arg#*=} manualsysdeps=true ;;
-    --with-include=*) var=${arg#*=} ; stripdir var ; addincpath="$addincpath -I$var" ;;
-    --with-lib=*) var=${arg#*=} ; stripdir var ; addlibspath="$addlibspath -L$var" ; vpaths="$vpaths $var" ;;
+    --with-include=*) var=${arg#*=} ; stripdir var ; addincpath="$addincpath -I$var" ; depincpath="${depincpath}${depincpath:+ }-I$var" ;;
+    --with-lib=*) var=${arg#*=} ; stripdir var ; addlibspath="$addlibspath -L$var" ; deplibpath="${deplibpath}${deplibpath:+ }-I$var" ; vpaths="$vpaths $var" ;;
     --with-dynlib=*) var=${arg#*=} ; stripdir var ; addlibdpath="$addlibdpath -L$var" ; vpathd="$vpathd $var" ;;
     --with-pkgconfig=*) pkgconf=${arg#*=} ;;
     --with-pkgconfig) pkgconf=${PKG_CONFIG:-pkg-config} ;;
@@ -210,6 +209,7 @@ for arg ; do
     --disable-slashpackage) sproot= ; slashpackage=false ;;
     --enable-absolute-paths|--enable-absolute-paths=yes) abspath=true ;;
     --disable-absolute-paths|--enable-absolute-paths=no) abspath=false ;;
+    --shebangdir=*) shebangisdefault=false ; shebangdir=${arg#*=} ;;
     --enable-nsss|--enable-nsss=yes) usensss=true ;;
     --disable-nsss|--enable-nsss=no) usensss=false ;;
     --enable-pedantic-posix|--enable-pedantic-posix=yes) pposix=true ;;
@@ -244,7 +244,7 @@ fi
 
 # Expand installation directories
 stripdir prefix
-for i in exec_prefix dynlibdir libexecdir bindir libdir includedir pkgconfdir shebangdir sysdeps sproot ; do
+for i in exec_prefix dynlibdir libexecdir bindir libdir includedir pkgconfdir sysdeps sproot shebangdir ; do
   eval tmp=\${$i}
   eval $i=$tmp
   stripdir $i
@@ -525,7 +525,6 @@ if $multicall ; then
 else
   echo "MULTICALL :="
 fi
-
 exec 1>&3 3>&-
 echo "  ... done."
 
@@ -562,4 +561,4 @@ fi
 echo
 echo "#endif"
 exec 1>&3 3>&-
-echo "  ... done."
+echo "  ... done."
\ No newline at end of file
-- 
cgit v1.3.1