Browse Source

acinclude.m4 cleanup

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@686 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.109.0
joq 22 years ago
parent
commit
aeed5a9630
3 changed files with 3 additions and 48 deletions
  1. +2
    -3
      Makefile.am
  2. +0
    -41
      acinclude.m4
  3. +1
    -4
      config/Makefile.am

+ 2
- 3
Makefile.am View File

@@ -1,6 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in configure config.h.in \
stamp-h.in config.log config.cache \
config.status
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
stamp-h.in config.log config.cache config.status

if HAVE_DOXYGEN
DOC_DIR = doc


+ 0
- 41
acinclude.m4 View File

@@ -1,41 +0,0 @@
dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
dnl example
dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
dnl will set SYSCONFDIR to /usr/local/etc

dnl written by thomas vander stichele

AC_DEFUN(AS_AC_EXPAND,
[
EXP_VAR=[$1]
FROM_VAR=[$2]

dnl first expand prefix and exec_prefix if necessary
prefix_save=$prefix
if test "x$prefix" = "xNONE"; then
prefix=/usr/local
fi
exec_prefix_save=$exec_prefix
if test "x$exec_prefix" = "xNONE"; then
if test "x$prefix_save" = "xNONE"; then
exec_prefix=/usr/local
else
exec_prefix=$prefix
fi
fi

full_var="$FROM_VAR"
dnl loop until it doesn't change anymore
while true; do
new_full_var="`eval echo $full_var`"
if test "x$new_full_var" = "x$full_var"; then break; fi
full_var=$new_full_var
done

dnl clean up
full_var=$new_full_var
[$1]=$full_var
prefix=$prefix_save
exec_prefix=$exec_prefix_save
])


+ 1
- 4
config/Makefile.am View File

@@ -4,11 +4,8 @@
# get distributed as a side-effect.

EXTRA_DIST = configure.host depcomp cpu os
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.sub \
MAINTAINERCLEANFILES = Makefile.in config.guess config.sub \
install-sh ltmain.sh missing mkinstalldirs

# Link all relevant headers into the `sysdeps' directory. The order
# of these loops determines header file precedence.

SUBDIRS = sysdeps
DIST_SUBDIRS = sysdeps

Loading…
Cancel
Save