diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2002-09-19 18:37:47 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2002-09-19 18:37:47 +0000 |
| commit | db51533e989372e38d0835c7b30e05f047204d80 (patch) | |
| tree | e247e8021a76417fd4e9de95ed2c95f9a2a529f4 /src/aclocal.m4 | |
| parent | 3c628fef39ebc6b7e0672ff4f64939e0c316e017 (diff) | |
| download | krb5-db51533e989372e38d0835c7b30e05f047204d80.zip krb5-db51533e989372e38d0835c7b30e05f047204d80.tar.gz krb5-db51533e989372e38d0835c7b30e05f047204d80.tar.bz2 | |
Use AC_CONFIG_FILES for each Makefile generated instead of passing
list of files to AC_OUTPUT.
Also, only generate an individual Makefile when invoking config.status
ticket: 1188
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14883 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/aclocal.m4')
| -rw-r--r-- | src/aclocal.m4 | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/aclocal.m4 b/src/aclocal.m4 index aa2da11..07b28dd 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -534,32 +534,32 @@ dnl dnl K5_GEN_MAKEFILE([dir, [frags]]) dnl define(K5_GEN_MAKEFILE,[dnl -ifelse($1, , x=., x="$1") -appendlist='' -ifelse($2, , ,[dnl -for i in $2 -do - appendlist=$appendlist:$ac_config_fragdir/$i.in -done]) -krb5_output_list="$krb5_output_list $x/Makefile:$krb5_pre_in:$x/Makefile.in$appendlist:$krb5_post_in"])dnl +ifelse($1, ,[_K5_GEN_MAKEFILE(.,$2)],[_K5_GEN_MAKEFILE($1,$2)]) +]) +dnl +dnl _K5_GEN_MAKEFILE(dir, [frags]) +dnl dir must be present in this case +dnl Note: Be careful in quoting. +dnl The ac_foreach generates the list of fragments to include +dnl or "" if $2 is empty +define(_K5_GEN_MAKEFILE,[dnl +AC_CONFIG_FILES([$1/Makefile:$krb5_pre_in:$1/Makefile.in]AC_FOREACH([FRAG], [$2], :$ac_config_fragdir/[FRAG].in)[:$krb5_post_in]) +]) dnl dnl K5_GEN_FILE( <ac_output arguments> ) dnl -define(K5_GEN_FILE,[krb5_output_list="$krb5_output_list $1"])dnl +define(K5_GEN_FILE,[AC_CONFIG_FILES($1)])dnl dnl dnl K5_AC_OUTPUT +dnl Note: Adds the variables to config.status for individual +dnl Makefile generation from config.statsu +define(K5_AC_OUTPUT,[dnl +AC_CONFIG_COMMANDS([krb5_config_prefix], [], dnl + [krb5_pre_in=$krb5_pre_in + ac_config_fragdir=$ac_config_fragdir + krb5_post_in=$krb5_post_in]) +AC_OUTPUT])dnl dnl -define(K5_AC_OUTPUT,[AC_OUTPUT($krb5_output_list)])dnl -dnl -dnl V5_OUTPUT_MAKEFILE -dnl -define(V5_AC_OUTPUT_MAKEFILE, -[ifelse($1, , ac_v5_makefile_dirs=., ac_v5_makefile_dirs="$1") -ifelse($2, , filelist="", filelist="$2") -for x in $ac_v5_makefile_dirs; do - filelist="$filelist $x/Makefile:$krb5_prepend_frags:$x/Makefile.in:$krb5_append_frags" -done -AC_OUTPUT($filelist)])dnl dnl dnl KRB5_SOCKADDR_SA_LEN: define HAVE_SA_LEN if sockaddr contains the sa_len dnl component @@ -709,7 +709,7 @@ AC_TRY_RUN([ #include <regex.h> regex_t x; regmatch_t m; int main() { return regcomp(&x,"pat.*",0) || regexec(&x,"pattern",1,&m,0); } -], ac_cv_func_regcomp=yes, ac_cv_func_regcomp=no, AC_ERROR([Cannot test regcomp when cross compiling]))]) +], ac_cv_func_regcomp=yes, ac_cv_func_regcomp=no, AC_MSG_ERROR([Cannot test regcomp when cross compiling]))]) AC_MSG_RESULT($ac_cv_func_regcomp) test $ac_cv_func_regcomp = yes && AC_DEFINE(HAVE_REGCOMP,1,[Define if regcomp exists and functions]) dnl |