Mercurial > gnulib
comparison m4/lib-prefix.m4 @ 39944:eb64273b66c2
Assume Autoconf >= 2.63.
* DEPENDENCIES: Mention the requirement.
* gnulib-tool (DEFAULT_AUTOCONF_MINVERSION): Bump to 2.63.
(func_get_filelist): Don't list m4/onceonly.m4 any more.
* pygnulib/GLModuleSystem.py (getFiles): Likewise.
* m4/onceonly.m4: Remove file.
* m4/openmp.m4: Remove file.
* modules/openmp (Files): Remove m4/openmp.m4.
* m4/configmake.m4 (gl_CONFIGMAKE_PREP): Don't set datarootdir, docdir,
htmldir, dvidir, pdfdir, psdir, localedir.
* m4/po.m4 (AM_PO_SUBDIRS): Don't set localedir.
* m4/gnulib-common.m4 (m4_foreach_w): Remove fallback for
Autoconf < 2.60.
(AC_PROG_MKDIR_P): Remove definition for Autoconf < 2.62.
(AC_PROG_SED): Remove fallback for Autoconf < 2.60.
* m4/errno_h.m4 (AC_COMPUTE_INT): Remove fallback for Autoconf < 2.61.
* m4/size_max.m4 (AC_COMPUTE_INT): Likewise.
* m4/stdint.m4 (AC_COMPUTE_INT): Likewise.
* m4/fcntl-o.m4 (gl_FCNTL_O_FLAGS): Assume AC_USE_SYSTEM_EXTENSIONS
exists.
* m4/threadlib.m4 (gl_THREADLIB_EARLY_BODY): Likewise,
* m4/lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Remove workaround for
Autoconf < 2.61.
* m4/lib-prefix.m4 (AC_LIB_ARG_WITH): Remove macro.
(AC_LIB_PREFIX): Use AC_ARG_WITH, assuming semantics of
Autoconf >= 2.52.
* m4/longlong.m4: Require Autoconf >= 2.62. Update comments.
* m4/ls-mntd-fs.m4: Require Autoconf >= 2.60. Update comments.
* m4/gettext.m4 (AM_GNU_GETTEXT): Update comment.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Tue, 23 Oct 2018 00:06:52 +0200 |
| parents | 10eb9086bea0 |
| children | b460856f7515 |
comparison
equal
deleted
inserted
replaced
| 39943:b1ba0c77fa16 | 39944:eb64273b66c2 |
|---|---|
| 1 # lib-prefix.m4 serial 11 | 1 # lib-prefix.m4 serial 12 |
| 2 dnl Copyright (C) 2001-2005, 2008-2018 Free Software Foundation, Inc. | 2 dnl Copyright (C) 2001-2005, 2008-2018 Free Software Foundation, Inc. |
| 3 dnl This file is free software; the Free Software Foundation | 3 dnl This file is free software; the Free Software Foundation |
| 4 dnl gives unlimited permission to copy and/or distribute it, | 4 dnl gives unlimited permission to copy and/or distribute it, |
| 5 dnl with or without modifications, as long as this notice is preserved. | 5 dnl with or without modifications, as long as this notice is preserved. |
| 6 | 6 |
| 7 dnl From Bruno Haible. | 7 dnl From Bruno Haible. |
| 8 | |
| 9 dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and | |
| 10 dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't | |
| 11 dnl require excessive bracketing. | |
| 12 ifdef([AC_HELP_STRING], | |
| 13 [AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], | |
| 14 [AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) | |
| 15 | 8 |
| 16 dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed | 9 dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed |
| 17 dnl to access previously installed libraries. The basic assumption is that | 10 dnl to access previously installed libraries. The basic assumption is that |
| 18 dnl a user will want packages to use other packages he previously installed | 11 dnl a user will want packages to use other packages he previously installed |
| 19 dnl with the same --prefix option. | 12 dnl with the same --prefix option. |
| 30 use_additional=yes | 23 use_additional=yes |
| 31 AC_LIB_WITH_FINAL_PREFIX([ | 24 AC_LIB_WITH_FINAL_PREFIX([ |
| 32 eval additional_includedir=\"$includedir\" | 25 eval additional_includedir=\"$includedir\" |
| 33 eval additional_libdir=\"$libdir\" | 26 eval additional_libdir=\"$libdir\" |
| 34 ]) | 27 ]) |
| 35 AC_LIB_ARG_WITH([lib-prefix], | 28 AC_ARG_WITH([lib-prefix], |
| 36 [ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib | 29 [[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib |
| 37 --without-lib-prefix don't search for libraries in includedir and libdir], | 30 --without-lib-prefix don't search for libraries in includedir and libdir]], |
| 38 [ | 31 [ |
| 39 if test "X$withval" = "Xno"; then | 32 if test "X$withval" = "Xno"; then |
| 40 use_additional=no | 33 use_additional=no |
| 41 else | 34 else |
| 42 if test "X$withval" = "X"; then | 35 if test "X$withval" = "X"; then |