kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 114695 via svnmerge from

Browse Source 
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
This commit is contained in:
Sean Bright
2008-04-27 01:28:32 +00:00
parent 72b5d8d982
commit 2f1f326924
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
configure vendored
View File

@@ -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"

16
configure.ac
View File

@@ -1336,9 +1336,19 @@ AST_EXT_TOOL_CHECK([GMIME], [gmime])
AST_EXT_LIB_CHECK([FREETDS], [tds], [tds_version], [tds.h])
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"