Build src/port/dirmod.c only on Windows.

Since commit ba7c5975adea74c6f17bdb0e0427ad85962092a2, port/dirmod.c
has contained only Windows-specific functions.  Most platforms don't
seem to mind uselessly building an empty file, but OS X for one issues
warnings.  Hence, treat dirmod.c as a Windows-specific file selected
by configure rather than one that's always built.  We can revert this
change if dirmod.c ever gains any non-Windows functionality again.

Back-patch to 9.4 where the mentioned commit appeared.

diff --git a/configure b/configure
index fa271fe4ebe6a057fd1a5170388230380ec7fec8..ddbda1cddf6d455f4eed3c95714212bc747bf821 100755 (executable)
--- a/configure
+++ b/configure
@@ -12083,6 +12083,12 @@ esac
 fi
 
 
+  case " $LIBOBJS " in
+  *" dirmod.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS dirmod.$ac_objext"
+ ;;
+esac
+
   case " $LIBOBJS " in
   *" kill.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS kill.$ac_objext"

diff --git a/configure.in b/configure.in
index e6a49d123b61bc275ba3d158f8a23cbb497f7157..a023727ebaee60d051ef40fce4001de8ae2f99c3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1439,6 +1439,7 @@ fi
 # Win32 support
 if test "$PORTNAME" = "win32"; then
   AC_REPLACE_FUNCS(gettimeofday)
+  AC_LIBOBJ(dirmod)
   AC_LIBOBJ(kill)
   AC_LIBOBJ(open)
   AC_LIBOBJ(system)

diff --git a/src/include/port.h b/src/include/port.h
index b64651f1665b2a1f06d0b3782d07364e48da4b57..29854dd752e8887d5e7a513fcc0d792d95657ba2 100644 (file)
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -61,7 +61,7 @@ extern void get_man_path(const char *my_exec_path, char *ret_path);
 extern bool get_home_path(char *ret_path);
 extern void get_parent_directory(char *path);
 
-/* port/dirmod.c */
+/* common/pgfnames.c */
 extern char **pgfnames(const char *path);
 extern void pgfnames_cleanup(char **filenames);
 

diff --git a/src/port/Makefile b/src/port/Makefile
index 05112eb6e61ce58b58a9bafe0dab1baef2f81ecb..abc42a222676664b2f76234bf7788a676bd23a1d 100644 (file)
--- a/src/port/Makefile
+++ b/src/port/Makefile
@@ -30,7 +30,7 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -I$(top_builddir)/src/port -DFRONTEND $(CPPFLAGS)
 LIBS += $(PTHREAD_LIBS)
 
-OBJS = $(LIBOBJS) chklocale.o dirmod.o erand48.o inet_net_ntop.o \
+OBJS = $(LIBOBJS) chklocale.o erand48.o inet_net_ntop.o \
        noblock.o path.o pgcheckdir.o pgmkdirp.o pgsleep.o \
        pgstrcasecmp.o pqsignal.o \
        qsort.o qsort_arg.o quotes.o sprompt.o tar.o thread.o