Use new XORG_CWARNFLAGS and XORG_CHANGELOG macros.

  Also correct a possible uninitialized variable.

3 files changed, 14 insertions, 8 deletions

diff --git a/Makefile.am b/Makefile.am
index 0fad032..24aabef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ noinst_PROGRAMS = lisp/lsp lisp/re/tests
 #    libmp.a
 #
 
-libmp_a_CFLAGS =
+libmp_a_CFLAGS = $(CWARNFLAGS)
 libmp_a_SOURCES = \
 	lisp/mp/mp.c	\
 	lisp/mp/mp.h	\
@@ -38,7 +38,7 @@ libmp_a_SOURCES = \
 #    liblisp.a
 #
 
-liblisp_a_CFLAGS = -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"$(LISPDIR)\" $(PKGDEPS_CFLAGS)
+liblisp_a_CFLAGS = $(CWARNFLAGS) -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"$(LISPDIR)\" $(PKGDEPS_CFLAGS)
 liblisp_a_SOURCES = \
 	lisp/bytecode.c \
 	lisp/bytecode.h \
@@ -91,7 +91,7 @@ endif
 #     libre.a
 #
 
-libre_a_CFLAGS = 
+libre_a_CFLAGS = $(CWARNFLAGS)
 libre_a_SOURCES = \
 	lisp/re/re.c \
 	lisp/re/rec.c \
@@ -103,7 +103,7 @@ libre_a_SOURCES = \
 #     xedit
 #   
 xedit_DEPENDENCIES = liblisp.a libmp.a libre.a
-xedit_CFLAGS = $(PKGDEPS_CFLAGS) -I$(top_srcdir)/lisp/re -D_BSD_SOURCE -DXEDIT
+xedit_CFLAGS = $(CWARNFLAGS) $(PKGDEPS_CFLAGS) -I$(top_srcdir)/lisp/re -D_BSD_SOURCE -DXEDIT
 xedit_LDADD = -L. -lre -llisp -lmp $(PKGDEPS_LIBS) -lm
 
 xedit_SOURCES =	\
@@ -140,7 +140,7 @@ endif
 
 # lisp/lsp
 lisp_lsp_DEPENDENCIES = liblisp.a libre.a libmp.a
-lisp_lsp_CFLAGS = -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"@LISPDIR@\" -D_BSD_SOURCE
+lisp_lsp_CFLAGS = $(CWARNFLAGS) -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"@LISPDIR@\" -D_BSD_SOURCE
 lisp_lsp_LDADD = -L. -llisp -lre -lmp -lm
 lisp_lsp_SOURCES = \
 	hash.c \
@@ -156,7 +156,7 @@ endif
 
 # re/tests
 lisp_re_tests_DEPENDENCIES = libre.a
-lisp_re_tests_CFLAGS = -I$(top_srcdir)/lisp/re -D_BSD_SOURCE
+lisp_re_tests_CFLAGS = $(CWARNFLAGS) -I$(top_srcdir)/lisp/re -D_BSD_SOURCE
 lisp_re_tests_LDADD = -L. -lre
 lisp_re_tests_SOURCES = lisp/re/tests.c
 
@@ -258,6 +258,6 @@ 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/commands.c b/commands.c
index bd9b10a..2947dda 100644
--- a/commands.c
+++ b/commands.c
@@ -734,6 +734,7 @@ FindFile(Widget w, XEvent *event, String *params, Cardinal *num_params)
     XawTextPosition end = XawTextSourceScan(XawTextGetSource(filenamewindow),
 					    0, XawstAll, XawsdRight, 1, True);
 
+    slash = NULL;
     if (!line_edit) {
 	string = GetString(filenamewindow);
 	if (string)
@@ -741,7 +742,6 @@ FindFile(Widget w, XEvent *event, String *params, Cardinal *num_params)
     }
     else {
 	string = "";
-	slash = NULL;
 	line_edit = False;
     }
 
diff --git a/configure.ac b/configure.ac
index dc3a947..cd74d5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,10 @@ AC_INIT(xedit,[1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
+# Require xorg-macros version 1.2.0 or newer for XORG_CHANGELOG macro
+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)
 
 AC_PROG_CC
@@ -71,5 +75,7 @@ AC_SUBST(appdefaultdir)
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CWARNFLAGS
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile])