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

Side by Side Diff: aclocal.m4

Issue 575860044: aclocal.m4: Support GUILE_CONFIG, document GUILE_FLAVOR
Patch Set: Formatting and ;; 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:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 357
358 AC_DEFUN(STEPMAKE_END, [ 358 AC_DEFUN(STEPMAKE_END, [
359 STEPMAKE_PREFIX_EXPAND_FIXUP 359 STEPMAKE_PREFIX_EXPAND_FIXUP
360 360
361 AC_SUBST(OPTIONAL) 361 AC_SUBST(OPTIONAL)
362 AC_SUBST(REQUIRED) 362 AC_SUBST(REQUIRED)
363 363
364 AC_CONFIG_FILES([config.make:config.make.in]) 364 AC_CONFIG_FILES([config.make:config.make.in])
365 AC_OUTPUT 365 AC_OUTPUT
366 366
367 if test -n "$GUILE_CONFIG"; then
368 echo
369 echo "WARNING: GUILE_CONFIG deprecated, consider using PKG_CONFIG_PATH i nstead"
370 fi
371
367 if test -n "$OPTIONAL"; then 372 if test -n "$OPTIONAL"; then
368 echo 373 echo
369 echo "WARNING: Please consider installing optional programs or files: $O PTIONAL" 374 echo "WARNING: Please consider installing optional programs or files: $O PTIONAL"
370 fi 375 fi
371 376
372 if test -n "$REQUIRED"; then 377 if test -n "$REQUIRED"; then
373 echo 378 echo
374 echo "ERROR: Please install required programs: $REQUIRED" 379 echo "ERROR: Please install required programs: $REQUIRED"
375 fi 380 fi
376 381
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 AC_MSG_CHECKING([$guile version]) 615 AC_MSG_CHECKING([$guile version])
611 AC_MSG_RESULT([$ver]) 616 AC_MSG_RESULT([$ver])
612 GUILE=$found 617 GUILE=$found
613 else 618 else
614 STEPMAKE_ADD_ENTRY($1, $guile) 619 STEPMAKE_ADD_ENTRY($1, $guile)
615 fi 620 fi
616 STEPMAKE_PATH_PROG(GUILE, $GUILE) 621 STEPMAKE_PATH_PROG(GUILE, $GUILE)
617 ]) 622 ])
618 623
619 AC_DEFUN(STEPMAKE_GUILE_DEVEL, [ 624 AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
620 if test -n "$GUILE_FLAVOR"; then 625 AC_ARG_VAR(GUILE_FLAVOR,
626 AS_HELP_STRING([], [pkgconfig name for Guile, like guile-1.8 or
627 guile-2.2 . If the respective .pc file
628 cannot be found by pkgconfig,
629 add its path to PKG_CONFIG_PATH]))dnl
630 AC_ARG_VAR(GUILE_CONFIG,
631 [guile-config executable, obsoleted by pkgconfig/GUILE_FLAVOR])dn l
632
633 if test -n "$GUILE_CONFIG"; then
634 AC_MSG_CHECKING([GUILE_CONFIG for GUILE_FLAVOR])
635 tmp_GUILE_FLAVOR="$($GUILE_CONFIG info guileversion)"
636 case $tmp_GUILE_FLAVOR in
637 *.*.*) # not a regexp, just a crude check
638 GUILE_FLAVOR=guile-"${tmp_GUILE_FLAVOR%.*}"
639 AC_MSG_RESULT([$GUILE_FLAVOR])
640 ;;
641 *)
642 AC_MSG_ERROR([\$GUILE_CONFIG info guileversion failed: $tmp_GUIL E_FLAVOR])
643 ;;
644 esac
645 if test -z "$GUILE_CFLAGS"; then
646 AC_MSG_CHECKING([GUILE_CONFIG for GUILE_CFLAGS])
647 GUILE_CFLAGS=$($GUILE_CONFIG compile)
648 AC_MSG_RESULT([$GUILE_CFLAGS])
649 fi
650 if test -z "$GUILE_LIBS"; then
651 AC_MSG_CHECKING([GUILE_CONFIG for GUILE_LIBS])
652 GUILE_LIBS=$($GUILE_CONFIG link)
653 AC_MSG_RESULT([$GUILE_LIBS])
654 fi
655 elif test -n "$GUILE_FLAVOR"; then
621 PKG_CHECK_MODULES([GUILE], [$GUILE_FLAVOR], 656 PKG_CHECK_MODULES([GUILE], [$GUILE_FLAVOR],
622 [true], [GUILE_FLAVOR="missing"]) 657 [true], [GUILE_FLAVOR="missing"])
623 else 658 else
624 PKG_CHECK_MODULES([GUILE], [guile-1.8 >= 1.8.2], 659 PKG_CHECK_MODULES([GUILE], [guile-1.8 >= 1.8.2],
625 [GUILE_FLAVOR="guile-1.8"], [ 660 [GUILE_FLAVOR="guile-1.8"], [
626 AC_MSG_RESULT([no]) 661 AC_MSG_RESULT([no])
627 PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.0], 662 PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.0],
628 [GUILE_FLAVOR="guile-2.2"], [ 663 [GUILE_FLAVOR="guile-2.2"], [
629 AC_MSG_RESULT([no]) 664 AC_MSG_RESULT([no])
630 PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.7], 665 PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.7],
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
1024 PLATFORM_WINDOWS=no 1059 PLATFORM_WINDOWS=no
1025 else 1060 else
1026 PLATFORM_WINDOWS=yes 1061 PLATFORM_WINDOWS=yes
1027 fi 1062 fi
1028 AC_MSG_RESULT([$PLATFORM_WINDOWS]) 1063 AC_MSG_RESULT([$PLATFORM_WINDOWS])
1029 AC_SUBST(PLATFORM_WINDOWS) 1064 AC_SUBST(PLATFORM_WINDOWS)
1030 STEPMAKE_PROGS(WINDRES, $target-windres $host-windres windres, x) 1065 STEPMAKE_PROGS(WINDRES, $target-windres $host-windres windres, x)
1031 AC_SUBST(WINDRES) 1066 AC_SUBST(WINDRES)
1032 ]) 1067 ])
1033 1068
1034
1035 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 1069 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
1036 # serial 12 (pkg-config-0.29.2) 1070 # serial 12 (pkg-config-0.29.2)
1037 1071
1038 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 1072 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
1039 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> 1073 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
1040 dnl 1074 dnl
1041 dnl This program is free software; you can redistribute it and/or modify 1075 dnl This program is free software; you can redistribute it and/or modify
1042 dnl it under the terms of the GNU General Public License as published by 1076 dnl it under the terms of the GNU General Public License as published by
1043 dnl the Free Software Foundation; either version 2 of the License, or 1077 dnl the Free Software Foundation; either version 2 of the License, or
1044 dnl (at your option) any later version. 1078 dnl (at your option) any later version.
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
1300 dnl Retrieves the value of the pkg-config variable for the given module. 1334 dnl Retrieves the value of the pkg-config variable for the given module.
1301 AC_DEFUN([PKG_CHECK_VAR], 1335 AC_DEFUN([PKG_CHECK_VAR],
1302 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 1336 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
1303 AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl 1337 AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
1304 1338
1305 _PKG_CONFIG([$1], [variable="][$3]["], [$2]) 1339 _PKG_CONFIG([$1], [variable="][$3]["], [$2])
1306 AS_VAR_COPY([$1], [pkg_cv_][$1]) 1340 AS_VAR_COPY([$1], [pkg_cv_][$1])
1307 1341
1308 AS_VAR_IF([$1], [""], [$5], [$4])dnl 1342 AS_VAR_IF([$1], [""], [$5], [$4])dnl
1309 ])dnl PKG_CHECK_VAR 1343 ])dnl PKG_CHECK_VAR
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

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