Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Ensure we reautoconf the packag |
| 2 | |
| 3 | Currently since configure.in in is in a subdirectory, we don't reautoconf the |
| 4 | recipe. We really need to do this, to update things like the libtool script used |
| 5 | and fix various issues such as those that could creep in if a reautoconf is |
| 6 | triggered for some reason. Since this source only calls AM_INIT_AUTOMAKE to |
| 7 | gain the PACKAGE and VERSION definitions and that macro now errors if Makefile.am |
| 8 | doesn't exist, we need to add these definitions manually. |
| 9 | |
| 10 | These changes avoid failures like: |
| 11 | ---- |
| 12 | | ... |
| 13 | | DssslApp.cxx:117:36: error: 'PACKAGE' was not declared in this scope |
| 14 | | DssslApp.cxx:118:36: error: 'VERSION' was not declared in this scope |
| 15 | | make[2]: *** [DssslApp.lo] Error 1 ---- |
| 16 | |
| 17 | Upstream-Status: Pending |
| 18 | |
| 19 | RP 2012/6/12 |
| 20 | |
| 21 | Index: openjade-1.3.2/acinclude.m4 |
| 22 | =================================================================== |
| 23 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
| 24 | +++ openjade-1.3.2/acinclude.m4 2012-06-12 12:48:54.871365344 +0000 |
| 25 | @@ -0,0 +1,39 @@ |
| 26 | +dnl Configure-time switch with default |
| 27 | +dnl |
| 28 | +dnl Each switch defines an --enable-FOO and --disable-FOO option in |
| 29 | +dnl the resulting configure script. |
| 30 | +dnl |
| 31 | +dnl Usage: |
| 32 | +dnl smr_SWITCH(name, description, default, pos-def, neg-def) |
| 33 | +dnl |
| 34 | +dnl where: |
| 35 | +dnl |
| 36 | +dnl name name of switch; generates --enable-name & --disable-name |
| 37 | +dnl options |
| 38 | +dnl description help string is set to this prefixed by "enable" or |
| 39 | +dnl "disable", whichever is the non-default value |
| 40 | +dnl default either "on" or "off"; specifies default if neither |
| 41 | +dnl --enable-name nor --disable-name is specified |
| 42 | +dnl pos-def a symbol to AC_DEFINE if switch is on (optional) |
| 43 | +dnl neg-def a symbol to AC_DEFINE if switch is off (optional) |
| 44 | +dnl |
| 45 | +AC_DEFUN(smr_SWITCH, [ |
| 46 | + AC_MSG_CHECKING(whether to enable $2) |
| 47 | + AC_ARG_ENABLE( |
| 48 | + $1, |
| 49 | + ifelse($3, on, |
| 50 | + [ --disable-[$1] disable [$2]], |
| 51 | + [ --enable-[$1] enable [$2]]), |
| 52 | + [ if test "$enableval" = yes; then |
| 53 | + AC_MSG_RESULT(yes) |
| 54 | + ifelse($4, , , AC_DEFINE($4)) |
| 55 | + else |
| 56 | + AC_MSG_RESULT(no) |
| 57 | + ifelse($5, , , AC_DEFINE($5)) |
| 58 | + fi ], |
| 59 | + ifelse($3, on, |
| 60 | + [ AC_MSG_RESULT(yes) |
| 61 | + ifelse($4, , , AC_DEFINE($4)) ], |
| 62 | + [ AC_MSG_RESULT(no) |
| 63 | + ifelse($5, , , AC_DEFINE($5))]))]) |
| 64 | + |
| 65 | Index: openjade-1.3.2/config/configure.in |
| 66 | =================================================================== |
| 67 | --- openjade-1.3.2.orig/config/configure.in 2012-06-12 12:47:20.735365445 +0000 |
| 68 | +++ openjade-1.3.2/config/configure.in 2012-06-12 12:48:17.507364080 +0000 |
| 69 | @@ -12,9 +12,12 @@ |
| 70 | dnl Credits: this autoconf script was largely "inspired" <g> by the |
| 71 | dnl autoconf script around SP made by Henry Thompson. |
| 72 | dnl |
| 73 | -AC_INIT(dsssl) |
| 74 | +AC_INIT([openjade], [1.3.2]) |
| 75 | AC_CONFIG_AUX_DIR(config) |
| 76 | -AM_INIT_AUTOMAKE( openjade, 1.3.2) |
| 77 | +AC_SUBST([PACKAGE], [openjade]) |
| 78 | +AC_SUBST([VERSION], [1.3.2]) |
| 79 | +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") |
| 80 | +AC_DEFINE_UNQUOTED(VERSION, "$VERSION") |
| 81 | TOP=`pwd` |
| 82 | AC_SUBST(TOP) |
| 83 | dnl |