diff --git a/configure.ac b/configure.ac index 7c32b987f..3003a216b 100644 --- a/configure.ac +++ b/configure.ac @@ -1410,6 +1410,15 @@ AC_HELP_STRING([--with-magic-libs=[[[DIR]]]], [Path to magic library directory]) MAGIC_LDFLAGS="-L$withval" ], []) +AC_ARG_WITH(magic-file, +AC_HELP_STRING([--with-magic-file=[[[FILE]]]], [Path to magic database file]), +[ + MAGIC_FILE="$withval" + RB_DEFINE_UNQUOTED([MAGIC_FILE], ["$MAGIC_FILE"], [Magic file path]) +], [ + RB_DEFINE_UNQUOTED([MAGIC_FILE], [""], [Magic file path]) +]) + RB_CHK_SYSHEADER(magic.h, [MAGIC_H]) AC_CHECK_LIB(magic, magic_version, [ diff --git a/ircd/magic.cc b/ircd/magic.cc index 76b0f25cd..46fa65816 100644 --- a/ircd/magic.cc +++ b/ircd/magic.cc @@ -38,8 +38,13 @@ ircd::magic::version_abi decltype(ircd::magic::file_path) ircd::magic::file_path { - { "name", "ircd.magic.file" }, - { "default", getenv("MAGIC") }, + { "name", "ircd.magic.file" }, + { + "default", + getenv("MAGIC")? + getenv("MAGIC"): + RB_MAGIC_FILE + }, }; decltype(ircd::magic::fallback_paths)