|
Line
Link Here
|
| 0 |
-- m4/check_java_support.m4.orig 2016-02-14 22:47:24.555593996 +0200 |
0 |
++ m4/check_java_support.m4 2016-02-14 22:48:27.014388644 +0200 |
|
Lines 64-70
Link Here
|
| 64 |
if test "$VERSION_OK" = "1"; |
64 |
if test "$VERSION_OK" = "1"; |
| 65 |
then |
65 |
then |
| 66 |
JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[[/]]bin[[/]]java.*/\1/"` |
66 |
JNI_HOME=`echo "$JAVA_HOME/"` |
| 67 |
JNI_LIBDIR=`find $JNI_HOME -name "libjvm.so" | sed "s/\(.*\)libjvm.so/\1/" | head -n 1` |
67 |
JNI_LIBDIR=`find $JNI_HOME -name "libjvm.so" | sed "s/\(.*\)libjvm.so/\1/" | head -n 1` |
| 68 |
JNI_LIBS="-L$JNI_LIBDIR -ljvm" |
68 |
JNI_LIBS="-L$JNI_LIBDIR -ljvm" |
| 69 |
JNI_INCLUDE_DIR=`find $JNI_HOME -name "jni.h" | sed "s/\(.*\)jni.h/\1/" | head -n 1` |
69 |
JNI_INCLUDE_DIR=`find $JNI_HOME -name "jni.h" | sed "s/\(.*\)jni.h/\1/" | head -n 1` |
| 70 |
-- configure.ac.orig 2016-02-15 15:05:28.467090669 +0200 |
70 |
++ configure.ac 2016-02-15 15:06:06.974347541 +0200 |
|
Lines 878-884
Link Here
|
| 878 |
# these can only be used in lib as it assumes |
878 |
# these can only be used in lib as it assumes |
| 879 |
# the current directory just one below ivykis |
879 |
# the current directory just one below ivykis |
| 880 |
IVYKIS_LIBS="-Wl,--whole-archive -L\$(top_builddir)/lib/ivykis/src -livykis -Wl,--no-whole-archive" |
880 |
IVYKIS_LIBS="-Wl,--whole-archive -L\$(top_builddir)/lib/ivykis/src/.libs -livykis -Wl,--no-whole-archive" |
| 881 |
IVYKIS_CFLAGS="-I\$(top_srcdir)/lib/ivykis/src/include -I\$(top_builddir)/lib/ivykis/src/include" |
881 |
IVYKIS_CFLAGS="-I\$(top_srcdir)/lib/ivykis/src/include -I\$(top_builddir)/lib/ivykis/src/include" |
| 882 |
IVYKIS_SUBDIRS=lib/ivykis |
882 |
IVYKIS_SUBDIRS=lib/ivykis |
| 883 |
INTERNAL_IVYKIS_CFLAGS="-I\${includedir}/syslog-ng/ivykis" |
883 |
INTERNAL_IVYKIS_CFLAGS="-I\${includedir}/syslog-ng/ivykis" |
