Prepare for 1.1.3.0, templated configure, pkg-config support, etc.

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

10 files changed, 72 insertions, 0 deletions

diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
new file mode 100644
index 0000000..27ef208
--- /dev/null
+++ b/package/configure-snippets/configure_case_lines
@@ -0,0 +1,7 @@
+    --skeldir=*) skeldir=${arg#*=} ;;
+    --tmpfsdir=*) tmpfsdir=${arg#*=} ;;
+    --scandir=*) scandir=${arg#*=} ;;
+    --enable-nsss|--enable-nsss=yes) usensss=true ;;
+    --disable-nsss|--enable-nsss=no) usensss=false ;;
+    --enable-utmps|--enable-utmps=yes) utmps=true ;;
+    --disable-utmps|--enable-utmps=no) utmps=false ;;
diff --git a/package/configure-snippets/configure_expand_dirs b/package/configure-snippets/configure_expand_dirs
new file mode 100644
index 0000000..9eab6de
--- /dev/null
+++ b/package/configure-snippets/configure_expand_dirs
@@ -0,0 +1 @@
+tmpfsdir skeldir
diff --git a/package/configure-snippets/configure_extra_checks b/package/configure-snippets/configure_extra_checks
new file mode 100644
index 0000000..eeb117e
--- /dev/null
+++ b/package/configure-snippets/configure_extra_checks
@@ -0,0 +1,28 @@
+isprefix () {
+  case "$1" in "$2"*) return 0 ;; *) return 1 ;; esac ;
+}
+
+getmacro () {
+  echo "#include <$1>" | $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST -E -dM - | grep -F -- "$2" | cut -d' ' -f3-
+}
+
+getmacrostring () {
+  getmacro "$1" "$2" | sed -e 's/^"//' -e 's/"$//'
+}
+
+if $utmps ; then
+  echo "Sanity checking cross-package configuration..."
+  p=`getmacrostring utmps/config.h UTMPS_UTMPD_PATH`
+  if isprefix "$p" "$tmpfsdir"/ ; then : ; else
+    echo "UTMPS_UTMPD_PATH has been configured as $p which is not located under $tmpfsdir"
+    exit 1
+  fi
+  utmpd_path=${p##${tmpfsdir}/}
+  p=`getmacrostring utmps/config.h UTMPS_WTMPD_PATH`
+  if isprefix "$p" "$tmpfsdir"/ ; then : ; else
+    echo "UTMPS_WTMPD_PATH has been configured as $p which is not located under $tmpfsdir"
+    exit 1
+  fi
+  wtmpd_path=${p##${tmpfsdir}/}
+  echo "  ... ok"
+fi
diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh
new file mode 100644
index 0000000..33d9db9
--- /dev/null
+++ b/package/configure-snippets/configure_generate_configh
@@ -0,0 +1,10 @@
+echo "#define ${package_macro_name}_SKELDIR \"$skeldir\""
+echo "#define ${package_macro_name}_TMPFS \"$tmpfsdir\""
+echo "#define ${package_macro_name}_SCANDIR \"$scandir\""
+echo
+echo "#undef ${package_macro_name}_UTMPD_PATH"
+echo "#undef ${package_macro_name}_WTMPD_PATH"
+if $utmps ; then
+  echo "#define ${package_macro_name}_UTMPD_PATH \"$utmpd_path\""
+  echo "#define ${package_macro_name}_WTMPD_PATH \"$wtmpd_path\""
+fi
diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make
new file mode 100644
index 0000000..8fe274d
--- /dev/null
+++ b/package/configure-snippets/configure_generate_make
@@ -0,0 +1,12 @@
+if $usensss ; then
+  echo "LIBNSSS := -lnsss"
+  echo "MAYBEPTHREAD_LIB := -lpthread"
+else
+  echo "LIBNSSS :="
+  echo "MAYBEPTHREAD_LIB :="
+fi
+if $utmps ; then
+  echo "LIBUTMPS := -lutmps"
+else
+  echo "LIBUTMPS :="
+fi
diff --git a/package/configure-snippets/configure_help_dependencies b/package/configure-snippets/configure_help_dependencies
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_help_dependencies
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install
new file mode 100644
index 0000000..8b4a2b5
--- /dev/null
+++ b/package/configure-snippets/configure_help_install
@@ -0,0 +1,4 @@
+  --skeldir=DIR                 script skeleton files [PREFIX/etc/s6-linux-init/skel]
+  --tmpfsdir=DIR                assume the initial tmpfs will be mounted on DIR [/run]
+  --scandir=DIR                 use tmpfsdir/DIR as the s6-svscan directory [service]
+
diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options
new file mode 100644
index 0000000..169a3b4
--- /dev/null
+++ b/package/configure-snippets/configure_help_options
@@ -0,0 +1,3 @@
+  --enable-nsss                 use the nsss library for user information [disabled]
+  --enable-utmps                link against the utmps library [disabled]
+
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
new file mode 100644
index 0000000..3cecc5b
--- /dev/null
+++ b/package/configure-snippets/configure_init_vars
@@ -0,0 +1,5 @@
+skeldir='$prefix/etc/s6-linux-init/skel'
+tmpfsdir=/run
+scandir=service
+usensss=false
+utmps=false
diff --git a/package/configure-snippets/configure_slashpackage_other b/package/configure-snippets/configure_slashpackage_other
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_slashpackage_other
@@ -0,0 +1 @@
+