Merge remote-tracking branch 'upstream/master' into shared_library

Author: danielcode

.dir-locals.el

@@ -0,0 +1,18 @@
+;; see also src/tools/editors/emacs.samples for more complete settings
+
+((c-mode . ((c-basic-offset . 4)
+            (c-file-style . "bsd")
+            (fill-column . 78)
+            (indent-tabs-mode . t)
+            (tab-width . 4)))
+ (dsssl-mode . ((indent-tabs-mode . nil)))
+ (nxml-mode . ((indent-tabs-mode . nil)))
+ (perl-mode . ((perl-indent-level . 4)
+               (perl-continued-statement-offset . 4)
+               (perl-continued-brace-offset . 4)
+               (perl-brace-offset . 0)
+               (perl-brace-imaginary-offset . 0)
+               (perl-label-offset . -2)
+               (tab-width . 4)))
+ (sgml-mode . ((fill-column . 78)
+               (indent-tabs-mode . nil))))

.gitattributes

@@ -0,0 +1,35 @@
+*		whitespace=space-before-tab,trailing-space
+*.[chly]	whitespace=space-before-tab,trailing-space,indent-with-non-tab,tabwidth=4
+*.dsl		whitespace=space-before-tab,trailing-space,tab-in-indent
+*.patch		-whitespace
+*.pl		whitespace=space-before-tab,trailing-space,tabwidth=4
+*.po		whitespace=space-before-tab,trailing-space,tab-in-indent,-blank-at-eof
+*.sgml		whitespace=space-before-tab,trailing-space,tab-in-indent,-blank-at-eol
+*.x[ms]l	whitespace=space-before-tab,trailing-space,tab-in-indent
+
+# Avoid confusing ASCII underlines with leftover merge conflict markers
+README		conflict-marker-size=32
+README.*	conflict-marker-size=32
+
+# Certain data files that contain special whitespace, and other special cases
+*.data						-whitespace
+contrib/tsearch2/sql/tsearch2.sql		whitespace=space-before-tab,blank-at-eof,-blank-at-eol
+doc/bug.template				whitespace=space-before-tab,-blank-at-eof,blank-at-eol
+src/backend/catalog/sql_features.txt		whitespace=space-before-tab,blank-at-eof,-blank-at-eol
+src/backend/tsearch/hunspell_sample.affix	whitespace=-blank-at-eof
+
+# Test output files that contain extra whitespace
+*.out					-whitespace
+contrib/*/output/*.source		-whitespace
+src/test/regress/output/*.source	-whitespace
+src/interfaces/ecpg/test/expected/*	-whitespace
+src/interfaces/libpq/test/expected.out	whitespace=-blank-at-eof
+
+# These files are maintained or generated elsewhere.  We take them as is.
+configure				-whitespace
+ppport.h				-whitespace
+src/backend/regex/COPYRIGHT		-whitespace
+src/backend/regex/re_syntax.n		-whitespace
+src/backend/snowball/libstemmer/*.c	-whitespace
+src/backend/utils/mb/Unicode/*-std.txt	-whitespace
+src/include/snowball/libstemmer/*	-whitespace

.gitignore

@@ -10,13 +10,15 @@
 *.dll
 *.a
 *.mo
+*.pot
 objfiles.txt
 .deps/
 *.gcno
 *.gcda
 *.gcov
 *.gcov.out
 lcov.info
+coverage/
 *.vcproj
 *.vcxproj
 win32ver.rc

GNUmakefile.in

@@ -70,8 +70,6 @@ $(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib,check)
 
 $(call recurse,installcheck-world,src/test src/pl src/interfaces/ecpg contrib,installcheck)
 
-$(call recurse,maintainer-check,doc src config contrib)
-
 GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
 	./config.status $@
 

README.git

@@ -4,9 +4,9 @@ In a release or snapshot tarball of PostgreSQL, documentation files named
 INSTALL and HISTORY will appear in this directory.  However, these files are
 not stored in git and so will not be present if you are using a git checkout.
 If you are using git, you can view the most recent install instructions at:
-	http://developer.postgresql.org/docs/postgres/installation.html
+	http://www.postgresql.org/docs/devel/static/installation.html
 and the current release notes at:
-	http://developer.postgresql.org/docs/postgres/release.html
+	http://www.postgresql.org/docs/devel/static/release.html
 
 Users compiling from git will also need compatible versions of Bison, Flex,
 and Perl, as discussed in the install documentation.  These programs are not

config/programs.m4

@@ -197,6 +197,11 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
   if test -z "$MSGFMT"; then
     AC_MSG_ERROR([msgfmt is required for NLS])
   fi
+  AC_CACHE_CHECK([for msgfmt flags], pgac_cv_msgfmt_flags,
+[if test x"$MSGFMT" != x"" && "$MSGFMT" --version 2>&1 | grep "GNU" >/dev/null; then
+    pgac_cv_msgfmt_flags=-c
+fi])
+  AC_SUBST(MSGFMT_FLAGS, $pgac_cv_msgfmt_flags)
   AC_CHECK_PROGS(MSGMERGE, msgmerge)
   AC_CHECK_PROGS(XGETTEXT, xgettext)
 ])# PGAC_CHECK_GETTEXT