From 5d17fc1d7f60abd35f852706bef06411a963caa3 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Thu, 26 Mar 2009 15:10:09 +0100 Subject: Install cgconfigparser to /sbin cgconfigparser can be executed only by root, so it should be installed to /sbin directory. Also run automake to update Makefile.in with this change. Signed-off-by: Jan Safranek --- src/tools/Makefile.am | 3 ++- src/tools/Makefile.in | 71 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 53 insertions(+), 21 deletions(-) diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index b237744..e1cace3 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -1,7 +1,8 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include LDADD = $(top_srcdir)/src/.libs/libcgroup.la -bin_PROGRAMS = cgexec cgclassify cgconfigparser +bin_PROGRAMS = cgexec cgclassify +sbin_PROGRAMS = cgconfigparser cgexec_SOURCES = cgexec.c tools-common.c tools-common.h diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in index e850034..4fa4f33 100644 --- a/src/tools/Makefile.in +++ b/src/tools/Makefile.in @@ -32,8 +32,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = cgexec$(EXEEXT) cgclassify$(EXEEXT) \ - cgconfigparser$(EXEEXT) +bin_PROGRAMS = cgexec$(EXEEXT) cgclassify$(EXEEXT) +sbin_PROGRAMS = cgconfigparser$(EXEEXT) subdir = src/tools DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -43,9 +43,10 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) +sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) am_cgclassify_OBJECTS = cgclassify.$(OBJEXT) tools-common.$(OBJEXT) cgclassify_OBJECTS = $(am_cgclassify_OBJECTS) cgclassify_LDADD = $(LDADD) @@ -255,6 +256,34 @@ clean-binPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done +install-sbinPROGRAMS: $(sbin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" + @list='$(sbin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ + else :; fi; \ + done + +uninstall-sbinPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(sbin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ + rm -f "$(DESTDIR)$(sbindir)/$$f"; \ + done + +clean-sbinPROGRAMS: + @list='$(sbin_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done cgclassify$(EXEEXT): $(cgclassify_OBJECTS) $(cgclassify_DEPENDENCIES) @rm -f cgclassify$(EXEEXT) $(LINK) $(cgclassify_OBJECTS) $(cgclassify_LDADD) $(LIBS) @@ -380,7 +409,7 @@ check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) installdirs: - for dir in "$(DESTDIR)$(bindir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -409,7 +438,8 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am +clean-am: clean-binPROGRAMS clean-generic clean-libtool \ + clean-sbinPROGRAMS mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -431,7 +461,7 @@ install-data-am: install-dvi: install-dvi-am -install-exec-am: install-binPROGRAMS +install-exec-am: install-binPROGRAMS install-sbinPROGRAMS install-html: install-html-am @@ -463,23 +493,24 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS +uninstall-am: uninstall-binPROGRAMS uninstall-sbinPROGRAMS .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS + clean-generic clean-libtool clean-sbinPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-sbinPROGRAMS install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-sbinPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -- cgit 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 --- Makefile.in | 4 ++- configure | 69 +++++++++++++++++++++++++++----------------------- configure.in | 7 ++--- dist/Makefile.in | 8 +++--- doc/Makefile.in | 8 +++--- doc/man/Makefile.in | 8 +++--- include/Makefile.in | 8 +++--- samples/Makefile.in | 8 +++--- scripts/Makefile.in | 8 +++--- src/Makefile.am | 3 ++- src/Makefile.in | 12 ++++++--- src/daemon/Makefile.in | 8 +++--- src/pam/Makefile.in | 8 +++--- src/tools/Makefile.in | 8 +++--- tests/Makefile.in | 8 +++--- 15 files changed, 105 insertions(+), 70 deletions(-) diff --git a/Makefile.in b/Makefile.in index 056cca1..77f7ded 100644 --- a/Makefile.in +++ b/Makefile.in @@ -108,7 +108,9 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ -LIBRARY_VERSION = @LIBRARY_VERSION@ +LIBRARY_VERSION_MAJOR = @LIBRARY_VERSION_MAJOR@ +LIBRARY_VERSION_MINOR = @LIBRARY_VERSION_MINOR@ +LIBRARY_VERSION_RELEASE = @LIBRARY_VERSION_RELEASE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ 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 diff --git a/configure.in b/configure.in index 7f44ea6..c0ab521 100644 --- a/configure.in +++ b/configure.in @@ -18,9 +18,10 @@ AC_PREREQ(2.61) AC_INIT([control groups library and utilities], 0.34, [http://sourceforge.net/tracker/?group_id=218421&atid=1043649]) AM_INIT_AUTOMAKE(libcgroup, 0.34) -# set library version (X:Y:Z gets transfromed to libcgroup.so.X.Y.Z, -# soname is libcgroup.so.X -AC_SUBST(LIBRARY_VERSION, 1:0:34) +# set library version, soname is libcgroup.so.MAJOR +AC_SUBST(LIBRARY_VERSION_MAJOR, 1) +AC_SUBST(LIBRARY_VERSION_MINOR, 0) +AC_SUBST(LIBRARY_VERSION_RELEASE, 34) # we do not want static libraries AC_DISABLE_STATIC diff --git a/dist/Makefile.in b/dist/Makefile.in index a8ec4c4..705070c 100644 --- a/dist/Makefile.in +++ b/dist/Makefile.in @@ -82,7 +82,9 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ -LIBRARY_VERSION = @LIBRARY_VERSION@ +LIBRARY_VERSION_MAJOR = @LIBRARY_VERSION_MAJOR@ +LIBRARY_VERSION_MINOR = @LIBRARY_VERSION_MINOR@ +LIBRARY_VERSION_RELEASE = @LIBRARY_VERSION_RELEASE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -169,9 +171,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dist/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dist/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu dist/Makefile + $(AUTOMAKE) --foreign dist/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/doc/Makefile.in b/doc/Makefile.in index b1e6fa1..fbe71e0 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -93,7 +93,9 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ -LIBRARY_VERSION = @LIBRARY_VERSION@ +LIBRARY_VERSION_MAJOR = @LIBRARY_VERSION_MAJOR@ +LIBRARY_VERSION_MINOR = @LIBRARY_VERSION_MINOR@ +LIBRARY_VERSION_RELEASE = @LIBRARY_VERSION_RELEASE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -180,9 +182,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + $(AUTOMAKE) --foreign doc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in index d58a270..faad63f 100644 --- a/doc/man/Makefile.in +++ b/doc/man/Makefile.in @@ -88,7 +88,9 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ -LIBRARY_VERSION = @LIBRARY_VERSION@ +LIBRARY_VERSION_MAJOR = @LIBRARY_VERSION_MAJOR@ +LIBRARY_VERSION_MINOR = @LIBRARY_VERSION_MINOR@ +LIBRARY_VERSION_RELEASE = @LIBRARY_VERSION_RELEASE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -178,9 +180,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/man/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/man/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/man/Makefile + $(AUTOMAKE) --foreign doc/man/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/include/Makefile.in b/include/Makefile.in index 7285a1d..aa26b42 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -94,7 +94,9 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ -LIBRARY_VERSION = @LIBRARY_VERSION@ +LIBRARY_VERSION_MAJOR = @LIBRARY_VERSION_MAJOR@ +LIBRARY_VERSION_MINOR = @LIBRARY_VERSION_MINOR@ +LIBRARY_VERSION_RELEASE = @LIBRARY_VERSION_RELEASE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -181,9 +183,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/Makefile + $(AUTOMAKE) --foreign include/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/samples/Makefile.in b/samples/Makefile.in index bef275f..2d3c89b 100644 --- a/samples/Makefile.in +++ b/samples/Makefile.in @@ -81,7 +81,9 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ -LIBRARY_VERSION = @LIBRARY_VERSION@ +LIBRARY_VERSION_MAJOR = @LIBRARY_VERSION_MAJOR@ +LIBRARY_VERSION_MINOR = @LIBRARY_VERSION_MINOR@ +LIBRARY_VERSION_RELEASE = @LIBRARY_VERSION_RELEASE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -168,9 +170,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu samples/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign samples/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu samples/Makefile + $(AUTOMAKE) --foreign samples/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index adf93e6..afc8746 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -81,7 +81,9 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ -LIBRARY_VERSION = @LIBRARY_VERSION@ +LIBRARY_VERSION_MAJOR = @LIBRARY_VERSION_MAJOR@ +LIBRARY_VERSION_MINOR = @LIBRARY_VERSION_MINOR@ +LIBRARY_VERSION_RELEASE = @LIBRARY_VERSION_RELEASE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -168,9 +170,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu scripts/Makefile + $(AUTOMAKE) --foreign scripts/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/Makefile.am b/src/Makefile.am index c30393a..93d07e9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,5 +7,6 @@ INCLUDES = -I$(top_srcdir)/include lib_LTLIBRARIES = libcgroup.la libcgroup_la_SOURCES = parse.y lex.l api.c config.c libcgroup-internal.h libcgroup.map wrapper.c libcgroup_la_LIBADD = -lpthread -libcgroup_la_LDFLAGS = -Wl,--version-script,libcgroup.map -version-number $(LIBRARY_VERSION) +libcgroup_la_LDFLAGS = -Wl,--version-script,libcgroup.map -version-number \ + -version-number $(LIBRARY_VERSION_MAJOR):$(LIBRARY_VERSION_MINOR):$(LIBRARY_VERSION_RELEASE) diff --git a/src/Makefile.in b/src/Makefile.in index 01fa4c6..5583fcf 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -129,7 +129,9 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ -LIBRARY_VERSION = @LIBRARY_VERSION@ +LIBRARY_VERSION_MAJOR = @LIBRARY_VERSION_MAJOR@ +LIBRARY_VERSION_MINOR = @LIBRARY_VERSION_MINOR@ +LIBRARY_VERSION_RELEASE = @LIBRARY_VERSION_RELEASE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -211,7 +213,9 @@ INCLUDES = -I$(top_srcdir)/include lib_LTLIBRARIES = libcgroup.la libcgroup_la_SOURCES = parse.y lex.l api.c config.c libcgroup-internal.h libcgroup.map wrapper.c libcgroup_la_LIBADD = -lpthread -libcgroup_la_LDFLAGS = -Wl,--version-script,libcgroup.map -version-number $(LIBRARY_VERSION) +libcgroup_la_LDFLAGS = -Wl,--version-script,libcgroup.map -version-number \ + -version-number $(LIBRARY_VERSION_MAJOR):$(LIBRARY_VERSION_MINOR):$(LIBRARY_VERSION_RELEASE) + all: all-recursive .SUFFIXES: @@ -225,9 +229,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + $(AUTOMAKE) --foreign src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/daemon/Makefile.in b/src/daemon/Makefile.in index 279d7a4..3006ee4 100644 --- a/src/daemon/Makefile.in +++ b/src/daemon/Makefile.in @@ -106,7 +106,9 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ -LIBRARY_VERSION = @LIBRARY_VERSION@ +LIBRARY_VERSION_MAJOR = @LIBRARY_VERSION_MAJOR@ +LIBRARY_VERSION_MINOR = @LIBRARY_VERSION_MINOR@ +LIBRARY_VERSION_RELEASE = @LIBRARY_VERSION_RELEASE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -197,9 +199,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/daemon/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/daemon/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/daemon/Makefile + $(AUTOMAKE) --foreign src/daemon/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in index 205e1bc..9b8a0fc 100644 --- a/src/pam/Makefile.in +++ b/src/pam/Makefile.in @@ -111,7 +111,9 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ -LIBRARY_VERSION = @LIBRARY_VERSION@ +LIBRARY_VERSION_MAJOR = @LIBRARY_VERSION_MAJOR@ +LIBRARY_VERSION_MINOR = @LIBRARY_VERSION_MINOR@ +LIBRARY_VERSION_RELEASE = @LIBRARY_VERSION_RELEASE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -203,9 +205,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pam/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pam/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/pam/Makefile + $(AUTOMAKE) --foreign src/pam/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in index 4fa4f33..c34ca7b 100644 --- a/src/tools/Makefile.in +++ b/src/tools/Makefile.in @@ -116,7 +116,9 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ -LIBRARY_VERSION = @LIBRARY_VERSION@ +LIBRARY_VERSION_MAJOR = @LIBRARY_VERSION_MAJOR@ +LIBRARY_VERSION_MINOR = @LIBRARY_VERSION_MINOR@ +LIBRARY_VERSION_RELEASE = @LIBRARY_VERSION_RELEASE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -208,9 +210,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/tools/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/tools/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/tools/Makefile + $(AUTOMAKE) --foreign src/tools/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/tests/Makefile.in b/tests/Makefile.in index da3cac7..dae7a12 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -131,7 +131,9 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ -LIBRARY_VERSION = @LIBRARY_VERSION@ +LIBRARY_VERSION_MAJOR = @LIBRARY_VERSION_MAJOR@ +LIBRARY_VERSION_MINOR = @LIBRARY_VERSION_MINOR@ +LIBRARY_VERSION_RELEASE = @LIBRARY_VERSION_RELEASE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -227,9 +229,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/Makefile + $(AUTOMAKE) --foreign tests/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -- cgit From cc051114d3c6ca553fe680b32c915f151c4cfed4 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Thu, 26 Mar 2009 15:10:09 +0100 Subject: Update the .spec file Update the .spec file to reflect automake and autoconf changes. Distribute the files to the right directories. Signed-off-by: Jan Safranek --- dist/libcgroup.spec.in | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dist/libcgroup.spec.in b/dist/libcgroup.spec.in index e3cc114..92be63f 100644 --- a/dist/libcgroup.spec.in +++ b/dist/libcgroup.spec.in @@ -1,3 +1,5 @@ +%define soversion @LIBRARY_VERSION_MAJOR@.@LIBRARY_VERSION_MINOR@.@LIBRARY_VERSION_RELEASE@ + Name: libcgroup Summary: Tools and libraries to control and monitor control groups Group: Development/Libraries @@ -40,14 +42,29 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install + +# install init scripts mkdir -p $RPM_BUILD_ROOT/%{_initrddir} cp scripts/init.d/cgconfig $RPM_BUILD_ROOT/%{_initrddir}/cgconfig cp scripts/init.d/cgred $RPM_BUILD_ROOT/%{_initrddir}/cgred + +# install config files mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig cp samples/cgred.conf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cgred.conf cp samples/cgconfig.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgconfig.conf cp samples/cgrules.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgrules.conf +# sanitize pam module, we need only pam_cgroup.so in the right directory +mkdir -p $RPM_BUILD_ROOT/%{_lib}/security +mv -f $RPM_BUILD_ROOT/%{_lib}/pam_cgroup.so.*.*.* $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so +rm -f $RPM_BUILD_ROOT/%{_lib}/pam_cgroup* + +# move the devel stuff to /usr +mkdir -p $RPM_BUILD_ROOT/%{_libdir} +mv -f $RPM_BUILD_ROOT/%{_lib}/libcgroup.la $RPM_BUILD_ROOT/%{_libdir} +rm -f $RPM_BUILD_ROOT/%{_lib}/libcgroup.so +ln -sf ../../%{_lib}/libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so + %clean rm -rf $RPM_BUILD_ROOT @@ -71,12 +88,11 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/cgred.conf %config(noreplace) %{_sysconfdir}/cgconfig.conf %config(noreplace) %{_sysconfdir}/cgrules.conf -/%{_lib}/libcgroup-%{version}.so /%{_lib}/libcgroup.so.* /bin/cgexec /bin/cgclassify /sbin/cgconfigparser -/bin/cgrulesengd +/sbin/cgrulesengd %attr(0644, root, root) %{_mandir}/man1/* %attr(0644, root, root) %{_mandir}/man5/* %attr(0644, root, root) %{_mandir}/man8/* @@ -89,7 +105,7 @@ fi %files devel %defattr(-,root,root,-) %{_includedir}/libcgroup.h -/%{_lib}/libcgroup.so +%{_libdir}/libcgroup.* %doc COPYING INSTALL -- 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 --- Makefile.in | 4 ++-- configure | 26 +++++++++++++------------- configure.in | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile.in b/Makefile.in index 77f7ded..e34492e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -66,7 +66,7 @@ am__remove_distdir = \ { test ! -d $(distdir) \ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print @@ -434,7 +434,6 @@ distdir: $(DISTFILES) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) - dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) @@ -458,6 +457,7 @@ dist-zip: distdir dist dist-all: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then 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'`\\" diff --git a/configure.in b/configure.in index c0ab521..0d82f96 100644 --- a/configure.in +++ b/configure.in @@ -15,9 +15,9 @@ AC_PREREQ(2.61) # In following section update all occurences of version, including soname -AC_INIT([control groups library and utilities], 0.34, +AC_INIT([libcgroup], 0.34, [http://sourceforge.net/tracker/?group_id=218421&atid=1043649]) -AM_INIT_AUTOMAKE(libcgroup, 0.34) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) # set library version, soname is libcgroup.so.MAJOR AC_SUBST(LIBRARY_VERSION_MAJOR, 1) AC_SUBST(LIBRARY_VERSION_MINOR, 0) -- cgit