The R Project SVN R

Rev

Rev 87099 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 87099 Rev 87140
Line 19... Line 19...
19
  libcurl-CPPFLAGS += -DHAVE_CURL_CURL_H -DHAVE_LIBCURL
19
  libcurl-CPPFLAGS += -DHAVE_CURL_CURL_H -DHAVE_LIBCURL
20
  ifndef USE_PKG_CONFIG
20
  ifndef USE_PKG_CONFIG
21
    libcurl-CPPFLAGS += -DCURL_STATICLIB -I"$(CURL_PATH)"/include
21
    libcurl-CPPFLAGS += -DCURL_STATICLIB -I"$(CURL_PATH)"/include
22
    EXTRA_LIBS += -L"$(CURL_PATH)"/lib$(R_ARCH) $(CURL_LIBS)
22
    EXTRA_LIBS += -L"$(CURL_PATH)"/lib$(R_ARCH) $(CURL_LIBS)
23
  else
23
  else
24
    libcurl-CPPFLAGS += $(shell pkg-config --cflags libcurl)
24
    libcurl-CPPFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl)
25
    EXTRA_LIBS += $(shell pkg-config --libs libcurl)
25
    EXTRA_LIBS += $(shell $(PKG_CONFIG) --libs libcurl)
26
  endif
26
  endif
27
endif
27
endif
28
 
28
 
29
 
29
 
30
../../../modules$(R_ARCH)/internet.dll: internet.o libcurl.o sockconn.o Rhttpd.o Rsock.o sock.o dllversion.o
30
../../../modules$(R_ARCH)/internet.dll: internet.o libcurl.o sockconn.o Rhttpd.o Rsock.o sock.o dllversion.o