diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2009-02-13 01:47:46 +0000 |
|---|---|---|
| committer | tweenk <tweenk@users.sourceforge.net> | 2009-02-13 01:47:46 +0000 |
| commit | 787df6d8f28e96d5af65f71bbb20ffb49da9fe9a (patch) | |
| tree | e5b632b125895b6937901a952266e27cdd0e5a49 /m4 | |
| parent | update (diff) | |
| download | inkscape-787df6d8f28e96d5af65f71bbb20ffb49da9fe9a.tar.gz inkscape-787df6d8f28e96d5af65f71bbb20ffb49da9fe9a.zip | |
Remove last remnants of ancient plugin support. Tidy up acinclude.m4.
(bzr r7278)
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/Makefile.am | 13 | ||||
| -rw-r--r-- | m4/ac_define_dir.m4 | 49 |
2 files changed, 60 insertions, 2 deletions
diff --git a/m4/Makefile.am b/m4/Makefile.am index 3343be6c5..6817876cb 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,3 +1,12 @@ -EXTRA_DIST=codeset.m4 glibc21.m4 isc-posix.m4 progtest.m4 gettext.m4 \ - iconv.m4 lcmessage.m4 relaytool.m4 +EXTRA_DIST = \ + ac_define_dir.m4 \ + ax_openmp.m4 \ + codeset.m4 \ + gettext.m4 \ + glibc21.m4 \ + iconv.m4 \ + isc-posix.m4 \ + lcmessage.m4 \ + progtest.m4 \ + relaytool.m4 diff --git a/m4/ac_define_dir.m4 b/m4/ac_define_dir.m4 new file mode 100644 index 000000000..db42d3eb0 --- /dev/null +++ b/m4/ac_define_dir.m4 @@ -0,0 +1,49 @@ +# =========================================================================== +# http://autoconf-archive.cryp.to/ac_define_dir.html +# =========================================================================== +# +# SYNOPSIS +# +# AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION]) +# +# DESCRIPTION +# +# This macro sets VARNAME to the expansion of the DIR variable, taking +# care of fixing up ${prefix} and such. +# +# VARNAME is then offered as both an output variable and a C preprocessor +# symbol. +# +# Example: +# +# AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.]) +# +# LAST MODIFICATION +# +# 2008-04-12 +# +# COPYLEFT +# +# Copyright (c) 2008 Stepan Kasal <kasal@ucw.cz> +# Copyright (c) 2008 Andreas Schwab <schwab@suse.de> +# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de> +# Copyright (c) 2008 Alexandre Oliva +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. + +AC_DEFUN([AC_DEFINE_DIR], [ + prefix_NONE= + exec_prefix_NONE= + test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix +dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn +dnl refers to ${prefix}. Thus we have to use `eval' twice. + eval ac_define_dir="\"[$]$2\"" + eval ac_define_dir="\"$ac_define_dir\"" + AC_SUBST($1, "$ac_define_dir") + AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3]) + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE +]) |