From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 14 Mar 2015 18:08:45 +0000 (-0400)
Subject: Build src/port/dirmod.c only on Windows.
X-Git-Tag: REL9_4_2~75
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c415c13b7ef68c7f8626f74a8e593af2a5a766b9;p=postgresql

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 52048696e2..6c4d65f29b 100755
--- a/configure
+++ b/configure
@@ -11989,6 +11989,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 5c6d6e2c70..a09f9042c9 100644
--- a/configure.in
+++ b/configure.in
@@ -1454,6 +1454,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 7dcc81ee14..86941f7ddd 100644
--- 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 6dc642cd3e..835b034fe9 100644
--- 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 fls.o inet_net_ntop.o \
+OBJS = $(LIBOBJS) chklocale.o erand48.o fls.o inet_net_ntop.o \
 	noblock.o path.o pgcheckdir.o pg_crc.o pgmkdirp.o pgsleep.o \
 	pgstrcasecmp.o pqsignal.o \
 	qsort.o qsort_arg.o quotes.o sprompt.o tar.o thread.o