From 4be9db3a7bee4bb8c254ae26253a7ed70390589b Mon Sep 17 00:00:00 2001 From: Bryan Jurish Date: Tue, 27 Jan 2009 21:39:35 +0000 Subject: + delegated optional single-object-external mish-mash to src/Makefile.am using AM_CONDITIONAL + for --enable-object-externals builds, install actual links for 'any2string', 'string2any' aliases - requires corresponding setup() routines in *bytes* + added printbytes, printwchars objects svn path=/trunk/externals/moocow/pdstring/; revision=10661 --- configure | 84 ++++++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 28 deletions(-) (limited to 'configure') diff --git a/configure b/configure index ca591e6..beb94e5 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for pdstring 0.08. +# Generated by GNU Autoconf 2.61 for pdstring 0.09. # # Report bugs to . # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='pdstring' PACKAGE_TARNAME='pdstring' -PACKAGE_VERSION='0.08' -PACKAGE_STRING='pdstring 0.08' +PACKAGE_VERSION='0.09' +PACKAGE_STRING='pdstring 0.09' PACKAGE_BUGREPORT='moocow@ling.uni-potsdam.de' ac_default_prefix=/usr/local @@ -653,6 +653,7 @@ AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE +LN_S AFLAGS DFLAGS IFLAGS @@ -665,7 +666,8 @@ BUGREPORT MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT -PD_OBJECT_EXTERNALS +WANT_OBJECT_EXTERNALS_TRUE +WANT_OBJECT_EXTERNALS_FALSE pddir pddocdir pdincludedir @@ -1184,7 +1186,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pdstring 0.08 to adapt to many kinds of systems. +\`configure' configures pdstring 0.09 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1250,7 +1252,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pdstring 0.08:";; + short | recursive ) echo "Configuration of pdstring 0.09:";; esac cat <<\_ACEOF @@ -1346,7 +1348,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pdstring configure 0.08 +pdstring configure 0.09 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1362,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pdstring $as_me 0.08, which was +It was created by pdstring $as_me 0.09, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2035,7 +2037,7 @@ fi # Define the identity of the package. PACKAGE=pdstring - VERSION=0.08 + VERSION=0.09 cat >>confdefs.h <<_ACEOF @@ -3359,6 +3361,17 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } +fi + @@ -3571,10 +3584,7 @@ echo "${ECHO_T}automake v${am__api_version}: on build" >&6; } ;; esac -##------- PD externals: hack EXEEXT? -PD_LIB_EXTERNALS="pdstring" -PD_OBJ_EXTERNALS="any2bytes bytes2any bytes2wchars wchars2bytes" - +##------- Enable single-object externals? # Check whether --enable-object-externals was given. if test "${enable_object_externals+set}" = set; then enableval=$enable_object_externals; want_objext="$enableval" @@ -3585,27 +3595,32 @@ fi { echo "$as_me:$LINENO: checking whether to build single-object externals" >&5 echo $ECHO_N "checking whether to build single-object externals... $ECHO_C" >&6; } -##-- always build lib -PD_OBJECT_EXTERNALS="pdstring${buildext}" - if test "$want_objext" != "no" ; then ##-- single-objects { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - for ext in $PD_OBJ_EXTERNALS ; do - PD_OBJECT_EXTERNALS="$PD_OBJECT_EXTERNALS ${ext}${buildext}" - done cat >>confdefs.h <<\_ACEOF #define PDSTRING_OBJECT_EXTERNALS 1 _ACEOF else - ##-- libs + ##-- lib only { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi +##-- add automake conditional for object externals + + +if test "$want_objext" != "no"; then + WANT_OBJECT_EXTERNALS_TRUE= + WANT_OBJECT_EXTERNALS_FALSE='#' +else + WANT_OBJECT_EXTERNALS_TRUE='#' + WANT_OBJECT_EXTERNALS_FALSE= +fi + @@ -3732,6 +3747,10 @@ echo "${ECHO_T}no" >&6; } fi +if test "$GCC" = "yes"; then + WFLAGS="-Wall -Winline -W -Wno-unused" +fi + ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv ## compiled @@ -3747,6 +3766,8 @@ _ACEOF ## /compiled ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv ## BEGIN machine-dependent variables @@ -3935,6 +3956,13 @@ echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${WANT_OBJECT_EXTERNALS_TRUE}" && test -z "${WANT_OBJECT_EXTERNALS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WANT_OBJECT_EXTERNALS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"WANT_OBJECT_EXTERNALS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -4235,7 +4263,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pdstring $as_me 0.08, which was +This file was extended by pdstring $as_me 0.09, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4288,7 +4316,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -pdstring config.status 0.08 +pdstring config.status 0.09 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -4542,6 +4570,7 @@ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim CCDEPMODE!$CCDEPMODE$ac_delim am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +LN_S!$LN_S$ac_delim AFLAGS!$AFLAGS$ac_delim DFLAGS!$DFLAGS$ac_delim IFLAGS!$IFLAGS$ac_delim @@ -4554,7 +4583,8 @@ BUGREPORT!$BUGREPORT$ac_delim MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim MAINT!$MAINT$ac_delim -PD_OBJECT_EXTERNALS!$PD_OBJECT_EXTERNALS$ac_delim +WANT_OBJECT_EXTERNALS_TRUE!$WANT_OBJECT_EXTERNALS_TRUE$ac_delim +WANT_OBJECT_EXTERNALS_FALSE!$WANT_OBJECT_EXTERNALS_FALSE$ac_delim pddir!$pddir$ac_delim pddocdir!$pddocdir$ac_delim pdincludedir!$pdincludedir$ac_delim @@ -4564,7 +4594,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -4583,7 +4613,7 @@ fi cat >>$CONFIG_STATUS <<_ACEOF cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b _ACEOF sed ' s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g @@ -4596,8 +4626,6 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g CEOF$ac_eof _ACEOF @@ -4845,7 +4873,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed 's/|#_!!_#|//g' >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -- cgit v1.2.1