Skip to content

Commit

Permalink
prepare for acl 3.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
ubuntu14 committed Apr 12, 2016
1 parent 1618216 commit 1e72b67
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ endif
##############################################################################

.PHONY = check help all_lib all samples all clean install uninstall uninstall_all build_bin build_src build_one
VERSION = 3.1.4.4
VERSION = 3.1.5

help:
@(echo "usage: make help|all|all_lib|all_samples|clean|install|uninstall|uninstall_all|build_bin|build_src|build_one")
Expand Down
2 changes: 1 addition & 1 deletion Makefile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ endif
##############################################################################

.PHONY = check help all_lib all samples all clean install uninstall uninstall_all build_bin build_src build_one
VERSION = 3.1.3
VERSION = 3.1.5

help:
@(echo "usage: make help|all|all_lib|all_samples|clean|install|uninstall|uninstall_all|build_bin|build_src|build_one")
Expand Down
1 change: 1 addition & 0 deletions lib_acl/StdAfx.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ int acl_secure_vsnprintf(char *buf, size_t size, const char *fmt, va_list ap);
# include <pthread.h>
# include <dlfcn.h>
# include <dirent.h>
# include <netinet/in.h>
# include <netinet/ip.h>
# include <netinet/tcp.h>
# include <netdb.h>
Expand Down
2 changes: 1 addition & 1 deletion lib_acl/src/init/acl_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include "init.h"

static char *version = "acl_3.1.4.4";
static char *version = "acl_3.1.5";

const char *acl_version(void)
{
Expand Down
12 changes: 11 additions & 1 deletion lib_acl_cpp/samples/string/string4/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
base_path = ../../..
PROG = string
include ../../Makefile.in
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
EXTLIBS = -liconv
endif
ifeq ($(findstring FreeBSD, $(UNIXNAME)), FreeBSD)
EXTLIBS = -L/usr/local/lib -liconv
endif
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
EXTLIBS += -L/usr/lib -liconv
endif
PROG = string

0 comments on commit 1e72b67

Please sign in to comment.