Attachment #233419 for bug #296357

Lines 173-179 AC_ARG_WITH(hesiod, Link Here

(-)configure.in.old (-1 / +1 lines)
173	: Search for Hesiod in normal directory path	173	: Search for Hesiod in normal directory path
174	else	174	else
175	: Search for Hesiod in specific directory	175	: Search for Hesiod in specific directory
176	LDFLAGS="$LDFLAGS -L${withval}/lib"	176	LDFLAGS="$LDFLAGS -Wl,--no-as-needed -L${withval}/lib"
177	LIBHESIOD="-L${withval}/lib"	177	LIBHESIOD="-L${withval}/lib"
178	HESIOD_FLAGS="-I${withval}/include"	178	HESIOD_FLAGS="-I${withval}/include"
179	fi	179	fi

Lines 90-92 Link Here

(-)Makefile.conf.in.old (+2 lines)
90	# Location for init.d files	90	# Location for init.d files
91	initdir = @initdir@	91	initdir = @initdir@
92		92
		93	# Use the compiler determined by configure
		94	CC := @CC@




AUTOFS_LIB = ../lib/autofs.a

# Compilers, linkers and flags
# The STRIP defined here *must not* remove any dynamic-loading symbols

ifdef DMALLOCLIB
DEBUG=1
endif


ifdef DEBUG
CFLAGS    ?= -g -Wall -DDEBUG
LDFLAGS   = -g
STRIP     = :
else
ifdef DONTSTRIP
CFLAGS    ?= -O2 -g
LDFLAGS   = -g
STRIP     = :
else
CFLAGS    ?= -O2 -Wall
LDFLAGS   = -s
STRIP     = strip --strip-debug
endif
endif
AUTOFS_LDFLAGS = -g

CC        = gcc
CXX       = g++
CXXFLAGS  = $(CFLAGS)
LD        = ld
SOLDFLAGS = -shared

CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
LDFLAGS += -lpthread

ifdef TIRPCLIB
CFLAGS += -I/usr/include/tirpc
AUTOFS_LDFLAGS += $(TIRPCLIB)
endif

ifdef DMALLOCLIB
AUTOFS_LDFLAGS += $(DMALLOCLIB)
endif

# Standard rules


.c.so:
	$(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)
	$(STRIP) $*.so




# Makefile for autofs
#

-include ../Makefile.conf
include ../Makefile.rules
-include ../Makefile.conf

SRCS = automount.c indirect.c direct.c spawn.c module.c mount.c \
	lookup.c state.c flag.c

CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\"
CFLAGS += -DVERSION_STRING=\"$(version)\"
LDFLAGS += -rdynamic
LIBS = -ldl -lpthread

ifeq ($(LDAP), 1)
  ifeq ($(SASL), 1)

all: automount

automount: $(OBJS) $(AUTOFS_LIB)
	$(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
	$(STRIP) automount

clean:
	rm -f *.o *.s *~ automount





mount_clnt.o: mount_clnt.c
	$(CC) $(CFLAGS) -o mount_clnt.o -c mount_clnt.c
	$(STRIP) mount_clnt.o

mount_xdr.c: mount.h
	$(RPCGEN) -c -o mount_xdr.c mount.x

mount_xdr.o: mount_xdr.c
	$(CC) $(CFLAGS) -Wno-unused-variable -o mount_xdr.o -c mount_xdr.c
	$(STRIP) mount_xdr.o

master_tok.c: master_tok.l
	$(LEX) -o$@ -Pmaster_ $?




lookup_hesiod.so: lookup_hesiod.c
	$(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
		lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV)
	$(STRIP) lookup_hesiod.so

cyrus-sasl.o: cyrus-sasl.c
	$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $<

	$(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
		lookup_ldap.c dclist.o $(SASL_OBJ) \
		$(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV)
	$(STRIP) lookup_ldap.so

mount_nfs.so: mount_nfs.c replicated.o
	$(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
		mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL)
	$(STRIP) mount_nfs.so


Return to bug 296357

Lines 41-54 Link Here

(-)lib/Makefile.old (-2 lines)
41		41
42	mount_clnt.o: mount_clnt.c	42	mount_clnt.o: mount_clnt.c
43	$(CC) $(CFLAGS) -o mount_clnt.o -c mount_clnt.c	43	$(CC) $(CFLAGS) -o mount_clnt.o -c mount_clnt.c
44	$(STRIP) mount_clnt.o
45		44
46	mount_xdr.c: mount.h	45	mount_xdr.c: mount.h
47	$(RPCGEN) -c -o mount_xdr.c mount.x	46	$(RPCGEN) -c -o mount_xdr.c mount.x
48		47
49	mount_xdr.o: mount_xdr.c	48	mount_xdr.o: mount_xdr.c
50	$(CC) $(CFLAGS) -Wno-unused-variable -o mount_xdr.o -c mount_xdr.c	49	$(CC) $(CFLAGS) -Wno-unused-variable -o mount_xdr.o -c mount_xdr.c
51	$(STRIP) mount_xdr.o
52		50
53	master_tok.c: master_tok.l	51	master_tok.c: master_tok.l
54	$(LEX) -o$@ -Pmaster_ $?	52	$(LEX) -o$@ -Pmaster_ $?

Lines 16-23 Link Here

(-)Makefile.rules.old (-18 / +3 lines)
16	AUTOFS_LIB = ../lib/autofs.a	16	AUTOFS_LIB = ../lib/autofs.a
17		17
18	# Compilers, linkers and flags	18	# Compilers, linkers and flags
19	# The STRIP defined here must not remove any dynamic-loading symbols
20
21	ifdef DMALLOCLIB	19	ifdef DMALLOCLIB
22	DEBUG=1	20	DEBUG=1
23	endif	21	endif
Lines 24-59 Link Here
24		24
25	ifdef DEBUG	25	ifdef DEBUG
26	CFLAGS ?= -g -Wall -DDEBUG	26	CFLAGS ?= -g -Wall -DDEBUG
27	LDFLAGS = -g
28	STRIP = :
29	else	27	else
30	ifdef DONTSTRIP
31	CFLAGS ?= -O2 -g	28	CFLAGS ?= -O2 -g
32	LDFLAGS = -g
33	STRIP = :
34	else
35	CFLAGS ?= -O2 -Wall
36	LDFLAGS = -s
37	STRIP = strip --strip-debug
38	endif
39	endif	29	endif
		30	AUTOFS_LDFLAGS = -g
40		31
41	CC = gcc
42	CXX = g++
43	CXXFLAGS = $(CFLAGS)	32	CXXFLAGS = $(CFLAGS)
44	LD = ld	33	LD = ld
45	SOLDFLAGS = -shared	34	SOLDFLAGS = -shared
46		35
47	CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64	36	CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
48	LDFLAGS += -lpthread
49		37
50	ifdef TIRPCLIB	38	ifdef TIRPCLIB
51	CFLAGS += -I/usr/include/tirpc	39	CFLAGS += -I/usr/include/tirpc
52	LDFLAGS += $(TIRPCLIB)	40	AUTOFS_LDFLAGS += $(TIRPCLIB)
53	endif	41	endif
54		42
55	ifdef DMALLOCLIB	43	ifdef DMALLOCLIB
56	LDFLAGS += $(DMALLOCLIB)	44	AUTOFS_LDFLAGS += $(DMALLOCLIB)
57	endif	45	endif
58		46
59	# Standard rules	47	# Standard rules
Lines 56-59 Link Here
56		54
57	.c.so:	55	.c.so:
58	$(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)	56	$(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)
59	$(STRIP) $*.so

Lines 2-9 Link Here

(-)daemon/Makefile.old (-4 / +3 lines)
2	# Makefile for autofs	2	# Makefile for autofs
3	#	3	#
4		4
5	-include ../Makefile.conf
6	include ../Makefile.rules	5	include ../Makefile.rules
		6	-include ../Makefile.conf
7		7
8	SRCS = automount.c indirect.c direct.c spawn.c module.c mount.c \	8	SRCS = automount.c indirect.c direct.c spawn.c module.c mount.c \
9	lookup.c state.c flag.c	9	lookup.c state.c flag.c
Lines 20-26 Link Here
20	CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\"	20	CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\"
21	CFLAGS += -DVERSION_STRING=\"$(version)\"	21	CFLAGS += -DVERSION_STRING=\"$(version)\"
22	LDFLAGS += -rdynamic	22	LDFLAGS += -rdynamic
23	LIBS = -ldl	23	LIBS = -ldl -lpthread
24		24
25	ifeq ($(LDAP), 1)	25	ifeq ($(LDAP), 1)
26	ifeq ($(SASL), 1)	26	ifeq ($(SASL), 1)
Lines 30-37 Link Here
30	all: automount	30	all: automount
31		31
32	automount: $(OBJS) $(AUTOFS_LIB)	32	automount: $(OBJS) $(AUTOFS_LIB)
33	$(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)	33	$(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
34	$(STRIP) automount
35		34
36	clean:	35	clean:
37	rm -f .o .s *~ automount	36	rm -f .o .s *~ automount

Lines 87-93 Link Here

(-)modules/Makefile.old (-4 lines)
87	lookup_hesiod.so: lookup_hesiod.c	87	lookup_hesiod.so: lookup_hesiod.c
88	$(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \	88	$(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
89	lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV)	89	lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV)
90	$(STRIP) lookup_hesiod.so
91		90
92	cyrus-sasl.o: cyrus-sasl.c	91	cyrus-sasl.o: cyrus-sasl.c
93	$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $<	92	$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $<
Lines 96-105 Link Here
96	$(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \	95	$(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
97	lookup_ldap.c dclist.o $(SASL_OBJ) \	96	lookup_ldap.c dclist.o $(SASL_OBJ) \
98	$(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV)	97	$(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV)
99	$(STRIP) lookup_ldap.so
100		98
101	mount_nfs.so: mount_nfs.c replicated.o	99	mount_nfs.so: mount_nfs.c replicated.o
102	$(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \	100	$(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
103	mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL)	101	mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL)
104	$(STRIP) mount_nfs.so
105