| acinclude.m4 (paps-0.6.8) | : | acinclude.m4 (paps-0.7.1) |
|---|
| | |
| skipping to change at line 79 | | skipping to change at line 79 |
|---|
| # DX_IF_FEATURE(FEATURE, IF-ON, IF-OFF) | | # DX_IF_FEATURE(FEATURE, IF-ON, IF-OFF) |
| # ------------------------------------- | | # ------------------------------------- |
| # Expands according to the M4 (static) status of the feature. | | # Expands according to the M4 (static) status of the feature. |
| AC_DEFUN([DX_IF_FEATURE], [ifelse(DX_FEATURE_$1, ON, [$2], [$3])]) | | AC_DEFUN([DX_IF_FEATURE], [ifelse(DX_FEATURE_$1, ON, [$2], [$3])]) |
| | |
| # DX_REQUIRE_PROG(VARIABLE, PROGRAM) | | # DX_REQUIRE_PROG(VARIABLE, PROGRAM) |
| # ---------------------------------- | | # ---------------------------------- |
| # Require the specified program to be found for the DX_CURRENT_FEATURE to work. | | # Require the specified program to be found for the DX_CURRENT_FEATURE to work. |
| AC_DEFUN([DX_REQUIRE_PROG], [ | | AC_DEFUN([DX_REQUIRE_PROG], [ |
| AC_PATH_TOOL([$1], [$2]) | | AC_PATH_TOOL([$1], [$2]) |
|
| if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then | | if test "$DX_FLAG_DX_CURRENT_FEATURE$$1" = 1; then |
| AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION]) | | AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION]) |
|
| AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0) | | AC_SUBST([DX_FLAG_DX_CURRENT_FEATURE], 0) |
| fi | | fi |
| ]) | | ]) |
| | |
| # DX_TEST_FEATURE(FEATURE) | | # DX_TEST_FEATURE(FEATURE) |
| # ------------------------ | | # ------------------------ |
| # Expand to a shell expression testing whether the feature is active. | | # Expand to a shell expression testing whether the feature is active. |
| AC_DEFUN([DX_TEST_FEATURE], [test "$DX_FLAG_$1" = 1]) | | AC_DEFUN([DX_TEST_FEATURE], [test "$DX_FLAG_$1" = 1]) |
| | |
| # DX_CHECK_DEPEND(REQUIRED_FEATURE, REQUIRED_STATE) | | # DX_CHECK_DEPEND(REQUIRED_FEATURE, REQUIRED_STATE) |
| # ------------------------------------------------- | | # ------------------------------------------------- |
| | |
| skipping to change at line 104 | | skipping to change at line 104 |
|---|
| AC_DEFUN([DX_CHECK_DEPEND], [ | | AC_DEFUN([DX_CHECK_DEPEND], [ |
| test "$DX_FLAG_$1" = "$2" \ | | test "$DX_FLAG_$1" = "$2" \ |
| || AC_MSG_ERROR([doxygen-DX_CURRENT_FEATURE ifelse([$2], 1, | | || AC_MSG_ERROR([doxygen-DX_CURRENT_FEATURE ifelse([$2], 1, |
| requires, contradicts) doxygen-DX_CURRENT_FEATURE]) | | requires, contradicts) doxygen-DX_CURRENT_FEATURE]) |
| ]) | | ]) |
| | |
| # DX_CLEAR_DEPEND(FEATURE, REQUIRED_FEATURE, REQUIRED_STATE) | | # DX_CLEAR_DEPEND(FEATURE, REQUIRED_FEATURE, REQUIRED_STATE) |
| # ---------------------------------------------------------- | | # ---------------------------------------------------------- |
| # Turn off the DX_CURRENT_FEATURE if the required feature is off. | | # Turn off the DX_CURRENT_FEATURE if the required feature is off. |
| AC_DEFUN([DX_CLEAR_DEPEND], [ | | AC_DEFUN([DX_CLEAR_DEPEND], [ |
|
| test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0) | | test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_DX_CURRENT_FEATURE], 0) |
| ]) | | ]) |
| | |
| # DX_FEATURE_ARG(FEATURE, DESCRIPTION, | | # DX_FEATURE_ARG(FEATURE, DESCRIPTION, |
| # CHECK_DEPEND, CLEAR_DEPEND, | | # CHECK_DEPEND, CLEAR_DEPEND, |
| # REQUIRE, DO-IF-ON, DO-IF-OFF) | | # REQUIRE, DO-IF-ON, DO-IF-OFF) |
| # -------------------------------------------- | | # -------------------------------------------- |
| # Parse the command-line option controlling a feature. CHECK_DEPEND is called | | # Parse the command-line option controlling a feature. CHECK_DEPEND is called |
| # if the user explicitly turns the feature on (and invokes DX_CHECK_DEPEND), | | # if the user explicitly turns the feature on (and invokes DX_CHECK_DEPEND), |
| # otherwise CLEAR_DEPEND is called to turn off the default state if a required | | # otherwise CLEAR_DEPEND is called to turn off the default state if a required |
| # feature is disabled (using DX_CLEAR_DEPEND). REQUIRE performs additional | | # feature is disabled (using DX_CLEAR_DEPEND). REQUIRE performs additional |
| | | |
| End of changes. 3 change blocks. |
|---|
| 3 lines changed or deleted | | 3 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 