OLD | NEW |
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 894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
905 | 905 |
906 # stepmake nonstandard names | 906 # stepmake nonstandard names |
907 AC_SUBST(PATCH_LEVEL) | 907 AC_SUBST(PATCH_LEVEL) |
908 AC_SUBST(TOPLEVEL_VERSION) | 908 AC_SUBST(TOPLEVEL_VERSION) |
909 | 909 |
910 # We don't need the upper case variant, | 910 # We don't need the upper case variant, |
911 # so stick to macros are uppercase convention. | 911 # so stick to macros are uppercase convention. |
912 # AC_DEFINE_UNQUOTED(package, ["${package}"]) | 912 # AC_DEFINE_UNQUOTED(package, ["${package}"]) |
913 # AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE}"]) | 913 # AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE}"]) |
914 AC_DEFINE_UNQUOTED(PACKAGE, ["${package}"]) | 914 AC_DEFINE_UNQUOTED(PACKAGE, ["${package}"]) |
| 915 |
| 916 # ugh: PACKAGE_NAME is already defined by AC_INIT, |
| 917 # which we call without arguments for historical reasons. |
| 918 AS_ECHO([["#undef PACKAGE_NAME"]]) >> confdefs.h |
| 919 |
915 AC_DEFINE_UNQUOTED(PACKAGE_NAME, ["${PACKAGE_NAME}"]) | 920 AC_DEFINE_UNQUOTED(PACKAGE_NAME, ["${PACKAGE_NAME}"]) |
916 AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, ["${FULL_VERSION}"]) | 921 AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, ["${FULL_VERSION}"]) |
917 | 922 |
918 if test -z "$package_depth"; then | 923 if test -z "$package_depth"; then |
919 package_depth="." | 924 package_depth="." |
920 else | 925 else |
921 package_depth="../$package_depth" | 926 package_depth="../$package_depth" |
922 fi | 927 fi |
923 export package_depth | 928 export package_depth |
924 AC_SUBST(package_depth) | 929 AC_SUBST(package_depth) |
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1473 if test "$CYGWIN$MINGW32" = "nono"; then | 1478 if test "$CYGWIN$MINGW32" = "nono"; then |
1474 PLATFORM_WINDOWS=no | 1479 PLATFORM_WINDOWS=no |
1475 else | 1480 else |
1476 PLATFORM_WINDOWS=yes | 1481 PLATFORM_WINDOWS=yes |
1477 fi | 1482 fi |
1478 AC_MSG_RESULT([$PLATFORM_WINDOWS]) | 1483 AC_MSG_RESULT([$PLATFORM_WINDOWS]) |
1479 AC_SUBST(PLATFORM_WINDOWS) | 1484 AC_SUBST(PLATFORM_WINDOWS) |
1480 STEPMAKE_PROGS(WINDRES, $target-windres windres, x) | 1485 STEPMAKE_PROGS(WINDRES, $target-windres windres, x) |
1481 AC_SUBST(WINDRES) | 1486 AC_SUBST(WINDRES) |
1482 ]) | 1487 ]) |
OLD | NEW |