mirror of
https://github.com/matrix-construct/construct
synced 2024-06-08 13:08:56 +02:00
cofngiure: Reorg installation path section; add more output.
This commit is contained in:
parent
26b36d4740
commit
e7f2a5c1f6
115
configure.ac
115
configure.ac
|
@ -1119,8 +1119,12 @@ dnl
|
||||||
dnl Installation Layout
|
dnl Installation Layout
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
|
AC_PREFIX_DEFAULT([/usr])
|
||||||
|
AC_PREFIX_PROGRAM([/usr])
|
||||||
|
|
||||||
PKG_PROG_PKG_CONFIG
|
PKG_PROG_PKG_CONFIG
|
||||||
|
|
||||||
|
AC_SUBST_DIR([prefix])
|
||||||
if test "$prefix" = "NONE"; then
|
if test "$prefix" = "NONE"; then
|
||||||
prefix="$ac_default_prefix"
|
prefix="$ac_default_prefix"
|
||||||
else
|
else
|
||||||
|
@ -1130,7 +1134,6 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
RB_DEFINE_UNQUOTED(PREFIX, ["$prefix"], [Prefix of IRCd install])
|
RB_DEFINE_UNQUOTED(PREFIX, ["$prefix"], [Prefix of IRCd install])
|
||||||
AC_SUBST_DIR([prefix])
|
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl bindir
|
dnl bindir
|
||||||
|
@ -1139,6 +1142,13 @@ dnl
|
||||||
AC_SUBST_DIR([bindir])
|
AC_SUBST_DIR([bindir])
|
||||||
RB_DEFINE_UNQUOTED([BIN_DIR], ["$bindir"], [Directory where binary executables are to be found.])
|
RB_DEFINE_UNQUOTED([BIN_DIR], ["$bindir"], [Directory where binary executables are to be found.])
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl Check for --with-confdir [deprecated, use --sysconfdir instead]
|
||||||
|
dnl
|
||||||
|
|
||||||
|
AC_SUBST_DIR([sysconfdir])
|
||||||
|
RB_DEFINE_UNQUOTED([CONF_DIR], ["$sysconfdir"], [Prefix where config files are installed.])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl includedir
|
dnl includedir
|
||||||
dnl
|
dnl
|
||||||
|
@ -1154,26 +1164,66 @@ AC_SUBST_DIR([libdir])
|
||||||
RB_DEFINE_UNQUOTED([LIB_DIR], ["$libdir"], [Prefix where libs are installed.])
|
RB_DEFINE_UNQUOTED([LIB_DIR], ["$libdir"], [Prefix where libs are installed.])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl localstatedir
|
dnl Check for --with-moduledir
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
dnl Avoid name collisions.
|
AC_SUBST_DIR([moduledir])
|
||||||
AC_SUBST_DIR([localstatedir])
|
AC_MSG_CHECKING([whether to modify moduledir])
|
||||||
RB_DEFINE_UNQUOTED([LOCALSTATE_DIR], ["$localstatedir"], [Prefix where db and logs go.])
|
AC_ARG_WITH(moduledir, [AC_HELP_STRING([--with-moduledir=DIR], [Directory to install modules.])],
|
||||||
|
[
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
moduledir=`echo $withval | sed 's/\/$//'`
|
||||||
|
], [
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
moduledir="${libdir}/modules/${PACKAGE_TARNAME}"
|
||||||
|
])
|
||||||
|
|
||||||
|
RB_DEFINE_UNQUOTED([MODULE_DIR], ["$moduledir"], [Prefix where modules are installed.])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Check for --with-confdir [deprecated, use --sysconfdir instead]
|
dnl datarootdir
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_SUBST_DIR([sysconfdir])
|
AC_SUBST_DIR([datarootdir])
|
||||||
RB_DEFINE_UNQUOTED([CONF_DIR], ["$sysconfdir"], [Prefix where config files are installed.])
|
RB_DEFINE_UNQUOTED([DATAROOT_DIR], ["$datarootdir"], [Directory where read-only assets go.])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl datadir
|
dnl datadir
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_SUBST_DIR([datadir])
|
AC_SUBST_DIR([datadir])
|
||||||
RB_DEFINE_UNQUOTED([DATA_DIR], ["$datadir/${PACKAGE_TARNAME}"], [Directory where read-only assets go.])
|
|
||||||
|
if test "x$datarootdir" = "x$datadir"; then
|
||||||
|
datadir="$datarootdir/${PACKAGE_TARNAME}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
RB_DEFINE_UNQUOTED([DATA_DIR], ["$datadir"], [Directory where read-only assets go.])
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl Check for --with-webappdir
|
||||||
|
dnl
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([whether to modify webappdir])
|
||||||
|
AC_ARG_WITH(webappdir, [AC_HELP_STRING([--with-webappdir=DIR], [Directory to install served assets])],
|
||||||
|
[
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
webappdir=`echo $withval | sed 's/\/$//'`
|
||||||
|
], [
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
webappdir="${datadir}/webapp"
|
||||||
|
])
|
||||||
|
|
||||||
|
RB_DEFINE_UNQUOTED([WEBAPP_DIR], ["$webappdir"], [Prefix where website assets are served from.])
|
||||||
|
AC_SUBST_DIR([webappdir])
|
||||||
|
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl localstatedir
|
||||||
|
dnl
|
||||||
|
|
||||||
|
dnl Avoid name collisions.
|
||||||
|
AC_SUBST_DIR([localstatedir])
|
||||||
|
RB_DEFINE_UNQUOTED([LOCALSTATE_DIR], ["$localstatedir"], [Prefix where db and logs go.])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Check for --with-dbdir
|
dnl Check for --with-dbdir
|
||||||
|
@ -1210,38 +1260,12 @@ RB_DEFINE_UNQUOTED([LOG_DIR], ["$logdir"], [Prefix where to write logfiles.])
|
||||||
AC_SUBST_DIR([logdir])
|
AC_SUBST_DIR([logdir])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Check for --with-moduledir
|
dnl runstatedir
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to modify moduledir])
|
AC_SUBST_DIR([runstatedir])
|
||||||
AC_ARG_WITH(moduledir, [AC_HELP_STRING([--with-moduledir=DIR], [Directory to install modules.])],
|
runstatedir="$runstatedir/${PACKAGE_TARNAME}"
|
||||||
[
|
RB_DEFINE_UNQUOTED([RUN_DIR], ["$runstatedir"], [Prefix where runtime ephemeral files go.])
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
moduledir=`echo $withval | sed 's/\/$//'`
|
|
||||||
], [
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
moduledir="${libdir}/modules/${PACKAGE_TARNAME}"
|
|
||||||
])
|
|
||||||
|
|
||||||
RB_DEFINE_UNQUOTED([MODULE_DIR], ["$moduledir"], [Prefix where modules are installed.])
|
|
||||||
AC_SUBST_DIR([moduledir])
|
|
||||||
|
|
||||||
dnl
|
|
||||||
dnl Check for --with-webappdir
|
|
||||||
dnl
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to modify webappdir])
|
|
||||||
AC_ARG_WITH(webappdir, [AC_HELP_STRING([--with-webappdir=DIR], [Directory to install served assets])],
|
|
||||||
[
|
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
webappdir=`echo $withval | sed 's/\/$//'`
|
|
||||||
], [
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
webappdir="${datadir}/webapp"
|
|
||||||
])
|
|
||||||
|
|
||||||
RB_DEFINE_UNQUOTED([WEBAPP_DIR], ["$webappdir"], [Prefix where website assets are served from.])
|
|
||||||
AC_SUBST_DIR([webappdir])
|
|
||||||
|
|
||||||
|
|
||||||
dnl ***************************************************************************
|
dnl ***************************************************************************
|
||||||
|
@ -2213,7 +2237,18 @@ echo "LLVM library support .............. $have_libllvm"
|
||||||
echo "Linux AIO support ................. $aio"
|
echo "Linux AIO support ................. $aio"
|
||||||
echo "Linux io_uring support ............ $io_uring"
|
echo "Linux io_uring support ............ $io_uring"
|
||||||
echo "Logging level ..................... $LOG_LEVEL"
|
echo "Logging level ..................... $LOG_LEVEL"
|
||||||
echo "Installing into ................... $prefix"
|
echo "Install Prefix .................... $prefix"
|
||||||
|
echo "Binary directory .................. $bindir"
|
||||||
|
echo "Config directory .................. $sysconfdir"
|
||||||
|
echo "Include directory ................. $includedir"
|
||||||
|
echo "Library directory ................. $libdir"
|
||||||
|
echo "Modules directory ................. $moduledir"
|
||||||
|
echo "Shared dataroot directory ..,...... $datarootdir"
|
||||||
|
echo "Shared data directory ..,.......... $datadir"
|
||||||
|
echo "Webapp directory .................. $webappdir"
|
||||||
|
echo "Runtime state directory ........... $runstatedir"
|
||||||
|
echo "Database directory ................ $dbdir"
|
||||||
|
echo "Logging directory ................. $logdir"
|
||||||
echo
|
echo
|
||||||
echo "* Ready to build $PACKAGE_NAME"
|
echo "* Ready to build $PACKAGE_NAME"
|
||||||
echo "* Now run 'make'"
|
echo "* Now run 'make'"
|
||||||
|
|
Loading…
Reference in a new issue