From bf8e740cf9792347bde468b424f10b2c1e0245ab Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 15 Dec 2014 23:48:32 +0000
Subject:  Fix include order in Makefile, remove gcc warning

---
 configure | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 917a7f4..16590e5 100755
--- a/configure
+++ b/configure
@@ -32,6 +32,8 @@ Dependencies:
   --with-dynlib=DIR             add DIR to the list of searched directories for shared libraries
 
 Optional features:
+  --enable-shared               build shared libraries [disabled]
+  --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]
   --enable-slashpackage[=ROOT]  assume /package installation at ROOT [disabled]
@@ -342,9 +344,19 @@ if $allstatic ; then
   vpathd=
 fi
   echo "vpath lib%.so$vpathd"
-echo
-$static || echo "STATIC_LIBS :="
-$shared || echo "SHARED_LIBS :="
+echo "STATIC_LIBS :="
+echo "SHARED_LIBS :="
+if $static ; then
+  echo "DO_STATIC := 1"
+else
+  echo "DO_STATIC :="
+fi
+if $shared ; then
+  echo "DO_SHARED := 1"
+else
+  echo "DO_SHARED :="
+fi
+
 exec 1>&3 3>&-
 echo "  ... done."
 
@@ -362,13 +374,13 @@ cat <<EOF
 #define ${package_macro_name}_VERSION "$version"
 EOF
 if $slashpackage ; then
-  echo "#define ${package_macro_name}_BINPREFIX \"$binprefix\""
-  echo "#define ${package_macro_name}_EXTBINPREFIX \"$extbinprefix\""
-  echo "#define ${package_macro_name}_LIBEXECPREFIX \"$binprefix\""
+  echo "#define ${package_macro_name}_BINPREFIX \"$binprefix/\""
+  echo "#define ${package_macro_name}_EXTBINPREFIX \"$extbinprefix/\""
+  echo "#define ${package_macro_name}_LIBEXECPREFIX \"$binprefix/\""
 else
   echo "#define ${package_macro_name}_BINPREFIX \"\""
   echo "#define ${package_macro_name}_EXTBINPREFIX \"\""
-  echo "#define ${package_macro_name}_LIBEXECPREFIX \"$libexecdir\""
+  echo "#define ${package_macro_name}_LIBEXECPREFIX \"$libexecdir/\""
 fi
 echo
 echo "#endif"
-- 
cgit 1.4.1