From 8774e4a7d88906836b7f89579b20c87fb9aed81a Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Wed, 8 Feb 2006 23:10:39 +0000 Subject: Merged revisions 9233 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r9233 | tilghman | 2006-02-08 16:34:38 -0600 (Wed, 08 Feb 2006) | 2 lines Leave it to RH/CentOS to put the freetds headers in a completely nonstandard location. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9238 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- cdr/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cdr/Makefile') diff --git a/cdr/Makefile b/cdr/Makefile index 8663754e6..5121f4794 100644 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -45,11 +45,11 @@ endif # # FreeTDS stuff... # -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h),) - ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.63),1) +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),) + ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1) CFLAGS += -DFREETDS_0_63 else - ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.62),1) + ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1) CFLAGS += -DFREETDS_0_62 else CFLAGS += -DFREETDS_PRE_0_62 -- cgit v1.2.3