Extracted and started using functions to uppercase and lowercase a variable.

diff --git a/acinclude/squid-util.m4 b/acinclude/squid-util.m4
index e0b546c5b93a6a24ea4b8e4fec4aa1558c18408f..8643b1722d578e53e240fefe8b2b8c15be15e6e3 100644 (file)
--- a/acinclude/squid-util.m4
+++ b/acinclude/squid-util.m4
@@ -141,3 +141,13 @@ AC_DEFUN([SQUID_CHECK_EXISTING_MODULES],[
     fi
   done
 ])
+
+dnl lowercases the contents of the variable whose name is passed by argument
+AC_DEFUN([SQUID_TOUPPER_VAR_CONTENTS],[
+  $1=`echo $$1|tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+])
+
+dnl uppercases the contents of the variable whose name is passed by argument
+AC_DEFUN([SQUID_TOUPPER_VAR_CONTENTS],[
+  $1=`echo $$1|tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
+])

diff --git a/configure.in b/configure.in
index 9db3cbef5297f43a060427bf92a77a1d3d7450fb..710494bcb9d0e68c8280e243158d41bd88c92ae1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -47,7 +47,7 @@ AC_PATH_PROG(MV, mv, $FALSE)
 AC_PATH_PROG(MKDIR, mkdir, $FALSE)
 AC_PATH_PROG(LN, ln, cp)
 AC_PATH_PROG(CHMOD, chmod, $FALSE)
-
+AC_PATH_PROG(TR, tr, $FALSE)
 AC_PATH_PROG(RM, rm, $FALSE)
 dnl Libtool 2.2.6 requires: rm -f
 RM="$RM -f"
@@ -764,6 +764,7 @@ for fs in $squid_storeio_module_candidates none; do
     esac
 done
 
+dnl TODO: FIXME What are those for? They seem to be never be defined. Kinkie
 AH_TEMPLATE(HAVE_FS_UFS, "Define to 1 if ufs filesystem module is build")
 AH_TEMPLATE(HAVE_FS_AUFS, "Define to 1 if aufs filesystem module is build")
 AH_TEMPLATE(HAVE_FS_DISKD, "Define to 1 if diskd filesystem module is build")
@@ -779,8 +780,8 @@ STORE_LIBS_TO_ADD=
 for fs in $squid_storeio_module_candidates; do
     STORE_LIBS_TO_BUILD="$STORE_LIBS_TO_BUILD lib${fs}.la"
     STORE_LIBS_TO_ADD="$STORE_LIBS_TO_ADD fs/lib${fs}.la"
-    HAVE_FS_TYPE=HAVE_FS_`echo $fs | sed 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` 
-    AC_DEFINE_UNQUOTED($HAVE_FS_TYPE, 1)
+    SQUID_TOUPPER_VAR_CONTENTS([fs])
+    AC_DEFINE_UNQUOTED(HAVE_FS_${fs}, 1)
 done
 
 AC_SUBST(STORE_LIBS_TO_BUILD)