diff options
| author | Bryan Ischo <bryan@ischo.com> | 2008-08-21 05:00:26 +0000 |
|---|---|---|
| committer | Bryan Ischo <bryan@ischo.com> | 2008-08-21 05:00:26 +0000 |
| commit | af16c4d1a3a79d51ba1c1ea661d958eed65c15a3 (patch) | |
| tree | f3b702353e3b28b5517624ee4f297c5648d94a97 /GNUmakefile | |
| parent | 7088858ee0b97a0576dcae6a0ad770412651301a (diff) | |
| download | ceph-libs3-af16c4d1a3a79d51ba1c1ea661d958eed65c15a3.tar.gz | |
* Revert GnuTLS back to openssl, since GnuTLS is too hard to get working on
Windows
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/GNUmakefile b/GNUmakefile index 32b2213..b8086c8 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -76,18 +76,6 @@ 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 @@ -99,11 +87,11 @@ ifndef CFLAGS endif CFLAGS += -Wall -Werror -std=c99 -Iinc \ - $(CURL_CFLAGS) $(LIBXML2_CFLAGS) $(GCRYPT_CFLAGS) \ + $(CURL_CFLAGS) $(LIBXML2_CFLAGS) \ -DLIBS3_VER_MAJOR=\"$(LIBS3_VER_MAJOR)\" \ -DLIBS3_VER_MINOR=\"$(LIBS3_VER_MINOR)\" -LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) $(GCRYPT_LIBS) $(GNUTLS_LIBS) -lpthread +LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) -lpthread # -------------------------------------------------------------------------- |