In pgrminclude, make skipped include names constent and skip files with

#if/#ifdefs.

Author: bmomjian

src/tools/pginclude/pgrminclude

@@ -6,10 +6,15 @@
 trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
 find . \( -name CVS -a -prune \) -o -type f -name '*.[ch]' -print |
 grep -v '\./postgres.h' |
+grep -v '\./postgres_fe.h' |
 grep -v '\./pg_config.h' |
 grep -v '\./c.h' |
 while read FILE
 do
+        # Skip files with #if and #ifdef blocks because the blocks
+      	# might contain code that is not compiled on this platform.
+	grep -q '^if' "$FILE" && continue
+
 	if [ `expr $FILE : '.*\.h$'` -ne 0 ]
 	then	IS_INCLUDE="Y"
 	else	IS_INCLUDE="N"
@@ -27,7 +32,7 @@ do
 		[ -s /usr/include/$INCLUDE ] && continue
 		[ "$INCLUDE" = postgres.h ] && continue
 		[ "$INCLUDE" = postgres_fe.h ] && continue
-		[ "$INCLUDE" = config.h ] && continue
+		[ "$INCLUDE" = pg_config.h ] && continue
 		[ "$INCLUDE" = c.h ] && continue
 
 		# preserve configure-specific includes