From b5a9d8553bd1fa47ba354bf52b4adc03d070b1e3 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Thu, 26 Mar 2009 15:10:09 +0100 Subject: Rework the way how so version is defined Make the shared object version a bit more usable, the notation with double colons cannot be used on different places (see next patch). Also run automake && autoconf to refresh the generated stuff. Signed-off-by: Jan Safranek --- configure | 69 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 31 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 86fdf3d..19cedb5 100755 --- a/configure +++ b/configure @@ -828,7 +828,9 @@ am__leading_dot AMTAR am__tar am__untar -LIBRARY_VERSION +LIBRARY_VERSION_MAJOR +LIBRARY_VERSION_MINOR +LIBRARY_VERSION_RELEASE CXX CXXFLAGS LDFLAGS @@ -2427,9 +2429,12 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' -# set library version (X:Y:Z gets transfromed to libcgroup.so.X.Y.Z, -# soname is libcgroup.so.X -LIBRARY_VERSION=1:0:34 +# set library version, soname is libcgroup.so.MAJOR +LIBRARY_VERSION_MAJOR=1 + +LIBRARY_VERSION_MINOR=0 + +LIBRARY_VERSION_RELEASE=34 # we do not want static libraries @@ -5075,7 +5080,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5078 "configure"' > conftest.$ac_ext + echo '#line 5083 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7346,11 +7351,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7349: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7354: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7353: \$? = $ac_status" >&5 + echo "$as_me:7358: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7636,11 +7641,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7639: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7644: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7643: \$? = $ac_status" >&5 + echo "$as_me:7648: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7740,11 +7745,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7743: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7748: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7747: \$? = $ac_status" >&5 + echo "$as_me:7752: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10091,7 +10096,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12619: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12618: \$? = $ac_status" >&5 + echo "$as_me:12623: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12715,11 +12720,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12718: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12723: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12722: \$? = $ac_status" >&5 + echo "$as_me:12727: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14279,11 +14284,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14282: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14287: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14286: \$? = $ac_status" >&5 + echo "$as_me:14291: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14383,11 +14388,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14386: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14391: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14390: \$? = $ac_status" >&5 + echo "$as_me:14395: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16572,11 +16577,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16575: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16580: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16579: \$? = $ac_status" >&5 + echo "$as_me:16584: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16862,11 +16867,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16865: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16870: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16869: \$? = $ac_status" >&5 + echo "$as_me:16874: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16966,11 +16971,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16969: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16974: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16973: \$? = $ac_status" >&5 + echo "$as_me:16978: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -22620,7 +22625,9 @@ am__leading_dot!$am__leading_dot$ac_delim AMTAR!$AMTAR$ac_delim am__tar!$am__tar$ac_delim am__untar!$am__untar$ac_delim -LIBRARY_VERSION!$LIBRARY_VERSION$ac_delim +LIBRARY_VERSION_MAJOR!$LIBRARY_VERSION_MAJOR$ac_delim +LIBRARY_VERSION_MINOR!$LIBRARY_VERSION_MINOR$ac_delim +LIBRARY_VERSION_RELEASE!$LIBRARY_VERSION_RELEASE$ac_delim CXX!$CXX$ac_delim CXXFLAGS!$CXXFLAGS$ac_delim LDFLAGS!$LDFLAGS$ac_delim @@ -22656,8 +22663,6 @@ host!$host$ac_delim host_cpu!$host_cpu$ac_delim host_vendor!$host_vendor$ac_delim host_os!$host_os$ac_delim -SED!$SED$ac_delim -GREP!$GREP$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -22699,6 +22704,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +SED!$SED$ac_delim +GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim LN_S!$LN_S$ac_delim ECHO!$ECHO$ac_delim @@ -22714,7 +22721,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` = 13; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 15; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -- cgit From 95d93536f8c036f5ba8815344930a8a03af5190a Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Thu, 26 Mar 2009 15:10:09 +0100 Subject: Generate .tar.bz2 on 'make dist' Automatically generate libcgroup*.tar.bz2 on 'make dist'. Some restructure of AC_INIT and AM_INIT was needed to archieve this and correct output filename. Namely AC_INIT( [package], ... ) is used as resulting tarball file name now. Also run automake and autoconf to refresh the generated stuff... Only configure.in contains manual changes, everything else is autoconf/automake bloat :(. Signed-off-by: Jan Safranek --- configure | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 19cedb5..c67953c 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 control groups library and utilities 0.34. +# Generated by GNU Autoconf 2.61 for libcgroup 0.34. # # Report bugs to . # @@ -726,10 +726,10 @@ MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. -PACKAGE_NAME='control groups library and utilities' -PACKAGE_TARNAME='control-groups-library-and-utilities' +PACKAGE_NAME='libcgroup' +PACKAGE_TARNAME='libcgroup' PACKAGE_VERSION='0.34' -PACKAGE_STRING='control groups library and utilities 0.34' +PACKAGE_STRING='libcgroup 0.34' PACKAGE_BUGREPORT='http://sourceforge.net/tracker/?group_id=218421&atid=1043649' ac_unique_file="src" @@ -1401,7 +1401,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 control groups library and utilities 0.34 to adapt to many kinds of systems. +\`configure' configures libcgroup 0.34 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1449,7 +1449,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/control-groups-library-and-utilities] + --docdir=DIR documentation root [DATAROOTDIR/doc/libcgroup] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1471,7 +1471,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of control groups library and utilities 0.34:";; + short | recursive ) echo "Configuration of libcgroup 0.34:";; esac cat <<\_ACEOF @@ -1579,7 +1579,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -control groups library and utilities configure 0.34 +libcgroup configure 0.34 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1593,7 +1593,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 control groups library and utilities $as_me 0.34, which was +It was created by libcgroup $as_me 0.34, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2282,8 +2282,8 @@ fi # Define the identity of the package. - PACKAGE=libcgroup - VERSION=0.34 + PACKAGE='libcgroup' + VERSION='0.34' cat >>confdefs.h <<_ACEOF @@ -22322,7 +22322,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 control groups library and utilities $as_me 0.34, which was +This file was extended by libcgroup $as_me 0.34, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22375,7 +22375,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -control groups library and utilities config.status 0.34 +libcgroup config.status 0.34 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -- cgit