Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 95c742242769721f963c50702e1445fb70c6a45a Mon Sep 17 00:00:00 2001 |
| 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> |
| 3 | Date: Tue, 2 Dec 2014 07:07:33 +0900 |
| 4 | Subject: [PATCH 3/3] From debian to modify parameters |
| 5 | |
| 6 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> |
| 7 | --- |
| 8 | Makefile | 16 ++++++++-------- |
| 9 | config.h | 13 +++++++------ |
| 10 | 2 files changed, 15 insertions(+), 14 deletions(-) |
| 11 | |
| 12 | diff --git a/Makefile b/Makefile |
| 13 | index 1e9568c..9e48201 100644 |
| 14 | --- a/Makefile |
| 15 | +++ b/Makefile |
| 16 | @@ -23,7 +23,7 @@ MAN5DIR = $(MANDIR)/man$(MAN5SUFFIX) |
| 17 | |
| 18 | # Uncomment to install compressed man pages (possibly add extra suffix |
| 19 | # to the definitions of MAN?DIR and/or MAN?SUFFIX by hand) |
| 20 | -#MANCOMPRESS = compress |
| 21 | +# MANCOMPRESS = compress |
| 22 | |
| 23 | ############################*# |
| 24 | # Things that can be made are: |
| 25 | @@ -55,7 +55,7 @@ MAN5DIR = $(MANDIR)/man$(MAN5SUFFIX) |
| 26 | |
| 27 | LOCKINGTEST=__defaults__ |
| 28 | |
| 29 | -#LOCKINGTEST=/tmp . # Uncomment and add any directories you see fit. |
| 30 | +LOCKINGTEST=/tmp . # Uncomment and add any directories you see fit. |
| 31 | # If LOCKINGTEST is defined, autoconf will NOT |
| 32 | # prompt you to enter additional directories. |
| 33 | # See INSTALL for more information about the |
| 34 | @@ -65,7 +65,7 @@ LOCKINGTEST=__defaults__ |
| 35 | # Only edit below this line if you *think* you know what you are doing # |
| 36 | ######################################################################## |
| 37 | |
| 38 | -#LOCKINGTEST=100 # Uncomment (and change) if you think you know |
| 39 | +LOCKINGTEST=100 # Uncomment (and change) if you think you know |
| 40 | # it better than the autoconf lockingtests. |
| 41 | # This will cause the lockingtests to be hotwired. |
| 42 | # 100 to enable fcntl() |
| 43 | @@ -74,20 +74,20 @@ LOCKINGTEST=__defaults__ |
| 44 | # Or them together to get the desired combination. |
| 45 | |
| 46 | # Optional system libraries we search for |
| 47 | -SEARCHLIBS = -lm -ldir -lx -lsocket -lnet -linet -lnsl_s -lnsl_i -lnsl -lsun \ |
| 48 | - -lgen -lsockdns -ldl |
| 49 | +SEARCHLIBS = -lm -ldir -lx -lsocket -lnet -linet -lnsl_s -lnsl_i -lsun \ |
| 50 | + -lgen -lsockdns |
| 51 | # -lresolv # not really needed, is it? |
| 52 | |
| 53 | # Informal list of directories where we look for the libraries in SEARCHLIBS |
| 54 | -LIBPATHS=/lib /usr/lib /usr/local/lib |
| 55 | +LIBPATHS=/lib /usr/lib |
| 56 | |
| 57 | GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat -Wtraditional \ |
| 58 | -Wpointer-arith -Wconversion -Waggregate-return \ |
| 59 | #-Wimplicit -Wshadow -Wid-clash-6 #-Wuninitialized |
| 60 | |
| 61 | # The place to put your favourite extra cc flag |
| 62 | -CFLAGS0 = -O #$(GCC_WARNINGS) |
| 63 | -LDFLAGS0= -s |
| 64 | +CFLAGS0 = $(RPM_OPT_FLAGS) #$(GCC_WARNINGS) |
| 65 | +LDFLAGS0= |
| 66 | # Read my libs :-) |
| 67 | LIBS= |
| 68 | |
| 69 | diff --git a/config.h b/config.h |
| 70 | index c4135a9..a07453f 100644 |
| 71 | --- a/config.h |
| 72 | +++ b/config.h |
| 73 | @@ -35,7 +35,8 @@ |
| 74 | */ |
| 75 | /*#define DEFSPATH "PATH=/bin:/usr/bin" /* */ |
| 76 | /*#define DEFPATH "PATH=$HOME/bin:/bin:/usr/bin" /* */ |
| 77 | - |
| 78 | +#define DEFPATH "PATH=$HOME/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/X11R6/bin" /* */ |
| 79 | + |
| 80 | /* every environment variable appearing in PRESTENV will be set or wiped |
| 81 | * out of the environment (variables without an '=' sign will be thrown |
| 82 | * out), e.g. you could define PRESTENV as follows: |
| 83 | @@ -46,13 +47,13 @@ |
| 84 | */ |
| 85 | #define PRESTENV {"IFS","ENV","PWD",0} |
| 86 | |
| 87 | -/*#define GROUP_PER_USER /* uncomment this if each |
| 88 | +#define GROUP_PER_USER /* uncomment this if each |
| 89 | user has his or her own |
| 90 | group and procmail can therefore trust a $HOME/.procmailrc that |
| 91 | is group writable or contained in a group writable home directory |
| 92 | if the group involved is the user's default group. */ |
| 93 | |
| 94 | -/*#define LMTP /* uncomment this if you |
| 95 | +#define LMTP /* uncomment this if you |
| 96 | want to use procmail |
| 97 | as an LMTP (rfc2033) server, presumably for invocation by an MTA. |
| 98 | The file examples/local_procmail_lmtp.m4 contains info on how to |
| 99 | @@ -79,7 +80,7 @@ |
| 100 | |
| 101 | /*#define NO_fcntl_LOCK /* uncomment any of these three if you */ |
| 102 | /*#define NO_lockf_LOCK /* definitely do not want procmail to make */ |
| 103 | -/*#define NO_flock_LOCK /* use of those kernel-locking methods */ |
| 104 | +#define NO_flock_LOCK /* use of those kernel-locking methods */ |
| 105 | /* If you set LOCKINGTEST to a binary number |
| 106 | than there's no need to set these. These #defines are only useful |
| 107 | if you want to disable particular locking styles but are unsure which |
| 108 | @@ -91,14 +92,14 @@ |
| 109 | restriction does not apply to the /etc/procmailrc and |
| 110 | /etc/procmailrcs files) */ |
| 111 | |
| 112 | -/*#define NO_NFS_ATIME_HACK /* uncomment if you're definitely not using |
| 113 | +#define NO_NFS_ATIME_HACK /* uncomment if you're definitely not using |
| 114 | NFS mounted filesystems and can't afford |
| 115 | procmail to sleep for 1 sec. before writing to an empty regular |
| 116 | mailbox. This lets programs correctly judge whether there is unread |
| 117 | mail present. procmail automatically suppresses this when it isn't |
| 118 | needed or under heavy load. */ |
| 119 | |
| 120 | -/*#define DEFsendmail "/usr/sbin/sendmail" /* uncomment and/or change if |
| 121 | +#define DEFsendmail "/usr/sbin/sendmail" /* uncomment and/or change if |
| 122 | the autoconfigured default |
| 123 | SENDMAIL is not suitable. This program should quack like a sendmail: |
| 124 | it should accept the -oi flag (to tell it to _not_ treat a line |
| 125 | -- |
| 126 | 1.8.4.2 |
| 127 | |