summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rwxr-xr-xconfigure11
2 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 38b3d83a..8e03f100 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2015-06-27 Kaz Kylheku <kaz@kylheku.com>
+ Fix issues in configure found by ShellCheck.
+
+ * configure (have_timegm, tm_gmtoff, tm_tmzone): Unused
+ variables removed.
+ (SIZEOF_LONG_LONG_T): Reference to nonexistent variable fixed.
+ Also, fixed two instances of arithmetic expressions using
+ unnecessary $ prefixes on variables.
+
+2015-06-27 Kaz Kylheku <kaz@kylheku.com>
+
Fix TXR 97 regression in quasiliterals.
* eval.c (expand_quasi): When the modifiers argument of a var
diff --git a/configure b/configure
index ebcd27ee..6fc5e065 100755
--- a/configure
+++ b/configure
@@ -112,7 +112,6 @@ debug_support=y
gen_gc=y
have_unistd=
have_sys_time=
-have_timegm=
have_syslog=
have_glob=
have_windows_h=
@@ -1130,7 +1129,7 @@ char DUMMY;
elif [ $SIZEOF_PTR -eq $SIZEOF_LONG ] ; then
intptr="long"
uintptr=y
- elif [ $SIZEOF_PTR -eq $SIZEOF_LONG_LONG_T ] ; then
+ elif [ $SIZEOF_PTR -eq $SIZEOF_LONGLONG_T ] ; then
intptr="longlong_t"
uintptr=$ulonglong
fi
@@ -1151,11 +1150,11 @@ intptr_max_expr="((((convert($intptr, 1) << $((SIZEOF_PTR * 8 - 2))) - 1) << 1)
printf "#define INT_PTR_MAX %s\n" "$intptr_max_expr" >> $config_h
printf "#define INT_PTR_MIN (-INT_PTR_MAX)\n" >> $config_h
-if [ -n "$longlong" ] && [ $SIZEOF_LONGLONG_T -eq $(( 2 * $SIZEOF_PTR )) ]
+if [ -n "$longlong" ] && [ $SIZEOF_LONGLONG_T -eq $(( 2 * SIZEOF_PTR )) ]
then
printf "#define HAVE_DOUBLE_INTPTR_T 1\n" >> $config_h
printf "typedef longlong_t double_intptr_t;\n" >> $config_h
-elif [ -n "$superlong" ] && [ $SIZEOF_SUPERLONG_T -eq $(( 2 * $SIZEOF_PTR )) ]
+elif [ -n "$superlong" ] && [ $SIZEOF_SUPERLONG_T -eq $(( 2 * SIZEOF_PTR )) ]
then
printf "#define HAVE_DOUBLE_INTPTR_T 1\n" >> $config_h
printf "typedef superlong_t double_intptr_t;\n" >> $config_h
@@ -1508,9 +1507,6 @@ fi
printf "detecting timezone fields in struct tm ... "
-tm_gmtoff=
-tm_tmzone=
-
for try_field in tm_gmtoff __tm_gmtoff ; do
cat > conftest.c <<!
#include <time.h>
@@ -1551,7 +1547,6 @@ int main(void)
if conftest ; then
printf "yes\n"
printf "#define HAVE_TIMEGM 1\n" >> $config_h
- have_timegm=y
else
printf "no\n"
fi