Index: configure
===================================================================
RCS file: /cvsroot/pgsql/configure,v
retrieving revision 1.401
diff -c -c -r1.401 configure
*** configure	11 Oct 2004 19:32:17 -0000	1.401
--- configure	15 Oct 2004 05:08:02 -0000
***************
*** 757,762 ****
--- 757,766 ----
  ac_env_CPP_value=$CPP
  ac_cv_env_CPP_set=${CPP+set}
  ac_cv_env_CPP_value=$CPP
+ ac_env_LDFLAGS_SL_set=${LDFLAGS_SL+set}
+ ac_env_LDFLAGS_SL_value=$LDFLAGS_SL
+ ac_cv_env_LDFLAGS_SL_set=${LDFLAGS_SL+set}
+ ac_cv_env_LDFLAGS_SL_value=$LDFLAGS_SL
  ac_env_DOCBOOKSTYLE_set=${DOCBOOKSTYLE+set}
  ac_env_DOCBOOKSTYLE_value=$DOCBOOKSTYLE
  ac_cv_env_DOCBOOKSTYLE_set=${DOCBOOKSTYLE+set}
***************
*** 881,886 ****
--- 885,891 ----
    CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
                headers in a nonstandard directory <include dir>
    CPP         C preprocessor
+   LDFLAGS_SL
    DOCBOOKSTYLE
                location of DocBook stylesheets
  
***************
*** 3499,3504 ****
--- 3504,3510 ----
  echo "$as_me: using LDFLAGS=$LDFLAGS" >&6;}
  
  
+ 
  for ac_prog in gawk mawk nawk awk
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
***************
*** 18883,18888 ****
--- 18889,18895 ----
  s,@with_rendezvous@,$with_rendezvous,;t t
  s,@with_openssl@,$with_openssl,;t t
  s,@ELF_SYS@,$ELF_SYS,;t t
+ s,@LDFLAGS_SL@,$LDFLAGS_SL,;t t
  s,@AWK@,$AWK,;t t
  s,@FLEX@,$FLEX,;t t
  s,@FLEXFLAGS@,$FLEXFLAGS,;t t
Index: configure.in
===================================================================
RCS file: /cvsroot/pgsql/configure.in,v
retrieving revision 1.380
diff -c -c -r1.380 configure.in
*** configure.in	6 Oct 2004 09:35:19 -0000	1.380
--- configure.in	15 Oct 2004 05:08:04 -0000
***************
*** 532,537 ****
--- 532,538 ----
  AC_MSG_NOTICE([using CPPFLAGS=$CPPFLAGS])
  AC_MSG_NOTICE([using LDFLAGS=$LDFLAGS])
  
+ AC_ARG_VAR(LDFLAGS_SL)
  
  AC_PROG_AWK
  PGAC_PATH_FLEX
Index: src/Makefile.global.in
===================================================================
RCS file: /cvsroot/pgsql/src/Makefile.global.in,v
retrieving revision 1.201
diff -c -c -r1.201 Makefile.global.in
*** src/Makefile.global.in	11 Oct 2004 19:32:19 -0000	1.201
--- src/Makefile.global.in	15 Oct 2004 05:08:08 -0000
***************
*** 202,207 ****
--- 202,208 ----
  with_gnu_ld = @with_gnu_ld@
  ld_R_works = @ld_R_works@
  LDFLAGS = @LDFLAGS@
+ LDFLAGS_SL = @LDFLAGS_SL@
  LDREL = -r
  LDOUT = -o
  RANLIB = @RANLIB@
Index: src/Makefile.shlib
===================================================================
RCS file: /cvsroot/pgsql/src/Makefile.shlib,v
retrieving revision 1.84
diff -c -c -r1.84 Makefile.shlib
*** src/Makefile.shlib	13 Oct 2004 10:20:04 -0000	1.84
--- src/Makefile.shlib	15 Oct 2004 05:08:09 -0000
***************
*** 272,278 ****
  
  # Normal case
  $(shlib): $(OBJS)
! 	$(LINK.shared) $(OBJS) $(SHLIB_LINK) -o $@
  # If we're using major and minor versions, then make a symlink to major-version-only.
  ifneq ($(shlib), $(shlib_major))
  	rm -f $(shlib_major)
--- 272,278 ----
  
  # Normal case
  $(shlib): $(OBJS)
! 	$(LINK.shared) $(LDFLAGS_SL) $(OBJS) $(SHLIB_LINK) -o $@
  # If we're using major and minor versions, then make a symlink to major-version-only.
  ifneq ($(shlib), $(shlib_major))
  	rm -f $(shlib_major)
***************
*** 307,313 ****
  # Cygwin case
  $(shlib) lib$(NAME).a: $(OBJS)
  	$(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS)
! 	$(DLLWRAP) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK)
  	$(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a
  
  endif # PORTNAME == cygwin
--- 307,313 ----
  # Cygwin case
  $(shlib) lib$(NAME).a: $(OBJS)
  	$(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS)
! 	$(DLLWRAP) $(LDFLAGS_SL) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK)
  	$(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a
  
  endif # PORTNAME == cygwin
***************
*** 317,323 ****
  # win32 case
  $(shlib) lib$(NAME).a: $(OBJS)
  	$(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS)
! 	$(DLLWRAP) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK)
  	$(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a
  
  endif # PORTNAME == win32
--- 317,323 ----
  # win32 case
  $(shlib) lib$(NAME).a: $(OBJS)
  	$(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS)
! 	$(DLLWRAP) $(LDFLAGS_SL) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK)
  	$(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a
  
  endif # PORTNAME == win32