Change dpkg specific m4 macros prefix from SJR_ to DPKG_

configure.ac

@@ -98,9 +98,9 @@ DPKG_CHECK_COMPAT_FUNCS([getopt getopt_long obstack_free \
                          scandir alphasort unsetenv])
 AC_CHECK_FUNCS([strtoul isascii bcopy memcpy lchown setsid getdtablesize])
 
-SJR_COMPILER_WARNINGS
-SJR_COMPILER_OPTIMISATIONS
-SJR_LINKER_OPTIMISATIONS
+DPKG_COMPILER_WARNINGS
+DPKG_COMPILER_OPTIMISATIONS
+DPKG_LINKER_OPTIMISATIONS
 
 AC_CONFIG_FILES([ Makefile
 		  dpkg-deb/Makefile

m4/compiler.m4

@@ -1,10 +1,10 @@
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 
-# SJR_COMPILER_WARNINGS
+# DPKG_COMPILER_WARNINGS
 # ---------------------
 # Add configure option to enable additional compiler warnings and treat
 # them as errors.
-AC_DEFUN([SJR_COMPILER_WARNINGS],
+AC_DEFUN([DPKG_COMPILER_WARNINGS],
 [AC_ARG_ENABLE(compiler-warnings,
 	AS_HELP_STRING([--enable-compiler-warnings],
 	               [Enable additional compiler warnings]),
@@ -18,10 +18,10 @@ AC_DEFUN([SJR_COMPILER_WARNINGS],
 fi])dnl
 ])
 
-# SJR_COMPILER_OPTIMISATIONS
+# DPKG_COMPILER_OPTIMISATIONS
 # --------------------------
 # Add configure option to disable optimisations.
-AC_DEFUN([SJR_COMPILER_OPTIMISATIONS],
+AC_DEFUN([DPKG_COMPILER_OPTIMISATIONS],
 [AC_ARG_ENABLE(compiler-optimisations,
 	AS_HELP_STRING([--disable-compiler-optimisations],
 		       [Disable compiler optimisations]),

m4/linker.m4

@@ -1,9 +1,9 @@
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 
-# SJR_LINKER_OPTIMISATIONS
+# DPKG_LINKER_OPTIMISATIONS
 # --------------------------
 # Add configure option to disable linker optimisations.
-AC_DEFUN([SJR_LINKER_OPTIMISATIONS],
+AC_DEFUN([DPKG_LINKER_OPTIMISATIONS],
 [AC_ARG_ENABLE(linker-optimisations,
 	AS_HELP_STRING([--disable-linker-optimisations],
 		       [Disable linker optimisations]),
@@ -12,4 +12,4 @@ AC_DEFUN([SJR_LINKER_OPTIMISATIONS],
 else
 	[LDFLAGS="$LDFLAGS -Wl,-O1"]
 fi], [LDFLAGS="$LDFLAGS -Wl,-O1"])dnl
-])
+])