diff options
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | src/include/port.h | 2 | ||||
| -rw-r--r-- | src/port/Makefile | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/configure b/configure index 52048696e2e..6c4d65f29b2 100755 --- a/configure +++ b/configure @@ -11990,6 +11990,12 @@ 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 5c6d6e2c702..a09f9042c99 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 7dcc81ee14b..86941f7ddd7 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 6dc642cd3e5..835b034fe96 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 |