From 048b1ca8b68d707a8ef695d5510ca795ee1521e2 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Fri, 23 May 2008 22:44:18 +0000 Subject: re-add swig/java binding to makefile, make it use the JAVA_INCLUDE path, JDK_INCLUDES does not exist --- configure.ac | 1 + java/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3b6d75d0..635b7bd8 100644 --- a/configure.ac +++ b/configure.ac @@ -934,6 +934,7 @@ lasso/xml/id-wsf-2.0/Makefile lasso/xml/ws/Makefile perl/Makefile php/Makefile +java/Makefile swig/Makefile swig/wsf-support.i swig/saml-2.0/Makefile diff --git a/java/Makefile.am b/java/Makefile.am index a602cf98..cf41fef7 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -14,13 +14,13 @@ javalib_LTLIBRARIES = libjlasso.la endif jlasso_la_SOURCES = lasso_wrap.c -jlasso_la_CFLAGS = $(JDK_INCLUDES) $(LASSO_CORE_CFLAGS) -I$(top_srcdir) +jlasso_la_CFLAGS = $(JAVA_INCLUDE) $(LASSO_CORE_CFLAGS) -I$(top_srcdir) jlasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) jlasso_la_LDFLAGS = -no-undefined -avoid-version -module \ -Wl,--add-stdcall-alias libjlasso_la_SOURCES = lasso_wrap.c -libjlasso_la_CFLAGS = $(JDK_INCLUDES) $(LASSO_CORE_CFLAGS) -I$(top_srcdir) +libjlasso_la_CFLAGS = $(JAVA_INCLUDE) $(LASSO_CORE_CFLAGS) -I$(top_srcdir) libjlasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) libjlasso_la_LDFLAGS = -no-undefined -avoid-version -module -- cgit