This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2010-01-13 16:56:39 UTC Elan Ruusamäe <glen@pld-linux.org> '- refresh mibs/pibs dir timestamp (do not set one from rpm package payload); rel 4'
Cherrypick from master 2003-12-19 11:49:07 UTC Jakub Bogusz <qboosh@pld-linux.org> '- libsmi.m4 quotation fix':
    libsmi-am18.patch -> 1.1
    libsmi-sysconfdir.patch -> 1.2

diff --git a/libsmi-am18.patch b/libsmi-am18.patch
new file mode 100644 (file)
index 0000000..e216ec0
--- /dev/null
+++ b/libsmi-am18.patch
@@ -0,0 +1,11 @@
+--- libsmi-0.4.2/libsmi.m4.orig        Wed Jan 31 12:59:48 2001
++++ libsmi-0.4.2/libsmi.m4     Fri Dec 19 12:39:39 2003
+@@ -5,7 +5,7 @@
+ dnl successful. Also defines HAVE_LIBSMI_H and adds -llibsmi to the 
+ dnl LIBS variable.
+ dnl 
+-AC_DEFUN(AM_PATH_LIBSMI,
++AC_DEFUN([AM_PATH_LIBSMI],
+ [
+   AC_CHECK_HEADERS(smi.h)
+   AC_CHECK_LIB(smi, smiInit)

diff --git a/libsmi-sysconfdir.patch b/libsmi-sysconfdir.patch
new file mode 100644 (file)
index 0000000..6fc6b8d
--- /dev/null
+++ b/libsmi-sysconfdir.patch
@@ -0,0 +1,22 @@
+--- libsmi-0.3.1/lib/smi_config.3.in~  Thu Mar 28 22:25:31 2002
++++ libsmi-0.3.1/lib/smi_config.3.in   Thu Mar 28 22:25:31 2002
+@@ -227,7 +227,7 @@
+ .fi
+ .SH "FILES"
+ .nf
+-@prefix@/etc/smi.conf    global configuration file
++@sysconfdir@/smi.conf    global configuration file
+ $HOME/.smirc               user configuration file
+ @prefix@/include/smi.h   SMI library header file
+ @mibdir@/     SMI module repository directory
+--- libsmi-0.4.1/configure.in~ Thu Mar 28 22:28:05 2002
++++ libsmi-0.4.1/configure.in  Thu Mar 28 22:28:05 2002
+@@ -189,7 +189,7 @@
+ AM_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+ 
+-AC_DEFINE_UNQUOTED([DEFAULT_GLOBALCONFIG], "${prefix}/etc/smi.conf",
++AC_DEFINE_UNQUOTED([DEFAULT_GLOBALCONFIG], "${sysconfdir}/smi.conf",
+ [The full pathname of the global configuration file.])
+
+ AC_DEFINE([DEFAULT_USERCONFIG], ".smirc",