diff options
| author | Sean Bright <sean@malleable.com> | 2008-04-27 01:28:32 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-04-27 01:28:32 +0000 |
| commit | 2f1f32692428828c3ac5f791b537225a294b47af (patch) | |
| tree | d5d99a15daf3b57be261d9b308fa47d18a1036df /configure | |
| parent | 72b5d8d982d0af7772a866569b8d88a166103df9 (diff) | |
Merged revisions 114695 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114695 | seanbright | 2008-04-26 21:26:15 -0400 (Sat, 26 Apr 2008) | 5 lines
When we don't explicitly pass a path to the --with-tds configure option, we
may end up finding tds.h in /usr/local/include instead of /usr/include. If
this happens, the grep that looks for the version (from tdsver.h) will fail
and we'll have some problems during the build.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114696 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 28 |
1 files changed, 17 insertions, 11 deletions
@@ -12769,13 +12769,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <sys/types.h> /* for off_t */ - #include <stdio.h> +#include <stdio.h> int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -12815,13 +12813,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include <sys/types.h> /* for off_t */ - #include <stdio.h> +#include <stdio.h> int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -43682,9 +43678,19 @@ fi if test "${PBX_FREETDS}" != "0"; then - case `grep TDS_VERSION_NO ${FREETDS_DIR:-/usr}/include/tdsver.h` in - *0.64*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64" + if test "${FREETDS_DIR}x" = "x"; + then + for tds_dir in /usr /usr/local; + do + if test -f "${tds_dir}/include/tdsver.h"; + then + FREETDS_DIR="${tds_dir}" + fi + done + fi + case `${GREP} TDS_VERSION_NO ${FREETDS_DIR:-/usr}/include/tdsver.h` in + *0.64*) + FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64" ;; *0.63*) FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_63" |