The following commit has been merged in the master branch:
commit 6da79ad047c910fec2209e7bdd8c6cfe3bcf8209
Author: Guillem Jover <[email protected]>
Date: Wed Aug 26 00:44:49 2009 +0200
Change dpkg specific m4 macros prefix from SJR_ to DPKG_
diff --git a/configure.ac b/configure.ac
index 6280b54..bb5456c 100644
--- a/configure.ac
+++ b/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
diff --git a/m4/compiler.m4 b/m4/compiler.m4
index b85e162..59f1324 100644
--- a/m4/compiler.m4
+++ b/m4/compiler.m4
@@ -1,10 +1,10 @@
# Copyright © 2004 Scott James Remnant <[email protected]>.
-# 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]),
diff --git a/m4/linker.m4 b/m4/linker.m4
index 9ac16c4..97cc2f1 100644
--- a/m4/linker.m4
+++ b/m4/linker.m4
@@ -1,9 +1,9 @@
# Copyright © 2004 Scott James Remnant <[email protected]>.
-# 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
-])
\ No newline at end of file
+])
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
