[patch] Patch for syslog-ng bootstrap scripts

syslog-ng-3.7.2.patch (text/plain), 1.26 KB, created by dksat on 2016-02-21 15:50:36 UTC

--- m4/check_java_support.m4.orig       2016-02-14 22:47:24.555593996 +0200
+++ m4/check_java_support.m4            2016-02-14 22:48:27.014388644 +0200
@@ -64,7 +64,7 @@

     if test "$VERSION_OK" = "1";
     then
-      JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[[/]]bin[[/]]java.*/\1/"`
+      JNI_HOME=`echo "$JAVA_HOME/"`
       JNI_LIBDIR=`find $JNI_HOME -name "libjvm.so" | sed "s/\(.*\)libjvm.so/\1/" | head -n 1`
       JNI_LIBS="-L$JNI_LIBDIR -ljvm"
       JNI_INCLUDE_DIR=`find $JNI_HOME -name "jni.h" |  sed "s/\(.*\)jni.h/\1/" | head -n 1`

--- configure.ac.orig   2016-02-15 15:05:28.467090669 +0200
+++ configure.ac        2016-02-15 15:06:06.974347541 +0200
@@ -878,7 +878,7 @@
                # these can only be used in lib as it assumes
                # the current directory just one below ivykis

-               IVYKIS_LIBS="-Wl,--whole-archive -L\$(top_builddir)/lib/ivykis/src -livykis  -Wl,--no-whole-archive"
+               IVYKIS_LIBS="-Wl,--whole-archive -L\$(top_builddir)/lib/ivykis/src/.libs -livykis  -Wl,--no-whole-archive"
                IVYKIS_CFLAGS="-I\$(top_srcdir)/lib/ivykis/src/include -I\$(top_builddir)/lib/ivykis/src/include"
                IVYKIS_SUBDIRS=lib/ivykis
                 INTERNAL_IVYKIS_CFLAGS="-I\${includedir}/syslog-ng/ivykis"