generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-13 10:32:57 +01:00
Code Issues Projects Releases Wiki Activity

remove ODBC check from global rules; fix indentation in Poco::Any

Browse Source
This commit is contained in:
Aleksandar Fabijanic 2012-09-21 05:11:25 +00:00
parent f7bd6a8fec
commit f36a12d0f1
2 changed files with 97 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
build/rules/global
View File

@ -270,36 +270,6 @@ INCLUDE = $(foreach p,$(POCO_ADD_INCLUDE),-I$(p)) -Iinclude $(foreach p,$(COMPON
#
LIBRARY = $(foreach p,$(POCO_ADD_LIBRARY),-L$(p)) -L$(LIBPATH) $(POCO_LIBRARY)
#
# Build ODBC Include directory List if not supplied from config
#
ifndef POCO_ODBC_INCLUDE
POCO_ODBC_INCLUDE = -I/usr/local/include -I/usr/include -I/usr/include/odbc -I/usr/local/include/odbc
endif
#
# Build ODBC library directory if not supplied from config
#
ifndef POCO_NO_ODBC
ifndef POCO_ODBC_LIBRARY
ifeq (0, $(shell test -e $/usr/lib/libodbc$(LIBLINKEXT); echo $$?))
POCO_ODBC_LIBRARY = /usr/lib$(LIB64SUFFIX)
else
ifeq (0, $(shell test -e $/usr/local/lib/libodbc$(LIBLINKEXT); echo $$?))
POCO_ODBC_LIBRARY = /usr/local/lib$(LIB64SUFFIX)
else
ifeq (0, $(shell test -e $/usr/local/lib/libodbc$(LIBLINKEXT); echo $$?))
POCO_ODBC_LIBRARY = /usr/lib$(LIB64SUFFIX)/odbc
else
ifeq (0, $(shell test -e $/usr/local/lib/libodbc$(LIBLINKEXT); echo $$?))
POCO_ODBC_LIBRARY = /usr/local/lib$(LIB64SUFFIX)/odbc
endif
endif
endif
endif
endif
endif
#
# Strip Command definition
#