Fix naming scheme for configure cache variables.
In order to be cached, configure variables need to contain the string '_cv_', and they should begin with a package-specific prefix in order to avoid interfering with third-party macros. Rename ld_dashr, ld_wl_rpath, ld_rpath to git_cv_ld_dashr etc. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ralf Wildenhues committed
Jan 19, 2009 at 21:34 UTC
a1a587ef7200ef2b091799399ae43abf6572a686
1 file changed
+9
-9
configure.ac
+9
-9
@@ -114,31 +114,31 @@ AC_MSG_NOTICE([CHECKS for programs])
114
#
115
AC_PROG_CC([cc gcc])
116
# which switch to pass runtime path to dynamic libraries to the linker
117
-AC_CACHE_CHECK([if linker supports -R], ld_dashr, [
117
+AC_CACHE_CHECK([if linker supports -R], git_cv_ld_dashr, [
118
SAVE_LDFLAGS="${LDFLAGS}"
119
LDFLAGS="${SAVE_LDFLAGS} -R /"
120
- AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [ld_dashr=yes], [ld_dashr=no])
120
+ AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [git_cv_ld_dashr=yes], [git_cv_ld_dashr=no])
121
LDFLAGS="${SAVE_LDFLAGS}"
122
])
123
-if test "$ld_dashr" = "yes"; then
123
+if test "$git_cv_ld_dashr" = "yes"; then
124
AC_SUBST(CC_LD_DYNPATH, [-R])
125
else
126
- AC_CACHE_CHECK([if linker supports -Wl,-rpath,], ld_wl_rpath, [
126
+ AC_CACHE_CHECK([if linker supports -Wl,-rpath,], git_cv_ld_wl_rpath, [
127
SAVE_LDFLAGS="${LDFLAGS}"
128
LDFLAGS="${SAVE_LDFLAGS} -Wl,-rpath,/"
129
- AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [ld_wl_rpath=yes], [ld_wl_rpath=no])
129
+ AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [git_cv_ld_wl_rpath=yes], [git_cv_ld_wl_rpath=no])
130
LDFLAGS="${SAVE_LDFLAGS}"
131
])
132
- if test "$ld_wl_rpath" = "yes"; then
132
+ if test "$git_cv_ld_wl_rpath" = "yes"; then
133
AC_SUBST(CC_LD_DYNPATH, [-Wl,-rpath,])
134
else
135
- AC_CACHE_CHECK([if linker supports -rpath], ld_rpath, [
135
+ AC_CACHE_CHECK([if linker supports -rpath], git_cv_ld_rpath, [
136
SAVE_LDFLAGS="${LDFLAGS}"
137
LDFLAGS="${SAVE_LDFLAGS} -rpath /"
138
- AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [ld_rpath=yes], [ld_rpath=no])
138
+ AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [git_cv_ld_rpath=yes], [git_cv_ld_rpath=no])
139
LDFLAGS="${SAVE_LDFLAGS}"
140
])
141
- if test "$ld_rpath" = "yes"; then
141
+ if test "$git_cv_ld_rpath" = "yes"; then
142
AC_SUBST(CC_LD_DYNPATH, [-rpath])
143
else
144
AC_MSG_WARN([linker does not support runtime path to dynamic libraries])