Janitor: Correct make distcheck and compiler warnings.

4 files changed, 26 insertions, 27 deletions

diff --git a/.gitignore b/.gitignore
index a7c043e..045e78c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
 aclocal.m4
 autom4te.cache
 config.guess
@@ -17,5 +19,12 @@ Makefile
 Makefile.in
 missing
 mkinstalldirs
+scanpci
 stamp-h1
 *~
+*.o
+*.la
+*.lo
+libpciaccess-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 06b2bd0..6979024 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,14 +26,12 @@ SUBDIRS = src
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = pciaccess.pc
 
-EXTRA_DIST = pciaccess.pc.in autogen.sh src/scanpci.c src/scanpci.man
-
-EXTRA_DIST += ChangeLog
+EXTRA_DIST = pciaccess.pc.in src/scanpci.c src/scanpci.man ChangeLog
 MAINTAINERCLEANFILES = ChangeLog
 
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index f75d7a5..2aca31d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,25 +44,25 @@ AC_INIT(libpciaccess, 0.10.5, [https://bugs.freedesktop.org/enter_bug.cgi?produc
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
 AM_CONFIG_HEADER(config.h)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
 
-m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
+pciids_path=/usr/share/hwdata
+AC_ARG_WITH(pciids-path, AC_HELP_STRING([--with-pciids-path=PCIIDS_PATH],
+	[Path to pci.ids file]), [pciids_path="$withval"])
+AC_DEFINE_DIR(PCIIDS_PATH, pciids_path, [Path to pci.ids])
 
-DEFAULT_PCIIDS_PATH=/usr/share/hwdata
-AC_ARG_WITH(pciids-path,
-	AS_HELP_STRING([--with-pciids-path=PCIIDS_PATH], [Path to pci.ids file]),
-	[PCIIDS_PATH="$withval"],
-	[PCIIDS_PATH="$DEFAULT_PCIIDS_PATH"])
-AC_DEFINE_DIR(PCIIDS_PATH, PCIIDS_PATH, [Path to pci.ids])
-
-AC_ARG_WITH(zlib,
-	AS_HELP_STRING([--with-zlib], [Enable zlib support to read gzip compressed pci.ids]),
-	[use_zlib="$withval"],
-	[use_zlib="no"])
+use_zlib=no
+AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib],
+	[Enable zlib support to read gzip compressed pci.ids]),
+	[use_zlib="$withval"])
 if test "x$use_zlib" = xyes; then
 	AC_CHECK_LIB(z, gzopen,
 	[PCIACCESS_LIBS="$PCIACCESS_LIBS -lz"],
@@ -72,17 +72,6 @@ if test "x$use_zlib" = xyes; then
 	[AC_MSG_ERROR(Check for zlib.h header file failed)])
 fi
 
-if test "x$GCC" = "xyes"; then
-       GCC_WARNINGS1="-Wall -Wpointer-arith -Wstrict-prototypes"
-       GCC_WARNINGS2="-Wmissing-prototypes -Wmissing-declarations"
-       GCC_WARNINGS3="-Wnested-externs"
-       GCC_WARNINGS="$GCC_WARNINGS1 $GCC_WARNINGS2 $GCC_WARNINGS3"
-       if test "x$WERROR" = "xyes"; then
-               GCC_WARNINGS="${GCC_WARNINGS} -Werror"
-       fi
-       PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS $GCC_WARNINGS"
-fi
-
 case $host_os in
 	*freebsd* | *dragonfly*)
 		freebsd=yes
@@ -132,10 +121,12 @@ AC_CHECK_MEMBER([struct pci_io.pi_sel.pc_domain],
                  #include <sys/pciio.h>
                ])
 
+PCIACCESS_CFLAGS="$CWARFLAGS $PCIACCESS_CFLAGS"
 AC_SUBST(PCIACCESS_CFLAGS)
 AC_SUBST(PCIACCESS_LIBS)
 		  
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
 	   src/Makefile
diff --git a/src/scanpci.c b/src/scanpci.c
index c640258..34ec664 100644
--- a/src/scanpci.c
+++ b/src/scanpci.c
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <err.h>
+#include <unistd.h>
 
 #include "pciaccess.h"