kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 11:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 214360 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r214360 | tilghman | 2009-08-27 11:12:03 -0500 (Thu, 27 Aug 2009) | 10 lines
  
  Merged revisions 214357 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r214357 | tilghman | 2009-08-27 11:03:50 -0500 (Thu, 27 Aug 2009) | 3 lines
    
    Make autoheader descriptions render correctly in our autoconfig.h file.
    (Figured out while working with issue #14906)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@214365 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-08-27 16:17:26 +00:00
parent 3695b3b2a8
commit e605e6e750
3 changed files with 1110 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
autoconf/ast_ext_lib.m4
View File

@@ -26,6 +26,7 @@ AC_DEFUN([AST_EXT_LIB_SETUP],
esac
])
PBX_$1=0
AH_TEMPLATE(m4_bpatsubst([[HAVE_$1]], [(.*)]), [Define to 1 if you have the $2 library.])
AC_SUBST([$1_LIB])
AC_SUBST([$1_INCLUDE])
AC_SUBST([$1_DIR])
@@ -70,7 +71,7 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
else # check for the header
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
CPPFLAGS="${saved_cppflags}"
fi
if test "x${$1_HEADER_FOUND}" = "x0" ; then
@@ -81,9 +82,19 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
$1_LIB=""
fi
PBX_$1=1
# XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
AC_DEFINE_UNQUOTED([HAVE_$1], 1, [Define this to indicate the ${$1_DESCRIP} library])
AC_DEFINE_UNQUOTED([HAVE_$1_VERSION], [$7], [Define to indicate the ${$1_DESCRIP} library version])
if test "x${$1_OPTION}" = "x"; then
dnl Ensure that we have an autoheader, when AST_EXT_LIB_SETUP was
dnl not called. Note that we cannot use shell substitution in the
dnl description, because the shell is never invoked when rendering
dnl the autoheader. Only m4 substitutions will expand correctly.
AC_DEFINE_UNQUOTED([HAVE_$1], 1, [Define to 1 to indicate $1 functionality.])
AC_DEFINE_UNQUOTED([HAVE_$1_VERSION], [$7], [Define to indicate the $1 library version])
else
cat >>confdefs.h <<_ACEOF
[@%:@define] HAVE_$1 1
[@%:@define] HAVE_$1_VERSION $7
_ACEOF
fi
fi
fi
fi