1 --- yp-tools-2.7/src/Makefile.am~ Wed Jun 5 14:40:19 2002
2 +++ yp-tools-2.7/src/Makefile.am Wed Jun 5 14:40:19 2002
4 AUTOMAKE_OPTIONS = 1.4 gnits
7 -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 555
9 -CFLAGS = @WARNFLAGS@ @DEFS@ @CFLAGS@
10 -LDADD = @LIBINTL@ ../lib/libyptools.a
11 +LDADD = $(INTLLIBS) ../lib/libyptools.a
13 localedir = $(datadir)/locale
14 INCLUDES = -I$(srcdir) -I$(top_srcdir) -DLOCALEDIR=\"$(localedir)\"
16 CLEANFILES = *~ domainname
18 -rootexecbindir = @rootbindir@
20 EXTRA_PROGRAMS = domainname
21 -rootexecbin_PROGRAMS = @DOMAINNAME@
22 +rootbin_PROGRAMS = $(DOMAINNAME)
23 bin_PROGRAMS = ypwhich ypmatch ypcat yppasswd
24 sbin_PROGRAMS = yppoll ypset yptest
26 -domainname_LDADD := @LIBINTL@
28 yppasswd_SOURCES = yppasswd.c yppasswd_xdr.c yppasswd.h
29 -yppasswd_LDADD = ${LDADD} @LIBCRYPT@ @LIBCRACK@
30 +yppasswd_LDADD = ${LDADD} $(LIBCRYPT) $(LIBCRACK)
31 yppasswd_CFLAGS = -DPASSWD_PROG=\"${PASSWD_PROG}\" \
32 -DCHFN_PROG=\"${CHFN_PROG}\" -DCHSH_PROG=\"${CHSH_PROG}\"
34 --- yp-tools-2.7/man/Makefile.am~ Wed Jun 5 14:42:15 2002
35 +++ yp-tools-2.7/man/Makefile.am Wed Jun 5 14:42:15 2002
37 yppoll.8.in ypset.8.in yptest.8.in ypwhich.1.in nicknames.5.in
39 man_MANS = ypcat.1 ypchfn.1 ypchsh.1 ypmatch.1 yppasswd.1 yppoll.8 ypset.8\
40 - yptest.8 ypwhich.1 nicknames.5 @MAN_DOMAINNAME@
41 + yptest.8 ypwhich.1 nicknames.5 $(MAN_DOMAINNAME)
42 --- yp-tools-2.7/lib/Makefile.am~ Wed Jun 5 14:44:06 2002
43 +++ yp-tools-2.7/lib/Makefile.am Wed Jun 5 14:44:06 2002
46 noinst_LIBRARIES = libyptools.a
48 -CFLAGS = @WARNFLAGS@ @DEFS@ @CFLAGS@
50 EXTRA_DIST = getopt.c getopt1.c getline.c ypbinderr_string.c
52 noinst_HEADERS = getopt.h getline.h yp-tools.h nicknames.h yp_all_host.h
54 libyptools_a_SOURCES = nicknames.c yp_xdr.c yp_all_host.c
55 -libyptools_a_LIBADD = @LIBOBJS@
57 localedir = $(datadir)/locale
58 INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
59 --- yp-tools-2.7/Makefile.am~ Wed Jun 5 14:45:06 2002
60 +++ yp-tools-2.7/Makefile.am Wed Jun 5 14:45:06 2002
62 AUTOMAKE_OPTIONS = 1.5 gnits dist-bzip2
63 MAINT_CHARSET = latin1
65 -SUBDIRS = m4 lib src po man etc
66 +SUBDIRS = intl lib src po man etc
70 #EXTRA_DIST = yp-tools.spec
72 -ACLOCAL_AMFLAGS = -I m4
74 EXTRA_DIST = config.rpath
75 --- yp-tools-2.7/acinclude.m4~ Wed Jun 5 14:45:54 2002
76 +++ yp-tools-2.7/acinclude.m4 Wed Jun 5 14:45:54 2002
78 dnl We can't just do AC_REPLACE_FUNCS(getline) because some systems
79 dnl have a function by that name in -linet that doesn't have anything
80 dnl to do with the function we need.
81 -AC_DEFUN(AM_FUNC_GETLINE,
82 +AC_DEFUN([AM_FUNC_GETLINE],
84 am_getline_needs_run_time_check=no
85 AC_CHECK_FUNC(getline,
90 -AC_DEFUN(AM_WITH_EFENCE,
91 +AC_DEFUN([AM_WITH_EFENCE],
92 [AC_MSG_CHECKING(if malloc debugging with efence is wanted)
94 [ --with-efence use ElectricFence 2.05],
95 --- yp-tools-2.7/configure.in~ Wed Jun 5 17:43:35 2002
96 +++ yp-tools-2.7/configure.in Wed Jun 5 17:43:35 2002
98 AM_CONFIG_HEADER(config.h)
99 AC_PREFIX_DEFAULT(/usr)
101 -dnl Set of available languages.
108 -test "${prefix}" = "NONE" && prefix="/usr"
109 -if test ${prefix} = '/usr'
111 -dnl If we use /usr as prefix, use /usr/share/man for manual pages
112 - if test ${mandir} = '${prefix}/man'
114 - mandir='${prefix}/share/man'
116 +if test "${prefix}" = "NONE"; then
119 dnl Change libexec to lib/yp
120 -if test ${libexecdir} = '${exec_prefix}/libexec'
122 - libexecdir='${exec_prefix}/lib/yp'
123 +if test ${libexecdir} = '${exec_prefix}/libexec'; then
124 + libexecdir='${exec_prefix}/lib/yp'
127 -if test x"$ac_default_prefix" = x"/usr"
130 +if test x"$ac_default_prefix" = x"/usr"; then
133 - rootbindir=$ac_default_prefix"/bin"
134 + rootbindir=$ac_default_prefix"/bin"
138 dnl Should we install domainname ? default yes
139 AC_ARG_ENABLE(domainname,
140 - [ --disable-domainname Don't install domainname [default=yes]],
141 - INSTALL_DOMAINNAME=$enableval, INSTALL_DOMAINNAME=yes)
142 -if test "$INSTALL_DOMAINNAME" = "no"
146 + [ --disable-domainname Don't install domainname [default=yes]],
147 + INSTALL_DOMAINNAME=$enableval, INSTALL_DOMAINNAME=yes)
148 +if test "$INSTALL_DOMAINNAME" = "no"; then
152 - DOMAINNAME=domainname
153 - MAN_DOMAINNAME="domainname.8 nisdomainname.8 ypdomainname.8"
154 + DOMAINNAME=domainname
155 + MAN_DOMAINNAME="domainname.8 nisdomainname.8 ypdomainname.8"
158 AC_SUBST(MAN_DOMAINNAME)
160 dnl Should we use the CRACKLIB ? default no
161 AC_ARG_ENABLE(cracklib,
162 - [ --enable-cracklib Use the cracklib for yppasswd [default=no]],
164 - AC_DEFINE(USE_CRACKLIB,1,[Define if you want to use libcrack to check the new passwords]))
165 + [ --enable-cracklib Use the cracklib for yppasswd [default=no]],
167 + AC_DEFINE(USE_CRACKLIB,1,[Define if you want to use libcrack to check the new passwords]))
169 dnl Should we do extra checks even if we use the CRACKLIB ? default no
170 AC_ARG_ENABLE(cracklib-strict,
171 - [ --enable-cracklib-strict Do some extra tests before accepting [default=no]],
173 - USE_CRACKLIB_STRICT=1;
174 - AC_DEFINE(USE_CRACKLIB,1,[Define if you want to use libcrack to check the new passwords])
175 - AC_DEFINE(USE_CRACKLIB_STRICT,1,[Define if you want to use some extra checks besides the cracklib]))
176 + [ --enable-cracklib-strict Do some extra tests before accepting [default=no]],
178 + USE_CRACKLIB_STRICT=1;
179 + AC_DEFINE(USE_CRACKLIB,1,[Define if you want to use libcrack to check the new passwords])
180 + AC_DEFINE(USE_CRACKLIB_STRICT,1,[Define if you want to use some extra checks besides the cracklib]))
182 dnl Should passwd be used instead of yppasswd ? Default is no.
183 AC_ARG_ENABLE(call-passwd,
184 - [ --enable-call-passwd yppasswd calls passwd, chfn or chsh [default=no]],
185 + [ --enable-call-passwd yppasswd calls passwd, chfn or chsh [default=no]],
186 YPPASSWD_IS_DEPRECATED=1
187 - AC_DEFINE(YPPASSWD_IS_DEPRECATED,1,[Define if yppasswd is deprecated and passwd should be used instead]))
189 + AC_DEFINE(YPPASSWD_IS_DEPRECATED,1,[Define if yppasswd is deprecated and passwd should be used instead]))
191 dnl Checks for programs.
193 dnl If we're using gcc, we want warning flags
194 -dnl test -n "$GCC" && WARNFLAGS="-Wall"
195 -test -n "$GCC" && WARNFLAGS="-W -Wall -Wbad-function-cast -Wcast-align -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef"
197 +if test -n "$GCC"; then
198 + CFLAGS="$CFLAGS -W -Wall -Wbad-function-cast -Wcast-align -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef"
206 if test "${YPPASSWD_IS_DEPRECATED}" = "1"; then
207 - AC_PATH_PROG(PASSWD_PROG, passwd)
208 - AC_PATH_PROG(CHFN_PROG, chfn)
209 - AC_PATH_PROG(CHSH_PROG, chsh)
210 + AC_PATH_PROG(PASSWD_PROG, passwd)
211 + AC_PATH_PROG(CHFN_PROG, chfn)
212 + AC_PATH_PROG(CHSH_PROG, chsh)
217 AC_CHECK_LIB(nsl, yp_get_default_domain)
219 AC_CHECK_LIB(xcrypt,crypt,LIBCRYPT="-lxcrypt",LIBCRYPT="")
220 -if test -z "$LIBCRYPT" ; then
221 - AC_CHECK_LIB(crypt,crypt,LIBCRYPT="-lcrypt",LIBCRYPT="")
222 - AC_CHECK_HEADERS(crypt.h)
223 +if test -z "$LIBCRYPT"; then
224 + AC_CHECK_LIB(crypt,crypt,LIBCRYPT="-lcrypt",LIBCRYPT="")
225 + AC_CHECK_HEADERS(crypt.h)
227 - AC_CHECK_HEADERS(xcrypt.h crypt.h)
228 + AC_CHECK_HEADERS(xcrypt.h crypt.h)
232 dnl Check for libcrack
233 if test "${USE_CRACKLIB}" = "1"; then
234 - AC_CHECK_LIB(crack, FascistCheck, LIBCRACK="-lcrack",LIBCRACK="")
236 + AC_CHECK_LIB(crack, FascistCheck, LIBCRACK="-lcrack",LIBCRACK="")
240 dnl Checks for header files.
241 @@ -118,21 +102,36 @@
244 dnl Checks for library functions.
245 -AC_CHECK_FUNC(getopt_long, , [AC_LIBOBJ(getopt) AC_LIBOBJ(getopt1)])
246 +AC_CHECK_FUNC(getopt_long, [], [AC_LIBOBJ(getopt) AC_LIBOBJ(getopt1)])
248 AC_REPLACE_FUNCS(ypbinderr_string)
251 if test $am_cv_func_working_getline != yes; then
252 - AC_CHECK_FUNCS(getdelim)
253 + AC_CHECK_FUNCS(getdelim)
255 - AC_CHECK_FUNCS(getline)
256 + AC_CHECK_FUNCS(getline)
259 dnl internationalization macros
260 -AM_GNU_GETTEXT([external])
264 -AC_OUTPUT([Makefile lib/Makefile src/Makefile man/Makefile m4/Makefile
265 - etc/Makefile po/Makefile.in man/domainname.8 man/nicknames.5
266 - man/ypcat.1 man/ypmatch.1 man/yppasswd.1 man/yppoll.8
267 - man/ypset.8 man/yptest.8 man/ypwhich.1])