commit 2c93aa35f75d41aac2dd19bbb3e3935c88a3b80a
parent 2db0eabd118370fd2937bd9021ade9b0e40473fa
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date: Sat, 1 Jun 2019 19:45:45 +0300
Added .gitattributes, fixed line endings in ac_define_dir.m4,
updated ac_define_dir.m4 to new version.
Diffstat:
2 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,4 @@
+*.m4 eol=lf
+configure.ac eol=lf
+makefile.am eol=lf
+.gitattributes eol=lf
diff --git a/m4/ac_define_dir.m4 b/m4/ac_define_dir.m4
@@ -1,35 +1,34 @@
-dnl @synopsis AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
-dnl
-dnl This macro _AC_DEFINEs VARNAME to the expansion of the DIR
-dnl variable, taking care of fixing up ${prefix} and such.
-dnl
-dnl VARNAME is offered as both a C preprocessor symbol, and an output
-dnl variable.
-dnl
-dnl Note that the 3 argument form is only supported with autoconf 2.13
-dnl and later (i.e. only where _AC_DEFINE supports 3 arguments).
-dnl
-dnl Examples:
-dnl
-dnl AC_DEFINE_DIR(DATADIR, datadir)
-dnl AC_DEFINE_DIR(PROG_PATH, bindir, [Location of installed binaries])
-dnl
-dnl @category Misc
-dnl @author Stepan Kasal <kasal@ucw.cz>
-dnl @author Andreas Schwab <schwab@suse.de>
-dnl @author Guido Draheim <guidod@gmx.de>
-dnl @author Alexandre Oliva
-dnl @version 2005-01-17
-dnl @license AllPermissive
-
-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
- eval ac_define_dir="\"[$]$2\""
- 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
-])
+dnl @synopsis AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+dnl
+dnl This macro sets VARNAME to the expansion of the DIR variable,
+dnl taking care of fixing up ${prefix} and such.
+dnl
+dnl VARNAME is then offered as both an output variable and a C
+dnl preprocessor symbol.
+dnl
+dnl Example:
+dnl
+dnl AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
+dnl
+dnl @category Misc
+dnl @author Stepan Kasal <kasal@ucw.cz>
+dnl @author Andreas Schwab <schwab@suse.de>
+dnl @author Guido U. Draheim <guidod@gmx.de>
+dnl @author Alexandre Oliva
+dnl @version 2006-10-13
+dnl @license AllPermissive
+
+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
+])