[PATCH] Fix nscd build

[Jakub Jelinek <jakub at redhat dot com>]

Hi!

1) configure hasn't been commited
2) if have-fpie != yes, then Rules will see still others := nscd_nischeck
   (and not others := nscd_nischeck nscd), as it is assigned later,
   which means nscd binary is not built

2003-09-24  Jakub Jelinek  <jakub@redhat.com>

	* nscd/Makefile (others): Add nscd before including ../Rules.
	* configure: Rebuilt.

--- libc/configure.jj	2003-09-24 08:14:24.000000000 -0400
+++ libc/configure	2003-09-24 08:40:47.000000000 -0400
@@ -5455,6 +5455,33 @@ fi
 echo "$as_me:$LINENO: result: $libc_cv_z_execstack" >&5
 echo "${ECHO_T}$libc_cv_z_execstack" >&6
 
+
+  echo "$as_me:$LINENO: checking for -fpie" >&5
+echo $ECHO_N "checking for -fpie... $ECHO_C" >&6
+if test "${libc_cv_fpie+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+    cat > conftest.c <<EOF
+int foo;
+EOF
+  if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fpie
+			      -o conftest conftest.c 1>&5'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }
+  then
+    libc_cv_fpie=yes
+  else
+    libc_cv_fpie=no
+  fi
+  rm -f conftest*
+fi
+echo "$as_me:$LINENO: result: $libc_cv_fpie" >&5
+echo "${ECHO_T}$libc_cv_fpie" >&6
+
+
 fi
 
 if test $elf != yes; then
@@ -7842,6 +7869,7 @@ s,@libc_cv_Bgroup@,$libc_cv_Bgroup,;t t
 s,@ASFLAGS_config@,$ASFLAGS_config,;t t
 s,@libc_cv_z_combreloc@,$libc_cv_z_combreloc,;t t
 s,@libc_cv_z_execstack@,$libc_cv_z_execstack,;t t
+s,@libc_cv_fpie@,$libc_cv_fpie,;t t
 s,@libc_cv_have_initfini@,$libc_cv_have_initfini,;t t
 s,@libc_cv_cpp_asm_debuginfo@,$libc_cv_cpp_asm_debuginfo,;t t
 s,@no_whole_archive@,$no_whole_archive,;t t
--- libc/nscd/Makefile.jj	2003-09-24 05:35:35.000000000 -0400
+++ libc/nscd/Makefile	2003-09-24 08:33:30.000000000 -0400
@@ -35,6 +35,9 @@ nscd-modules := nscd connections pwdcach
 ifeq ($(have-thread-library),yes)
 
 others := nscd_nischeck
+ifneq (yesyes,$(have-fpie)$(build-shared))
+others += nscd
+endif
 install-sbin := nscd nscd_nischeck
 
 extra-objs := $(nscd-modules:=.o) nscd_nischeck.o
@@ -84,8 +87,6 @@ $(objpfx)nscd: $(addprefix $(objpfx),$(n
 	  $(LDFLAGS) $(LDFLAGS-$(@F)) \
 	  -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) \
 	  -o $@ $^ $(common-objpfx)libc_nonshared.a
-else
-others += nscd
 endif
 
 # This makes sure -DNOT_IN_libc is passed for all these modules.

	Jakub