# HG changeset patch
# User Olaf Wintermann <olaf.wintermann@gmail.com>
# Date 1428330985 -7200
# Node ID 59656cd164110a48f9b3567a7839beff4a68c3b7
# Parent  09fbefc0e6a97154898427161dd20d8e10371529
solaris makefile fixes

diff -r 09fbefc0e6a9 -r 59656cd16411 make/solaris.mk
--- a/make/solaris.mk	Sun Aug 17 15:15:32 2014 +0200
+++ b/make/solaris.mk	Mon Apr 06 16:36:25 2015 +0200
@@ -29,7 +29,7 @@
 
 # compiler and linker flags
 CFLAGS += -DSOLARIS
-LDFLAGS += -lsendfile -lposix4 -lpthread -ldl -lm -lxerces-c -lldap
+LDFLAGS += -lsocket -lnsl -lsendfile -lposix4 -lpthread -ldl -lm -lxerces-c -lldap
 
 PLUGINS = java
 
diff -r 09fbefc0e6a9 -r 59656cd16411 src/server/plugins/java/Makefile
--- a/src/server/plugins/java/Makefile	Sun Aug 17 15:15:32 2014 +0200
+++ b/src/server/plugins/java/Makefile	Mon Apr 06 16:36:25 2015 +0200
@@ -60,7 +60,7 @@
 	$(CC) -o $(NSAPI_JNI_LIB) $(JNI_OBJS) $(LDFLAGS)
 
 $(JAVA_WSRT): $(JAVASRC)
-	ant compile jar
+	ant -Dbuild.compiler=javac1.7 compile jar
 
 
 ../../../../build/server/plugins/java/%.o: %.c