From 3a48217b193d683f66141067bee13f206172920e Mon Sep 17 00:00:00 2001 From: Herwin Weststrate Date: Tue, 6 Dec 2016 20:52:42 +0100 Subject: [PATCH] Fixed compilation problems with rlm_lua When building the debian package, no configuration is tried for rlm_lua, because it isn't listed in the stable modules. But because the folder contains a file called all.mk, the build process still tries to build it and fails. Quick and dirty solution: move all.mk to all.mk.in. --- src/modules/rlm_lua/.gitignore | 1 + src/modules/rlm_lua/{all.mk => all.mk.in} | 0 src/modules/rlm_lua/configure | 3 ++- src/modules/rlm_lua/configure.ac | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) rename src/modules/rlm_lua/{all.mk => all.mk.in} (100%) diff --git a/src/modules/rlm_lua/.gitignore b/src/modules/rlm_lua/.gitignore index 24c4bfe6c39..ca29c658519 100644 --- a/src/modules/rlm_lua/.gitignore +++ b/src/modules/rlm_lua/.gitignore @@ -1,3 +1,4 @@ Makefile +all.mk rlm_lua.mk libfreeradius-lua.mk diff --git a/src/modules/rlm_lua/all.mk b/src/modules/rlm_lua/all.mk.in similarity index 100% rename from src/modules/rlm_lua/all.mk rename to src/modules/rlm_lua/all.mk.in diff --git a/src/modules/rlm_lua/configure b/src/modules/rlm_lua/configure index 293b015d404..473dd859346 100755 --- a/src/modules/rlm_lua/configure +++ b/src/modules/rlm_lua/configure @@ -4483,7 +4483,7 @@ ac_config_headers="$ac_config_headers config.h" unset ac_cv_env_LIBS_set unset ac_cv_env_LIBS_value -ac_config_files="$ac_config_files rlm_lua.mk libfreeradius-lua.mk" +ac_config_files="$ac_config_files all.mk rlm_lua.mk libfreeradius-lua.mk" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -5175,6 +5175,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "all.mk") CONFIG_FILES="$CONFIG_FILES all.mk" ;; "rlm_lua.mk") CONFIG_FILES="$CONFIG_FILES rlm_lua.mk" ;; "libfreeradius-lua.mk") CONFIG_FILES="$CONFIG_FILES libfreeradius-lua.mk" ;; diff --git a/src/modules/rlm_lua/configure.ac b/src/modules/rlm_lua/configure.ac index 2103d807eb4..33bafe04bb0 100644 --- a/src/modules/rlm_lua/configure.ac +++ b/src/modules/rlm_lua/configure.ac @@ -123,5 +123,5 @@ AC_SUBST(lua_ldflags) AC_SUBST(targetname) # keep this! Don't change! AC_CONFIG_HEADER(config.h) -AC_OUTPUT([rlm_lua.mk libfreeradius-lua.mk]) # keep this! Don't change! +AC_OUTPUT([all.mk rlm_lua.mk libfreeradius-lua.mk]) # keep this! Don't change! -- 2.47.3