Test _XOPEN_SOURCE=700, fix include order in Makefile

1 files changed, 17 insertions, 7 deletions

diff --git a/configure b/configure
index 455559f..0647be0 100755
--- a/configure
+++ b/configure
@@ -344,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."
 
@@ -364,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"