aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt3
-rw-r--r--Makefile.in4
-rwxr-xr-xconfigure140
3 files changed, 81 insertions, 66 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index da0cf31..df8478c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,6 @@
+2012-07-20:
+ * (seebs) Add --cflags, deprecate --arch.
+
2012-06-28:
* (seebs) Tag 1.3.1.
diff --git a/Makefile.in b/Makefile.in
index e7507d0..319d7b0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,7 +23,7 @@ LIBDIR=@LIBDIR@
SUFFIX=@SUFFIX@
SQLITE=@SQLITE@
BITS=@BITS@
-COMPILE_BITS=@COMPILE_BITS@
+ARCH_FLAGS=@ARCH_FLAGS@
MARK64=@MARK64@
RPATH=@RPATH@
VERSION=1.3.1
@@ -35,7 +35,7 @@ BINDIR=$(PREFIX)/$(BIN)
LOCALSTATEDIR=$(PREFIX)/$(LOCALSTATE)
CFLAGS_BASE=-pipe -std=gnu99 -Wall -W -Wextra
-CFLAGS_CODE=-fPIC -D_LARGEFILE64_SOURCE -D_ATFILE_SOURCE $(COMPILE_BITS)
+CFLAGS_CODE=-fPIC -D_LARGEFILE64_SOURCE -D_ATFILE_SOURCE $(ARCH_FLAGS)
CFLAGS_DEFS=-DPSEUDO_PREFIX='"$(PREFIX)"' -DPSEUDO_SUFFIX='"$(SUFFIX)"' -DPSEUDO_BINDIR='"$(BIN)"' -DPSEUDO_LIBDIR='"$(LIB)"' -DPSEUDO_LOCALSTATEDIR='"$(LOCALSTATE)"' -DPSEUDO_VERSION='"$(VERSION)"'
CFLAGS_DEBUG=-O2 -g
CFLAGS_SQL=-L$(SQLITE)/lib -I$(SQLITE)/include $(RPATH)
diff --git a/configure b/configure
index cc9cfd0..c61f118 100755
--- a/configure
+++ b/configure
@@ -23,6 +23,7 @@ opt_libdir=
opt_suffix=
opt_arch=x86
opt_bits=
+opt_arch=x86
opt_sqlite=/usr
opt_rpath=
@@ -31,16 +32,16 @@ compile_x86_64=-m64
usage()
{
- echo >&2 "usage:"
- echo >&2 " configure --prefix=..."
- echo >&2 " [--libdir=...]"
- echo >&2 " [--suffix=...]"
- echo >&2 " [--with-sqlite=...]"
- echo >&2 " [--enable-static-sqlite]"
- echo >&2 " [--with-rpath=...|--without-rpath]"
- echo >&2 " [--arch=x86|arm|'']"
- echo >&2 " [--bits=32|64]"
- exit 1
+ echo >&2 "usage:"
+ echo >&2 " configure --prefix=..."
+ echo >&2 " [--libdir=...]"
+ echo >&2 " [--suffix=...]"
+ echo >&2 " [--with-sqlite=...]"
+ echo >&2 " [--enable-static-sqlite]"
+ echo >&2 " [--with-rpath=...|--without-rpath]"
+ echo >&2 " [--cflags='']"
+ echo >&2 " [--bits=32|64]"
+ exit 1
}
sqlite_ldarg=-lsqlite3
@@ -50,70 +51,80 @@ use_maybe_rpath=true
for arg
do
- case $arg in
- --) shift; break ;;
- --prefix=*)
- opt_prefix=${arg#--prefix=}
- ;;
- --libdir=*)
- opt_libdir=${arg#--libdir=}
- ;;
- --enable-static-sqlite)
- sqlite_ldarg='$(SQLITE)/lib/libsqlite3.a'
- use_maybe_rpath=false
- ;;
- --with-sqlite=*)
- opt_sqlite=${arg#--with-sqlite=}
- # assign new value if unset
- maybe_rpath='-Wl,-R$(SQLITE)/lib'
- ;;
- --without-rpath)
- opt_rpath=''
- use_maybe_rpath=false
- ;;
- --with-rpath=*)
- rpath=${arg#--with-rpath=}
- opt_rpath=${rpath:+-Wl,-R$rpath}
- use_maybe_rpath=false
- ;;
- --suffix=*)
- opt_suffix=${arg#--suffix=}
- ;;
- --arch=*)
- opt_arch=${arg#--arch=}
- ;;
- --bits=*)
- opt_bits=${arg#--bits=}
- case $opt_bits in
- 64) opt_mark64=64;;
- 32) opt_mark64=;;
- *) echo >&2 "Unknown bit size $opt_bits (only 32 and 64 known)."
- ;;
- esac
- ;;
- *)
- echo >&2 "warning: Unrecognized option '$arg'"
- ;;
- esac
+ case $arg in
+ --) shift; break ;;
+ --prefix=*)
+ opt_prefix=${arg#--prefix=}
+ ;;
+ --libdir=*)
+ opt_libdir=${arg#--libdir=}
+ ;;
+ --enable-static-sqlite)
+ sqlite_ldarg='$(SQLITE)/lib/libsqlite3.a'
+ use_maybe_rpath=false
+ ;;
+ --with-sqlite=*)
+ opt_sqlite=${arg#--with-sqlite=}
+ # assign new value if unset
+ maybe_rpath='-Wl,-R$(SQLITE)/lib'
+ ;;
+ --without-rpath)
+ opt_rpath=''
+ use_maybe_rpath=false
+ ;;
+ --with-rpath=*)
+ rpath=${arg#--with-rpath=}
+ opt_rpath=${rpath:+-Wl,-R$rpath}
+ use_maybe_rpath=false
+ ;;
+ --suffix=*)
+ opt_suffix=${arg#--suffix=}
+ ;;
+ --arch=*)
+ echo >&2 "WARNING: The --arch option is now deprecated. Use --cflags."
+ opt_arch=${arg#--arch=}
+ ;;
+ --cflags=*)
+ opt_cflags=${arg#--cflags=}
+ ;;
+ --bits=*)
+ opt_bits=${arg#--bits=}
+ case $opt_bits in
+ 64) opt_mark64=64;;
+ 32) opt_mark64=;;
+ *) echo >&2 "Unknown bit size $opt_bits (only 32 and 64 known)."
+ ;;
+ esac
+ ;;
+ *)
+ echo >&2 "warning: Unrecognized option '$arg'"
+ ;;
+ esac
done
case $opt_arch in
'' | x86 | arm )
- ;;
-*) echo >&2 "Untested arch $opt_arch."
- ;;
+ ;;
+*) echo >&2 "Untested arch $opt_arch."
+ ;;
esac
-# Some targets want something like -m64.
-eval compile_bits=\$compile_${opt_arch}_${opt_bits}
+if [ "${opt_cflags-UNSET}" = "UNSET" ]; then
+ # Some targets want something like -m64.
+ eval arch_flags=\$compile_${opt_arch}_${opt_bits}
+ echo >&2 "WARNING: Guessing architecture CFLAGS '${arch_flags-<unset>}'."
+ echo >&2 "If you need specific flags, use --cflags."
+else
+ eval arch_flags=\$opt_cflags
+fi
if $use_maybe_rpath && [ -n "$maybe_rpath" ]; then
- echo >&2 "Adding default RPATH for sqlite."
- opt_rpath="${opt_rpath+${opt_rpath} }${maybe_rpath}"
+ echo >&2 "Adding default RPATH for sqlite."
+ opt_rpath="${opt_rpath+${opt_rpath} }${maybe_rpath}"
fi
if [ -z "$opt_prefix" ]; then
- usage
+ usage
fi
if [ -z "$opt_libdir" ]; then
@@ -150,10 +161,11 @@ sed -e '
s,@LIB@,'"$opt_lib"',g
s,@SUFFIX@,'"$opt_suffix"',g
s,@SQLITE@,'"$opt_sqlite"',g
- s,@COMPILE_BITS@,'"$compile_bits"',g
+ s,@ARCH_FLAGS@,'"$arch_flags"',g
s,@SQLITE_LDARG@,'"$sqlite_ldarg"',g
s!@RPATH@!'"$opt_rpath"'!g
s,@MARK64@,'"$opt_mark64"',g
s,@ARCH@,'"$opt_arch"',g
s,@BITS@,'"$opt_bits"',g
+ s,@CFLAGS@,'"$opt_cflags"',g
' < Makefile.in > Makefile