| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788 |
- Index: lib/plugins/stonith/apcmastersnmp.c
- --- lib/plugins/stonith/apcmastersnmp.c.orig 2004-09-13 18:36:49 +0200
- +++ lib/plugins/stonith/apcmastersnmp.c 2004-09-22 17:16:14 +0200
- @@ -22,6 +22,12 @@
- #include <portability.h>
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- +#undef PACKAGE
- +#undef PACKAGE_BUGREPORT
- +#undef PACKAGE_NAME
- +#undef PACKAGE_STRING
- +#undef PACKAGE_TARNAME
- +#undef PACKAGE_VERSION
- #endif
- #include <stdio.h>
- #include <stdlib.h>
- Index: replace/Makefile.in
- --- replace/Makefile.in.orig 2004-09-18 16:26:22 +0200
- +++ replace/Makefile.in 2004-09-22 17:16:14 +0200
- @@ -346,7 +346,7 @@
- rm -f "$${dir}/so_locations"; \
- done
- libreplace.la: $(libreplace_la_OBJECTS) $(libreplace_la_DEPENDENCIES)
- - $(LINK) $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD) $(LIBS)
- + $(LINK) $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
- Index: configure
- --- configure.orig 2004-09-18 16:25:06 +0200
- +++ configure 2004-09-22 17:31:04 +0200
- @@ -2029,13 +2029,11 @@
- USE_MODULES=0
- echo Our Host OS: $host_os
- case "$host_os" in
- -solaris*) LIBS="-L/usr/local/lib $LIBS"
- - CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/opt/sfw/include"
- +solaris*)
- INIT_EXT=".sh"
- ;;
-
- -*bsd*) LIBS="-L/usr/local/lib"
- - CPPFLAGS="$CPPFLAGS -I/usr/local/include"
- +*bsd*)
- INIT_EXT=".sh"
- ;;
-
- @@ -2107,7 +2105,7 @@
- docdir=${datadir}/doc/${HB_PKG}-${VERSION}
-
-
- -HA_VARLIBDIR="${localstatedir}/lib"
- +HA_VARLIBDIR="${localstatedir}/heartbeat"
-
-
- cat >>confdefs.h <<_ACEOF
- @@ -29823,7 +29821,6 @@
- # We had to eliminate -Wnested-externs because of libtool changes
- WARNLIST="all missing-prototypes
- missing-declarations
- - strict-prototypes
- pointer-arith
- write-strings
- cast-qual cast-align
- @@ -38642,7 +38639,7 @@
-
-
-
- -HB_RC_DIR=$sysconfdir/ha.d/rc.d
- +HB_RC_DIR=$sysconfdir/rc.d
-
-
- cat >>confdefs.h <<_ACEOF
- Index: linux-ha/portability.h
- --- linux-ha/portability.h.orig 2004-04-29 05:12:24.000000000 +0200
- +++ linux-ha/portability.h 2004-09-23 13:07:29.240260479 +0200
- @@ -116,10 +116,6 @@
- # include <uuid.h>
- #endif /* HAVE_UUID_H */
-
- -#ifdef HAVE_UUID_UUID_H
- -# include <uuid/uuid.h>
- -#endif /* HAVE_UUID_UUID_H */
- -
- #ifndef HA_HAVE_NFDS_T
- typedef unsigned int nfds_t;
- #endif
|