Prepare for 0.2.1.0, pkg-config support

Signed-off-by: Laurent Bercot <ska@appnovation.com>

1 files changed, 11 insertions, 8 deletions

diff --git a/configure b/configure
index 7e01d5f..0167a84 100755
--- a/configure
+++ b/configure
@@ -43,11 +43,10 @@ Optional features:
   --disable-static              do not build static libraries [enabled]
   --disable-allstatic           do not prefer linking against static libraries [enabled]
   --enable-static-libc          make entirely static binaries [disabled]
-  --disable-all-pic             don't build executables or static libs as PIC [enabled]
+  --disable-all-pic             do not build executables or static libs as PIC [enabled]
+  --enable-pkgconfig            Build and install .pc files for pkg-config [disabled]
   --enable-slashpackage[=ROOT]  assume /package installation at ROOT [disabled]
   --enable-absolute-paths       hardcode absolute BINDIR/foobar paths in binaries [disabled]
-  --enable-pkgconfig            Build and install .pc files for pkg-config [disabled]
-
   --with-nsssd-socket=PATH      assume the nsssd socket is at PATH [/run/service/nsssd/s]
   --enable-libc-includes        overwrite {pwd,grp,shadow}.h in includedir [disabled]
 
@@ -145,6 +144,7 @@ bindir='$exec_prefix/bin'
 libdir='$prefix/lib'
 includedir='$prefix/include'
 pkgconfdir='$prefix/lib/pkgconfig'
+shebangdir='$bindir'
 sysdeps='$prefix/lib/skalibs/sysdeps'
 manualsysdeps=false
 shared=false
@@ -182,8 +182,8 @@ for arg ; do
     --includedir=*) includedir=${arg#*=} ;;
     --pkgconfigdir=*) pkgconfigdir=${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} ;;
@@ -209,6 +209,7 @@ for arg ; do
     --disable-libc-includes|--enable-libc-includes=no) libcincludes=false ;;
     --with-nsssd-socket=*) nsssdpath=${arg#*=} ;;
     --enable-*|--disable-*|--with-*|--without-*|--*dir=*) ;;
+    --enable-*|--disable-*|--with-*|--without-*|--*dir=*) ;;
     --host=*|--target=*) target=${arg#*=} ;;
     --build=*) build=${arg#*=} ;;
     -* ) echo "$0: unknown option $arg" ;;
@@ -235,7 +236,7 @@ fi
 
 # Expand installation directories
 stripdir prefix
-for i in exec_prefix dynlibdir libexecdir bindir libdir includedir pkgconfdir sysdeps sproot ; do
+for i in exec_prefix dynlibdir libexecdir bindir libdir includedir pkgconfdir sysdeps sproot  ; do
   eval tmp=\${$i}
   eval $i=$tmp
   stripdir $i
@@ -244,7 +245,7 @@ done
 # Process deps-build
 if test -n "$pkgconf" || $pcw || $slashpackage ; then
   oldifs="$IFS"
-  while IFS=" 	" read cond usedinlibs pkg ver libs ; do
+  while IFS="	" read cond usedinlibs pkg ver libs ; do
     IFS="$oldifs"
     eval "cond=$cond; usedinlibs=$usedinlibs"
     if $cond ; then
@@ -304,6 +305,7 @@ if $slashpackage ; then
   libexecdir=$bindir
   includedir=${home}/include
   pkgconfdir=${home}/pkgconfig
+
 fi
 
 # Get usable temp filenames
@@ -474,6 +476,7 @@ if $allstatic ; then
   echo "DO_ALLSTATIC := 1"
 else
   echo ".LIBPATTERNS := lib%.so"
+  echo "DO_ALLSTATIC :="
 fi
 if $static ; then
   echo "DO_STATIC := 1"
@@ -531,4 +534,4 @@ echo "#define ${package_macro_name}_NSSSD_PATH \"$nsssdpath\""
 echo
 echo "#endif"
 exec 1>&3 3>&-
-echo "  ... done."
+echo "  ... done."
\ No newline at end of file