Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(555)

Delta Between Two Patch Sets: aclocal.m4

Issue 551590044: aclocal.m4: Update PKG_* macros to pkg-config 0.29.2
Left Patch Set: Created 4 years ago
Right Patch Set: rebase Created 4 years ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 dnl aclocal.m4 -*-shell-script-*- 1 dnl aclocal.m4 -*-shell-script-*-
2 dnl StepMake subroutines for configure.ac 2 dnl StepMake subroutines for configure.ac
3 3
4 4
5 ### mostly internal macros 5 ### mostly internal macros
6 6
7 # Get full path of executable ($1) 7 # Get full path of executable ($1)
8 AC_DEFUN(STEPMAKE_GET_EXECUTABLE, [ 8 AC_DEFUN(STEPMAKE_GET_EXECUTABLE, [
9 ## which doesn't work in ash, if /usr/bin/which isn't installed 9 ## which doesn't work in ash, if /usr/bin/which isn't installed
10 ## type -p doesn't work in ash 10 ## type -p doesn't work in ash
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 264
265 if test -n "$SANITIZE"; then 265 if test -n "$SANITIZE"; then
266 # "print a verbose error report and exit the program" 266 # "print a verbose error report and exit the program"
267 SANITIZE="$SANITIZE -fno-sanitize-recover" 267 SANITIZE="$SANITIZE -fno-sanitize-recover"
268 fi 268 fi
269 269
270 CFLAGS="$CFLAGS $OPTIMIZE $SANITIZE" 270 CFLAGS="$CFLAGS $OPTIMIZE $SANITIZE"
271 CPPFLAGS=${CPPFLAGS-""} 271 CPPFLAGS=${CPPFLAGS-""}
272 LDFLAGS="$LDFLAGS $SANITIZE" 272 LDFLAGS="$LDFLAGS $SANITIZE"
273 273
274 AC_MSG_CHECKING([for IEEE-conformance compiler flags])
275 save_cflags="$CFLAGS"
276 case "$host" in
277 alpha*-*-*)
278 dnl should do compile test?
279 AC_MSG_RESULT(-mieee)
280 CFLAGS=" -mieee $CFLAGS"
281 ;;
282 *)
283 AC_MSG_RESULT([none])
284 ;;
285 esac
286
287 AC_SUBST(cross_compiling) 274 AC_SUBST(cross_compiling)
288 AC_SUBST(CFLAGS) 275 AC_SUBST(CFLAGS)
289 AC_SUBST(CPPFLAGS) 276 AC_SUBST(CPPFLAGS)
290 AC_SUBST(LDFLAGS) 277 AC_SUBST(LDFLAGS)
291 AC_SUBST(DEFINES) 278 AC_SUBST(DEFINES)
292 AC_SUBST(EXTRA_LIBS) 279 AC_SUBST(EXTRA_LIBS)
293 ]) 280 ])
294 281
295 282
296 AC_DEFUN(STEPMAKE_CXX, [ 283 AC_DEFUN(STEPMAKE_CXX, [
(...skipping 15 matching lines...) Expand all
312 299
313 build_package_datadir=$ac_pwd/out/share/$package 300 build_package_datadir=$ac_pwd/out/share/$package
314 301
315 DATADIR=`echo ${datadir} | sed "s!\\\${datarootdir}!${presome}/share!"` 302 DATADIR=`echo ${datadir} | sed "s!\\\${datarootdir}!${presome}/share!"`
316 DATADIR=`echo ${DATADIR} | sed "s!\\\${prefix}!$presome!"` 303 DATADIR=`echo ${DATADIR} | sed "s!\\\${prefix}!$presome!"`
317 BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$ presome!"` 304 BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$ presome!"`
318 305
319 AC_SUBST(datadir) 306 AC_SUBST(datadir)
320 AC_SUBST(datarootdir) 307 AC_SUBST(datarootdir)
321 AC_SUBST(build_package_datadir) 308 AC_SUBST(build_package_datadir)
322 AC_DEFINE_UNQUOTED(DATADIR, ["${DATADIR}"]) 309 AC_DEFINE_UNQUOTED(CONFIG_DATADIR, ["${DATADIR}"])
323 AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"]) 310 AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"])
324 ]) 311 ])
325 312
326 313
327 ## ugh: cut & paste programming from datadir. 314 ## ugh: cut & paste programming from datadir.
328 AC_DEFUN(STEPMAKE_LIBDIR, [ 315 AC_DEFUN(STEPMAKE_LIBDIR, [
329 presome=${exec_prefix} 316 presome=${exec_prefix}
330 if test "$presome" = "NONE"; then 317 if test "$presome" = "NONE"; then
331 presome=${prefix} 318 presome=${prefix}
332 fi 319 fi
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 GUILEv2=yes 640 GUILEv2=yes
654 ;; 641 ;;
655 guile-1.8) 642 guile-1.8)
656 ;; 643 ;;
657 *) 644 *)
658 STEPMAKE_ADD_ENTRY(REQUIRED, ["guile-devel >= 1.8"]) 645 STEPMAKE_ADD_ENTRY(REQUIRED, ["guile-devel >= 1.8"])
659 ;; 646 ;;
660 esac 647 esac
661 ]) 648 ])
662 649
663 AC_DEFUN(STEPMAKE_DLOPEN, [
664 AC_CHECK_LIB(dl, dlopen)
665 AC_CHECK_FUNCS(dlopen)
666 ])
667
668 650
669 AC_DEFUN(STEPMAKE_INIT, [ 651 AC_DEFUN(STEPMAKE_INIT, [
670 . $srcdir/VERSION 652 . $srcdir/VERSION
671 FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL 653 FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
672 TOPLEVEL_VERSION=$FULL_VERSION 654 TOPLEVEL_VERSION=$FULL_VERSION
673 if test x$MY_PATCH_LEVEL != x; then 655 if test x$MY_PATCH_LEVEL != x; then
674 FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL 656 FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL
675 fi 657 fi
676 VERSION=$FULL_VERSION 658 VERSION=$FULL_VERSION
677 export MAJOR_VERSION MINOR_VERSION PATCH_LEVEL 659 export MAJOR_VERSION MINOR_VERSION PATCH_LEVEL
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 737
756 738
757 AC_DEFUN(STEPMAKE_LIB, [ 739 AC_DEFUN(STEPMAKE_LIB, [
758 STEPMAKE_PROGS(AR, ar, $1) 740 STEPMAKE_PROGS(AR, ar, $1)
759 AC_PROG_RANLIB 741 AC_PROG_RANLIB
760 STEPMAKE_OPTIONAL_REQUIRED(RANLIB, ranlib, $1) 742 STEPMAKE_OPTIONAL_REQUIRED(RANLIB, ranlib, $1)
761 ]) 743 ])
762 744
763 745
764 AC_DEFUN(STEPMAKE_LOCALE, [ 746 AC_DEFUN(STEPMAKE_LOCALE, [
765 lang=English
766 ALL_LINGUAS="en nl"
767
768 # with/enable ?? 747 # with/enable ??
769 AC_ARG_WITH(localedir, 748 AC_ARG_WITH(localedir,
770 [AS_HELP_STRING( 749 [AS_HELP_STRING(
771 [--with-localedir=DIR], 750 [--with-localedir=DIR],
772 [location of locales. Default: PREFIX/share/locale])], 751 [location of locales. Default: PREFIX/share/locale])],
773 localedir=$with_localedir, 752 localedir=$with_localedir,
774 localedir='${prefix}/share/locale') 753 localedir='${prefix}/share/locale')
775
776 AC_ARG_WITH(lang,
777 [AS_HELP_STRING(
778 [--with-lang=LANG],
779 [use LANG as language to emit messages])],
780 language=$with_lang,
781 language=English)
782
783 AC_MSG_CHECKING(language)
784 case "$language" in
785 En* | en* | Am* | am* | US* | us*)
786 lang=English;;
787 NL | nl | Du* | du* | Ned* | ned*)
788 lang=Dutch;;
789 "")
790 lang=English;;
791 *)
792 lang=unknown;;
793 esac
794 AC_MSG_RESULT($lang)
795
796 if test "$lang" = "unknown" ; then
797 STEPMAKE_WARN($language not supported; available are: $ALL_LINGUAS)
798 fi
799 ]) 754 ])
800 755
801 756
802 AC_DEFUN(STEPMAKE_MAKEINFO, [ 757 AC_DEFUN(STEPMAKE_MAKEINFO, [
803 STEPMAKE_PROGS(MAKEINFO, makeinfo, $1) 758 STEPMAKE_PROGS(MAKEINFO, makeinfo, $1)
804 ])
805
806
807 AC_DEFUN(STEPMAKE_MAN, [
808 STEPMAKE_PROGS(GROFF, groff ditroff, $1)
809 AC_SUBST(GROFF)
810 STEPMAKE_PROGS(TROFF, troff, $1)
811 AC_SUBST(TROFF)
812 STEPMAKE_PROGS(TBL, tbl, $1)
813 AC_SUBST(TBL)
814 ]) 759 ])
815 760
816 761
817 AC_DEFUN(STEPMAKE_MSGFMT, [ 762 AC_DEFUN(STEPMAKE_MSGFMT, [
818 STEPMAKE_PROGS(MSGFMT, msgfmt, $1) 763 STEPMAKE_PROGS(MSGFMT, msgfmt, $1)
819 ]) 764 ])
820 765
821 766
822 # Check for program ($2). If found, assign full path result to ($1). 767 # Check for program ($2). If found, assign full path result to ($1).
823 # If missing, add entry to missing-list ($3, one of 'OPTIONAL', 'REQUIRED') 768 # If missing, add entry to missing-list ($3, one of 'OPTIONAL', 'REQUIRED')
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 AC_SUBST(program_suffix) 1057 AC_SUBST(program_suffix)
1113 1058
1114 AC_MSG_CHECKING([for some flavor of Windows]) 1059 AC_MSG_CHECKING([for some flavor of Windows])
1115 if test "$CYGWIN$MINGW32" = "nono"; then 1060 if test "$CYGWIN$MINGW32" = "nono"; then
1116 PLATFORM_WINDOWS=no 1061 PLATFORM_WINDOWS=no
1117 else 1062 else
1118 PLATFORM_WINDOWS=yes 1063 PLATFORM_WINDOWS=yes
1119 fi 1064 fi
1120 AC_MSG_RESULT([$PLATFORM_WINDOWS]) 1065 AC_MSG_RESULT([$PLATFORM_WINDOWS])
1121 AC_SUBST(PLATFORM_WINDOWS) 1066 AC_SUBST(PLATFORM_WINDOWS)
1122 STEPMAKE_PROGS(WINDRES, $target-windres windres, x) 1067 STEPMAKE_PROGS(WINDRES, $target-windres $host-windres windres, x)
1123 AC_SUBST(WINDRES) 1068 AC_SUBST(WINDRES)
1124 ]) 1069 ])
1125 1070
1126 1071
1127 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 1072 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
hanwenn 2020/03/07 09:32:47 can we include this rather than copy & paste?
1128 # serial 12 (pkg-config-0.29.2) 1073 # serial 12 (pkg-config-0.29.2)
1129 1074
1130 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 1075 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
1131 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> 1076 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
1132 dnl 1077 dnl
1133 dnl This program is free software; you can redistribute it and/or modify 1078 dnl This program is free software; you can redistribute it and/or modify
1134 dnl it under the terms of the GNU General Public License as published by 1079 dnl it under the terms of the GNU General Public License as published by
1135 dnl the Free Software Foundation; either version 2 of the License, or 1080 dnl the Free Software Foundation; either version 2 of the License, or
1136 dnl (at your option) any later version. 1081 dnl (at your option) any later version.
1137 dnl 1082 dnl
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
1392 dnl Retrieves the value of the pkg-config variable for the given module. 1337 dnl Retrieves the value of the pkg-config variable for the given module.
1393 AC_DEFUN([PKG_CHECK_VAR], 1338 AC_DEFUN([PKG_CHECK_VAR],
1394 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 1339 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
1395 AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl 1340 AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
1396 1341
1397 _PKG_CONFIG([$1], [variable="][$3]["], [$2]) 1342 _PKG_CONFIG([$1], [variable="][$3]["], [$2])
1398 AS_VAR_COPY([$1], [pkg_cv_][$1]) 1343 AS_VAR_COPY([$1], [pkg_cv_][$1])
1399 1344
1400 AS_VAR_IF([$1], [""], [$5], [$4])dnl 1345 AS_VAR_IF([$1], [""], [$5], [$4])dnl
1401 ])dnl PKG_CHECK_VAR 1346 ])dnl PKG_CHECK_VAR
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b