- rediff patch

diff --git a/am.patch b/am.patch
index 023806b43551b0821a731ce1ec06edf9028e92de..5b3747cef171cfc3940239f5c0d022623e5ab800 100644 (file)
--- a/am.patch
+++ b/am.patch
@@ -1,17 +1,29 @@
---- sblim-sfcb-1.3.15/configure.ac~    2012-06-15 01:44:35.000000000 +0200
-+++ sblim-sfcb-1.3.15/configure.ac     2013-05-12 19:46:38.195310655 +0200
-@@ -29,7 +29,7 @@
+diff -urNp -x '*.orig' sblim-sfcb-1.4.9.org/Makefile.am sblim-sfcb-1.4.9/Makefile.am
+--- sblim-sfcb-1.4.9.org/Makefile.am   2014-11-25 02:43:09.000000000 +0100
++++ sblim-sfcb-1.4.9/Makefile.am       2021-10-03 23:17:39.300350989 +0200
+@@ -360,6 +360,7 @@ sfcbproc_SOURCES=sfcbproc.c
+ 
+ sfcbinst2mof_SOURCES=sfcbinst2mof.c
+ sfcbinst2mof_LDADD = -lsfcFileRepository -lsfcBrokerCore
++sfcbinst2mof_DEPENDENCIES=libsfcFileRepository.la libsfcBrokerCore.la
+ 
+ sfcbtrace_SOURCES=sfcbtrace.c
+ sfcbtrace_LDADD = -lsfcBrokerCore
+diff -urNp -x '*.orig' sblim-sfcb-1.4.9.org/configure.ac sblim-sfcb-1.4.9/configure.ac
+--- sblim-sfcb-1.4.9.org/configure.ac  2014-11-25 03:00:34.000000000 +0100
++++ sblim-sfcb-1.4.9/configure.ac      2021-10-03 23:17:39.300350989 +0200
+@@ -29,7 +29,7 @@ AC_CONFIG_SRCDIR([providerDrv.c])
  #AC_DEFUN([AC_DATAROOTDIR_CHECKED])
  
  AM_INIT_AUTOMAKE
 -AM_CONFIG_HEADER([config.h])
 +AC_CONFIG_HEADERS([config.h])
  
- AC_ARG_ENABLE(debug,
-       [AC_HELP_STRING([--disable-debug],
-@@ -157,11 +157,6 @@
- 
- AC_DISABLE_STATIC
+ #Source files will use the local sfcCommon files if this is set.
+ #Reverse this to use the shared sfcCommon library.
+@@ -163,11 +163,6 @@ if test "$SYSTEMDDIR" == "" ; then
+ fi
+ AC_SUBST(SYSTEMDDIR)
  
 -if test "$enable_debug" != "yes" ; then
 -   CFLAGS="`echo $CFLAGS | sed -e 's/-g//'`"
@@ -21,13 +33,3 @@
  if test "$enable_debug" == "yes"; then
     SFCB_CPPFLAGS="-D SFCB_DEBUG $SFCB_CPPFLAGS"
  fi
---- sblim-sfcb-1.4.9/Makefile.am~      2014-11-25 02:43:09.000000000 +0100
-+++ sblim-sfcb-1.4.9/Makefile.am       2018-09-29 23:14:32.399688330 +0200
-@@ -360,6 +360,7 @@
- 
- sfcbinst2mof_SOURCES=sfcbinst2mof.c
- sfcbinst2mof_LDADD = -lsfcFileRepository -lsfcBrokerCore
-+sfcbinst2mof_DEPENDENCIES=libsfcFileRepository.la libsfcBrokerCore.la
- 
- sfcbtrace_SOURCES=sfcbtrace.c
- sfcbtrace_LDADD = -lsfcBrokerCore