diff options
Diffstat (limited to 'am/grecs.m4')
-rw-r--r-- | am/grecs.m4 | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/am/grecs.m4 b/am/grecs.m4 index e8d6915..81a6ee5 100644 --- a/am/grecs.m4 +++ b/am/grecs.m4 @@ -66,18 +66,19 @@ AC_DEFUN([_GRECS_SET_OPTIONS], # given. # # If neither std-pp-setup option, nor pp-setup-file argument are supplied, # no preprocessor setup file is installed. AC_DEFUN([GRECS_SETUP],[ + m4_pushdef([grecsdir],m4_if($1,[.],,$1,,[grecs/],$1/)) AC_PROG_YACC AM_PROG_LEX AC_HEADER_SYS_WAIT - AC_SUBST([GRECS_SUBDIR],m4_if([$1],,grecs,$1)) + AC_SUBST([GRECS_SUBDIR],m4_if($1,,grecs,$1)) _GRECS_SET_OPTIONS([$2]) # ********************** # Preprocessor # ********************** _GRECS_IF_OPTION_SET([no-preproc], [use_ext_pp=no], @@ -131,13 +132,13 @@ AC_DEFUN([GRECS_SETUP],[ PATH=$save_PATH DEFAULT_PREPROCESSOR="\\\"$DEFAULT_PREPROCESSOR\\\"" else DEFAULT_PREPROCESSOR=NULL fi _GRECS_IF_OPTION_SET([tests], - [m4_pushdef([TESTDIR],m4_if([$1],,grecs,$1)/tests) + [m4_pushdef([TESTDIR],grecsdir[tests]) AC_CONFIG_TESTDIR(TESTDIR) AC_CONFIG_FILES(TESTDIR/Makefile TESTDIR/atlocal) m4_popdef([TESTDIR]) AM_MISSING_PROG([AUTOM4TE], [autom4te]) GRECS_TESTDIR=tests ]) @@ -150,29 +151,36 @@ AC_DEFUN([GRECS_SETUP],[ # Make sure package versioning is compatible with vercmp.at: s=`echo $PACKAGE_VERSION | sed 's/[0-9][0-9]*\.[0-9][0-9]*\(\.[0-9][0-9]\)\?\([^a-zA-Z_0-9].*\)\?//'` if test -z "$s"; then GRECS_VERCMP_AT=vercmp.at fi - + + AC_SUBST([GRECS_SRCDIR],$1) AC_SUBST([GRECS_VERCMP_AT]) AC_SUBST([GRECS_BUILD_AUX]) AC_SUBST([GRECS_INCLUDES]) AC_SUBST([GRECS_TESTDIR]) AC_SUBST([GRECS_LDADD]) AC_SUBST([GRECS_DOCDIR]) + AC_SUBST([GRECS_CHANGELOG]) + AC_SUBST([GRECS_INCLUDES],['-I$(top_srcdir)/]grecsdir[src]') _GRECS_OPTION_SWITCH([install],[ LT_INIT - GRECS_LDADD='$(top_builddir)/m4_if([$1],,grecs,$1)/src/libgrecs.la' + GRECS_LDADD=['$(top_builddir)/]grecsdir[src/libgrecs.la'] GRECS_DOCDIR='doc' - AC_CONFIG_FILES(m4_if([$1],,grecs,$1)/src/Makefile:m4_if([$1],,grecs,$1)/src/Make-inst.in - m4_if([$1],,grecs,$1)/doc/Makefile) + GRECS_CHANGELOG= + AC_CONFIG_FILES(grecsdir[src/Makefile]:grecsdir[src/Make-inst.in] + grecsdir[doc/Makefile]) ],[shared],[ LT_INIT - GRECS_LDADD='$(top_builddir)/m4_if([$1],,grecs,$1)/src/libgrecs.la' - AC_CONFIG_FILES(m4_if([$1],,grecs,$1)/src/Makefile:m4_if([$1],,grecs,$1)/src/Make-shared.in) + GRECS_LDADD=['$(top_builddir)/]grecsdir[src/libgrecs.la'] + GRECS_CHANGELOG='#' + AC_CONFIG_FILES(grecsdir[src/Makefile]:grecsdir[src/Make-shared.in]) ],[ - GRECS_LDADD='$(top_builddir)/m4_if([$1],,grecs,$1)/src/libgrecs.a' - AC_CONFIG_FILES(m4_if([$1],,grecs,$1)/src/Makefile:m4_if([$1],,grecs,$1)/src/Make-static.in) + GRECS_LDADD=['$(top_builddir)/]grecsdir[src/libgrecs.a'] + GRECS_CHANGELOG='#' + AC_CONFIG_FILES(grecsdir[src/Makefile]:grecsdir[src/Make-static.in]) ]) - AC_CONFIG_FILES(m4_if([$1],,grecs,$1)/Makefile) + AC_CONFIG_FILES(grecsdir[Makefile]) + m4_popdef([grecsdir]) ]) |