kolan
/
gkrellm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://srcbox.net/gkrellm

This commit is contained in:
Bill Wilson 2016-02-02 17:37:50 -06:00
parent 7f9617d817 4f676e4cfb
commit 5e76842961
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/Makefile
View File

@ -28,8 +28,8 @@ endif
GKRELLMD_INCLUDES = gkrellmd.h $(SHARED_PATH)/log.h GKRELLMD_INCLUDES = gkrellmd.h $(SHARED_PATH)/log.h
PKG_INCLUDE = `$(PKG_CONFIG) --cflags glib-2.0 gmodule-2.0 gthread-2.0` PKG_INCLUDE := $(shell $(PKG_CONFIG) --cflags glib-2.0 gmodule-2.0 gthread-2.0)
PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0` PKG_LIB := $(shell $(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0)
FLAGS = -O2 $(PKG_INCLUDE) FLAGS = -O2 $(PKG_INCLUDE)

2
server/gkrellmd-private.h
View File

@ -43,10 +43,8 @@
#endif #endif
#if defined(__linux__) #if defined(__linux__)
#if defined(__GLIBC__) && ((__GLIBC__>2)||(__GLIBC__==2 && __GLIBC_MINOR__>=1))
#define HAVE_GETADDRINFO 1 #define HAVE_GETADDRINFO 1
#endif #endif
#endif
#if defined(__DragonFly__) #if defined(__DragonFly__)
#define HAVE_GETADDRINFO 1 #define HAVE_GETADDRINFO 1

4
src/Makefile
View File

@ -44,8 +44,8 @@ endif
GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h $(SHARED_PATH)/log.h GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h $(SHARED_PATH)/log.h
PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gmodule-2.0 gthread-2.0` PKG_INCLUDE := $(shell $(PKG_CONFIG) --cflags gtk+-2.0 gmodule-2.0 gthread-2.0)
PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gmodule-2.0 gthread-2.0` PKG_LIB := $(shell $(PKG_CONFIG) --libs gtk+-2.0 gmodule-2.0 gthread-2.0)
FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\ FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\
${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT

2
src/client.c
View File

@ -55,10 +55,8 @@
#if defined(__linux__) #if defined(__linux__)
#if defined(__GLIBC__) && ((__GLIBC__>2)||(__GLIBC__==2 && __GLIBC_MINOR__>=1))
#define HAVE_GETADDRINFO 1 #define HAVE_GETADDRINFO 1
#endif #endif
#endif
#if defined(__DragonFly__) #if defined(__DragonFly__)
#define HAVE_GETADDRINFO 1 #define HAVE_GETADDRINFO 1