diff --git a/configure b/configure index fb896380f9..1ca508ced7 100755 --- a/configure +++ b/configure @@ -26,7 +26,7 @@ HAVE_OPENSSL=1 [ -z "${USEROSTYPE}" ] && USEROSTYPE="auto" WITHPIC=1 WITHNONPIC=0 -[ -z "${LIBVERSION}" ] && LIBVERSION="?" +[ -z "${LIBVERSION}" ] && LIBVERSION="xxx" split_host() { S="$" while : ; do @@ -145,8 +145,7 @@ System types: --target=TARGET configure for building compilers for TARGET [HOST] EOF2 -printf " -Optional Features: +printf "\nOptional Features: --without-debugger disable native debugger features --without-ewf disable EWF dependency --without-gmp disable GMP dependency @@ -156,20 +155,16 @@ Optional Features: --with-ostype Choose OS type ( gnulinux windows darwin ) (USEROSTYPE=auto) --without-pic do not build libr as a program independent location --with-nonpic build the library archives .a - --with-libversion specify different libversion (LIBVERSION=?) -" -printf " -Some influential environment variables: + --with-libversion specify different libversion (LIBVERSION=xxx)\n" +printf "\nSome influential environment variables: CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory - CPP C preprocessor -" -printf " -Report bugs to: pancake " + CPP C preprocessor\n" +printf "\nReport bugs to: pancake " echo "" exit 0 } @@ -204,7 +199,7 @@ echo "VERSION: 0.7.1" echo "LANGS: c" echo "REQUIRED: libdl" echo "OPTIONAL: libewf" -echo "FLAGS: --without-debugger --without-ewf --without-gmp --without-magic --without-ssl --with-compiler=gcc --with-ostype=auto --without-pic --with-nonpic --with-libversion=?" +echo "FLAGS: --without-debugger --without-ewf --without-gmp --without-magic --without-ssl --with-compiler=gcc --with-ostype=auto --without-pic --with-nonpic --with-libversion=xxx" exit 0 ;; "--cache-file") @@ -255,7 +250,7 @@ echo "FLAGS: --without-debugger --without-ewf --without-gmp --without-magic --with-ostype) if [ -z "${value}" ]; then USEROSTYPE="auto"; else USEROSTYPE="${value}" ; fi ;; "--without-pic") WITHPIC="0"; ;; "--with-nonpic") WITHNONPIC="1"; ;; ---with-libversion) if [ -z "${value}" ]; then LIBVERSION="?"; else LIBVERSION="${value}" ; fi ;; +--with-libversion) if [ -z "${value}" ]; then LIBVERSION="xxx"; else LIBVERSION="${value}" ; fi ;; *) if [ "$value" ]; then eval "`echo $flag2=$value`" ; else echo ; echo "WARNING: Unknown flag '$flag'." >&2 ; echo ; fi ;; esac @@ -306,7 +301,7 @@ echo "ERROR: ${CC} cannot create executables" >&2 ; exit 1 ; fi printf "checking for dynamic library... " HAVE_LIB_DL=0 -for OS in linux syllable sunos darwin beos solaris ; do +for OS in linux gnu/kfreebsd syllable sunos darwin beos solaris ; do if [ "${HOST_OS}" = "${OS}" ]; then HAVE_LIB_DL=1 break; @@ -392,7 +387,7 @@ USEROSTYPE="gnulinux" else if [ "$HOST_OS" = "darwin" ]; then USEROSTYPE="darwin"; fi; fi; fi; fi; fi; fi; fi; fi -if [ "$LIBVERSION" = "a p" ]; then +if [ "$LIBVERSION" = "xxx" ]; then LIBVERSION="$VERSION"; fi SEDFLAGS=" -e '" COUNT=0 diff --git a/configure.acr b/configure.acr index d1fcff46a2..fb4a775e51 100644 --- a/configure.acr +++ b/configure.acr @@ -64,9 +64,9 @@ IFEQ USEROSTYPE auto ; { ARG_WITHOUT WITHPIC pic do not build libr as a program independent location ; ARG_WITH WITHNONPIC nonpic build the library archives .a ; -ARG_WITH LIBVERSION=? libversion specify different libversion ; +ARG_WITH LIBVERSION=xxx libversion specify different libversion ; -IFEQ LIBVERSION ? ; { +IFEQ LIBVERSION xxx ; { LIBVERSION = $VERSION ; }