diff options
author | Bryan Ischo <bryan@ischo.com> | 2008-08-13 13:27:47 +0000 |
---|---|---|
committer | Bryan Ischo <bryan@ischo.com> | 2008-08-13 13:27:47 +0000 |
commit | 7fd73adff17c0511cf2c09da16d46d1a8e608866 (patch) | |
tree | fe09fe3dcdc6c68d9a17d80e64424c0e241c5247 /GNUmakefile | |
parent | 06fcf9839f35d1bbac18819886375b8232d73f35 (diff) | |
download | ceph-libs3-7fd73adff17c0511cf2c09da16d46d1a8e608866.tar.gz |
* Replaced openssl library with GnuTLS, libgcrypt, and hand-written base 64
encoding routine
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index 70e8b37..6d75d0d 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -76,6 +76,18 @@ ifndef LIBXML2_CFLAGS LIBXML2_CFLAGS := $(shell xml2-config --cflags) endif +ifndef GCRYPT_CFLAGS + GCRYPT_CFLAGS := $(shell libgcrypt-config --cflags) +endif + +ifndef GCRYPT_LIBS + GCRYPT_LIBS := $(shell libgcrypt-config --libs) +endif + +ifndef GNUTLS_LIBS + GNUTLS_LIBS := $(shell pkg-config gnutls --libs) +endif + # -------------------------------------------------------------------------- # These CFLAGS assume a GNU compiler. For other compilers, write a script @@ -86,11 +98,12 @@ ifndef CFLAGS CFLAGS = -O3 endif -CFLAGS += -Wall -Werror -std=c99 -Iinc $(CURL_CFLAGS) $(LIBXML2_CFLAGS) \ +CFLAGS += -Wall -Werror -std=c99 -Iinc \ + $(CURL_CFLAGS) $(LIBXML2_CFLAGS) $(GCRYPT_CFLAGS) \ -DLIBS3_VER_MAJOR=\"$(LIBS3_VER_MAJOR)\" \ -DLIBS3_VER_MINOR=\"$(LIBS3_VER_MINOR)\" -LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) -lpthread +LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) $(GCRYPT_LIBS) $(GNUTLS_LIBS) -lpthread # -------------------------------------------------------------------------- |