summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2009-11-23 17:56:20 -0800
committerKaz Kylheku <kaz@kylheku.com>2009-11-23 17:56:20 -0800
commita7d759201fb53a5d632a0d178908da0248ff9cc1 (patch)
treecfd5b630324f2470039469d5962346a1c62d3f70
parent65e6e1ac4913e82778db75f23fbd05667c23db1f (diff)
downloadtxr-a7d759201fb53a5d632a0d178908da0248ff9cc1.tar.gz
txr-a7d759201fb53a5d632a0d178908da0248ff9cc1.tar.bz2
txr-a7d759201fb53a5d632a0d178908da0248ff9cc1.zip
* configure: Bugfix in parsing configuration variables
which contain the = character. * Makefile (conftest.o): Pass full CFLAGS to configuration test builds. If some flags don't work with the compiler, this should be caught.
-rw-r--r--ChangeLog9
-rw-r--r--Makefile2
-rwxr-xr-xconfigure8
3 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 91a1ecf1..4feb1212 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2009-11-23 Kaz Kylheku <kkylheku@gmail.com>
+ * configure: Bugfix in parsing configuration variables
+ which contain the = character.
+
+ * Makefile (conftest.o): Pass full CFLAGS to configuration test
+ builds. If some flags don't work with the compiler, this should
+ be caught.
+
+2009-11-23 Kaz Kylheku <kkylheku@gmail.com>
+
* Makefile (CFLAGS): Added -I. so current directory is first
in the include search path. This is needed for finding
generated header files, when building in a separate directory.
diff --git a/Makefile b/Makefile
index 1313fe7a..cf9ba871 100644
--- a/Makefile
+++ b/Makefile
@@ -109,8 +109,6 @@ config.make:
conftest: conftest.c
$(CC) -o $@ $^
-conftest.o: CFLAGS := $(LANG_FLAGS)
-
conftest.o: conftest.c
conftest.syms: conftest.o
diff --git a/configure b/configure
index 29bb6f6e..505d80aa 100755
--- a/configure
+++ b/configure
@@ -54,12 +54,12 @@ while [ $# -gt 0 ] ; do
val=
;;
--*=* )
- var=${1%=*}
+ var=${1%%=*}
var=${var#--}
val=${1#*=}
;;
--*= )
- var=${1%=*}
+ var=${1%%=*}
var=${var#--}
val=
;; --* )
@@ -67,11 +67,11 @@ while [ $# -gt 0 ] ; do
val=y
;;
*=* )
- var=${1%=*}
+ var=${1%%=*}
val=${1#*=}
;;
*= )
- var=${1%=*}
+ var=${1%%=*}
val=
;;
* )