From acb90dbf73b851440acde2bb946bfa4ddc38af65 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 10 Feb 2010 14:43:39 +0100 Subject: [PATCH] Move shared object numbers into version.h + use -release for libtool rather than -version-info --- bacula/autoconf/configure.in | 39 +++++++ bacula/configure | 198 ++++++++++++++++++++++++--------- bacula/src/cats/Makefile.in | 8 +- bacula/src/findlib/Makefile.in | 12 +- bacula/src/lib/Makefile.in | 32 +++--- bacula/src/version.h | 22 ++++ 6 files changed, 235 insertions(+), 76 deletions(-) diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 87ac9d94e4..afa83b7492 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -43,8 +43,47 @@ AC_SUBST(DATE)dnl AC_SUBST(LSMDATE)dnl AC_SUBST(BACULA)dnl AC_SUBST(post_host)dnl + +dnl src/lib +LIBBAC_LT_CURRENT=`sed -n -e 's/^.*LIBBAC_LT_CURRENT *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBAC_LT_REVISION=`sed -n -e 's/^.*LIBBAC_LT_REVISION *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBAC_LT_AGE=`sed -n -e 's/^.*LIBBAC_LT_AGE *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACCFG_LT_CURRENT=`sed -n -e 's/^.*LIBBACCFG_LT_CURRENT *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACCFG_LT_REVISION=`sed -n -e 's/^.*LIBBACCFG_LT_REVISION *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACCFG_LT_AGE=`sed -n -e 's/^.*LIBBACCFG_LT_AGE *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACPY_LT_CURRENT=`sed -n -e 's/^.*LIBBACPY_LT_CURRENT *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACPY_LT_REVISION=`sed -n -e 's/^.*LIBBACPY_LT_REVISION *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACPY_LT_AGE=`sed -n -e 's/^.*LIBBACPY_LT_AGE *\(.*\)$/\1/p' ${srcdir}/src/version.h` + +AC_SUBST(LIBBAC_LT_CURRENT)dnl +AC_SUBST(LIBBAC_LT_REVISION)dnl +AC_SUBST(LIBBAC_LT_AGE)dnl +AC_SUBST(LIBBACCFG_LT_CURRENT)dnl +AC_SUBST(LIBBACCFG_LT_REVISION)dnl +AC_SUBST(LIBBACCFG_LT_AGE)dnl +AC_SUBST(LIBBACPY_LT_CURRENT)dnl +AC_SUBST(LIBBACPY_LT_REVISION)dnl +AC_SUBST(LIBBACPY_LT_AGE)dnl + +dnl src/cats +LIBBACSQL_LT_CURRENT=`sed -n -e 's/^.*LIBBACSQL_LT_CURRENT *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACSQL_LT_REVISION=`sed -n -e 's/^.*LIBBACSQL_LT_REVISION *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACSQL_LT_AGE=`sed -n -e 's/^.*LIBBACSQL_LT_AGE *\(.*\)$/\1/p' ${srcdir}/src/version.h` +AC_SUBST(LIBBACSQL_LT_CURRENT)dnl +AC_SUBST(LIBBACSQL_LT_REVISION)dnl +AC_SUBST(LIBBACSQL_LT_AGE)dnl + +dnl src/findlib +LIBBACFIND_LT_CURRENT=`sed -n -e 's/^.*LIBBACFIND_LT_CURRENT *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACFIND_LT_REVISION=`sed -n -e 's/^.*LIBBACFIND_LT_REVISION *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACFIND_LT_AGE=`sed -n -e 's/^.*LIBBACFIND_LT_AGE *\(.*\)$/\1/p' ${srcdir}/src/version.h` +AC_SUBST(LIBBACFIND_LT_CURRENT)dnl +AC_SUBST(LIBBACFIND_LT_REVISION)dnl +AC_SUBST(LIBBACFIND_LT_AGE)dnl + echo "configuring for ${BACULA} $VERSION ($DATE)" + dnl ------------------------------------------------------- dnl Check for compiler. dnl ------------------------------------------------------ diff --git a/bacula/configure b/bacula/configure index 08b1b1b6fc..2c7953d14a 100755 --- a/bacula/configure +++ b/bacula/configure @@ -811,6 +811,21 @@ DATE LSMDATE BACULA post_host +LIBBAC_LT_CURRENT +LIBBAC_LT_REVISION +LIBBAC_LT_AGE +LIBBACCFG_LT_CURRENT +LIBBACCFG_LT_REVISION +LIBBACCFG_LT_AGE +LIBBACPY_LT_CURRENT +LIBBACPY_LT_REVISION +LIBBACPY_LT_AGE +LIBBACSQL_LT_CURRENT +LIBBACSQL_LT_REVISION +LIBBACSQL_LT_AGE +LIBBACFIND_LT_CURRENT +LIBBACFIND_LT_REVISION +LIBBACFIND_LT_AGE CC CFLAGS LDFLAGS @@ -2343,9 +2358,30 @@ BACULA=${BACULA:-Bacula} VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` DATE=`sed -n -e 's/^.* \t*BDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` LSMDATE=`sed -n -e 's/^.*LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` + +LIBBAC_LT_CURRENT=`sed -n -e 's/^.*LIBBAC_LT_CURRENT *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBAC_LT_REVISION=`sed -n -e 's/^.*LIBBAC_LT_REVISION *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBAC_LT_AGE=`sed -n -e 's/^.*LIBBAC_LT_AGE *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACCFG_LT_CURRENT=`sed -n -e 's/^.*LIBBACCFG_LT_CURRENT *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACCFG_LT_REVISION=`sed -n -e 's/^.*LIBBACCFG_LT_REVISION *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACCFG_LT_AGE=`sed -n -e 's/^.*LIBBACCFG_LT_AGE *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACPY_LT_CURRENT=`sed -n -e 's/^.*LIBBACPY_LT_CURRENT *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACPY_LT_REVISION=`sed -n -e 's/^.*LIBBACPY_LT_REVISION *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACPY_LT_AGE=`sed -n -e 's/^.*LIBBACPY_LT_AGE *\(.*\)$/\1/p' ${srcdir}/src/version.h` + + +LIBBACSQL_LT_CURRENT=`sed -n -e 's/^.*LIBBACSQL_LT_CURRENT *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACSQL_LT_REVISION=`sed -n -e 's/^.*LIBBACSQL_LT_REVISION *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACSQL_LT_AGE=`sed -n -e 's/^.*LIBBACSQL_LT_AGE *\(.*\)$/\1/p' ${srcdir}/src/version.h` + +LIBBACFIND_LT_CURRENT=`sed -n -e 's/^.*LIBBACFIND_LT_CURRENT *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACFIND_LT_REVISION=`sed -n -e 's/^.*LIBBACFIND_LT_REVISION *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACFIND_LT_AGE=`sed -n -e 's/^.*LIBBACFIND_LT_AGE *\(.*\)$/\1/p' ${srcdir}/src/version.h` + echo "configuring for ${BACULA} $VERSION ($DATE)" + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5950,13 +5986,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5953: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5989: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5956: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5992: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5959: output\"" >&5) + (eval echo "\"\$as_me:5995: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7177,7 +7213,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7180 "configure"' > conftest.$ac_ext + echo '#line 7216 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9392,11 +9428,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:9395: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9431: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9399: \$? = $ac_status" >&5 + echo "$as_me:9435: \$? = $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. @@ -9731,11 +9767,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:9734: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9770: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9738: \$? = $ac_status" >&5 + echo "$as_me:9774: \$? = $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. @@ -9836,11 +9872,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:9839: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9875: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9843: \$? = $ac_status" >&5 + echo "$as_me:9879: \$? = $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 @@ -9891,11 +9927,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:9894: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9930: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9898: \$? = $ac_status" >&5 + echo "$as_me:9934: \$? = $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 @@ -12647,7 +12683,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12650 "configure" +#line 12686 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12743,7 +12779,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12746 "configure" +#line 12782 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14755,11 +14791,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:14758: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14794: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14762: \$? = $ac_status" >&5 + echo "$as_me:14798: \$? = $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. @@ -14854,11 +14890,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:14857: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14893: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14861: \$? = $ac_status" >&5 + echo "$as_me:14897: \$? = $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 @@ -14906,11 +14942,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:14909: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14945: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14913: \$? = $ac_status" >&5 + echo "$as_me:14949: \$? = $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 @@ -45222,6 +45258,21 @@ DATE!$DATE$ac_delim LSMDATE!$LSMDATE$ac_delim BACULA!$BACULA$ac_delim post_host!$post_host$ac_delim +LIBBAC_LT_CURRENT!$LIBBAC_LT_CURRENT$ac_delim +LIBBAC_LT_REVISION!$LIBBAC_LT_REVISION$ac_delim +LIBBAC_LT_AGE!$LIBBAC_LT_AGE$ac_delim +LIBBACCFG_LT_CURRENT!$LIBBACCFG_LT_CURRENT$ac_delim +LIBBACCFG_LT_REVISION!$LIBBACCFG_LT_REVISION$ac_delim +LIBBACCFG_LT_AGE!$LIBBACCFG_LT_AGE$ac_delim +LIBBACPY_LT_CURRENT!$LIBBACPY_LT_CURRENT$ac_delim +LIBBACPY_LT_REVISION!$LIBBACPY_LT_REVISION$ac_delim +LIBBACPY_LT_AGE!$LIBBACPY_LT_AGE$ac_delim +LIBBACSQL_LT_CURRENT!$LIBBACSQL_LT_CURRENT$ac_delim +LIBBACSQL_LT_REVISION!$LIBBACSQL_LT_REVISION$ac_delim +LIBBACSQL_LT_AGE!$LIBBACSQL_LT_AGE$ac_delim +LIBBACFIND_LT_CURRENT!$LIBBACFIND_LT_CURRENT$ac_delim +LIBBACFIND_LT_REVISION!$LIBBACFIND_LT_REVISION$ac_delim +LIBBACFIND_LT_AGE!$LIBBACFIND_LT_AGE$ac_delim CC!$CC$ac_delim CFLAGS!$CFLAGS$ac_delim LDFLAGS!$LDFLAGS$ac_delim @@ -45252,21 +45303,6 @@ DD!$DD$ac_delim MKISOFS!$MKISOFS$ac_delim PYTHON!$PYTHON$ac_delim GROWISOFS!$GROWISOFS$ac_delim -DVDRWMEDIAINFO!$DVDRWMEDIAINFO$ac_delim -DVDRWFORMAT!$DVDRWFORMAT$ac_delim -PKGCONFIG!$PKGCONFIG$ac_delim -QMAKE!$QMAKE$ac_delim -GMAKE!$GMAKE$ac_delim -WXCONFIG!$WXCONFIG$ac_delim -WXFLAGS!$WXFLAGS$ac_delim -CDRECORD!$CDRECORD$ac_delim -PIDOF!$PIDOF$ac_delim -AWK!$AWK$ac_delim -ARFLAGS!$ARFLAGS$ac_delim -MAKE_SHELL!$MAKE_SHELL$ac_delim -LOCAL_LIBS!$LOCAL_LIBS$ac_delim -LOCAL_CFLAGS!$LOCAL_CFLAGS$ac_delim -LOCAL_LDFLAGS!$LOCAL_LDFLAGS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then @@ -45312,6 +45348,21 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +DVDRWMEDIAINFO!$DVDRWMEDIAINFO$ac_delim +DVDRWFORMAT!$DVDRWFORMAT$ac_delim +PKGCONFIG!$PKGCONFIG$ac_delim +QMAKE!$QMAKE$ac_delim +GMAKE!$GMAKE$ac_delim +WXCONFIG!$WXCONFIG$ac_delim +WXFLAGS!$WXFLAGS$ac_delim +CDRECORD!$CDRECORD$ac_delim +PIDOF!$PIDOF$ac_delim +AWK!$AWK$ac_delim +ARFLAGS!$ARFLAGS$ac_delim +MAKE_SHELL!$MAKE_SHELL$ac_delim +LOCAL_LIBS!$LOCAL_LIBS$ac_delim +LOCAL_CFLAGS!$LOCAL_CFLAGS$ac_delim +LOCAL_LDFLAGS!$LOCAL_LDFLAGS$ac_delim LOCAL_DEFS!$LOCAL_DEFS$ac_delim LIBTOOL!$LIBTOOL$ac_delim build!$build$ac_delim @@ -45394,21 +45445,6 @@ HAVE_ASPRINTF!$HAVE_ASPRINTF$ac_delim HAVE_SNPRINTF!$HAVE_SNPRINTF$ac_delim HAVE_WPRINTF!$HAVE_WPRINTF$ac_delim INTLBISON!$INTLBISON$ac_delim -BUILD_INCLUDED_LIBINTL!$BUILD_INCLUDED_LIBINTL$ac_delim -USE_INCLUDED_LIBINTL!$USE_INCLUDED_LIBINTL$ac_delim -CATOBJEXT!$CATOBJEXT$ac_delim -DATADIRNAME!$DATADIRNAME$ac_delim -INSTOBJEXT!$INSTOBJEXT$ac_delim -GENCAT!$GENCAT$ac_delim -INTLOBJS!$INTLOBJS$ac_delim -INTL_LIBTOOL_SUFFIX_PREFIX!$INTL_LIBTOOL_SUFFIX_PREFIX$ac_delim -BAT_DIR!$BAT_DIR$ac_delim -QWT_INC!$QWT_INC$ac_delim -QWT_LDFLAGS!$QWT_LDFLAGS$ac_delim -QWT_LIB!$QWT_LIB$ac_delim -QWT!$QWT$ac_delim -WXCONS_CPPFLAGS!$WXCONS_CPPFLAGS$ac_delim -WXCONS_LDFLAGS!$WXCONS_LDFLAGS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -45450,6 +45486,21 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +BUILD_INCLUDED_LIBINTL!$BUILD_INCLUDED_LIBINTL$ac_delim +USE_INCLUDED_LIBINTL!$USE_INCLUDED_LIBINTL$ac_delim +CATOBJEXT!$CATOBJEXT$ac_delim +DATADIRNAME!$DATADIRNAME$ac_delim +INSTOBJEXT!$INSTOBJEXT$ac_delim +GENCAT!$GENCAT$ac_delim +INTLOBJS!$INTLOBJS$ac_delim +INTL_LIBTOOL_SUFFIX_PREFIX!$INTL_LIBTOOL_SUFFIX_PREFIX$ac_delim +BAT_DIR!$BAT_DIR$ac_delim +QWT_INC!$QWT_INC$ac_delim +QWT_LDFLAGS!$QWT_LDFLAGS$ac_delim +QWT_LIB!$QWT_LIB$ac_delim +QWT!$QWT$ac_delim +WXCONS_CPPFLAGS!$WXCONS_CPPFLAGS$ac_delim +WXCONS_LDFLAGS!$WXCONS_LDFLAGS$ac_delim WX_DIR!$WX_DIR$ac_delim TRAY_MONITOR_CPPFLAGS!$TRAY_MONITOR_CPPFLAGS$ac_delim TRAY_MONITOR_LDFLAGS!$TRAY_MONITOR_LDFLAGS$ac_delim @@ -45532,6 +45583,47 @@ DINCLUDE!$DINCLUDE$ac_delim DLIB!$DLIB$ac_delim DB_LIBS!$DB_LIBS$ac_delim WCFLAGS!$WCFLAGS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF WLDFLAGS!$WLDFLAGS$ac_delim WRAPLIBS!$WRAPLIBS$ac_delim OBJLIST!$OBJLIST$ac_delim @@ -45544,7 +45636,7 @@ DISTVER!$DISTVER$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -45562,7 +45654,7 @@ if test -n "$ac_eof"; then fi cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end _ACEOF sed ' @@ -45825,7 +45917,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" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in index 4e3c9980a4..1fa9d510f5 100644 --- a/bacula/src/cats/Makefile.in +++ b/bacula/src/cats/Makefile.in @@ -34,9 +34,9 @@ LIBBACSQL_SRCS = mysql.c bdb.c dbi.c \ LIBBACSQL_OBJS = $(LIBBACSQL_SRCS:.c=.o) LIBBACSQL_LOBJS = $(LIBBACSQL_SRCS:.c=.lo) -LIBBACSQL_LT_CURRENT = 5 -LIBBACSQL_LT_REVISION = 0 -LIBBACSQL_LT_AGE = 0 +LIBBACSQL_LT_CURRENT = @LIBBACSQL_LT_CURRENT@ +LIBBACSQL_LT_REVISION = @LIBBACSQL_LT_REVISION@ +LIBBACSQL_LT_AGE = @LIBBACSQL_LT_AGE@ .SUFFIXES: .c .o .lo .PHONY: @@ -68,7 +68,7 @@ libbacsql.a: $(LIBBACSQL_OBJS) libbacsql.la: Makefile $(LIBBACSQL_LOBJS) @echo "Making $@ ..." - $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACSQL_LT_CURRENT):$(LIBBACSQL_LT_REVISION):$(LIBBACSQL_LT_AGE) $(DB_LIBS) + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_CURRENT).$(LIBBACSQL_LT_REVISION).$(LIBBACSQL_LT_AGE) $(DB_LIBS) Makefile: $(srcdir)/Makefile.in $(topdir)/config.status cd $(topdir) \ diff --git a/bacula/src/findlib/Makefile.in b/bacula/src/findlib/Makefile.in index 9dc9b8b1a0..7c4ad8a432 100644 --- a/bacula/src/findlib/Makefile.in +++ b/bacula/src/findlib/Makefile.in @@ -26,14 +26,14 @@ INCLUDE_FILES = bfile.h find.h protos.h savecwd.h # LIBBACFIND_SRCS = find.c match.c find_one.c attribs.c create_file.c \ - bfile.c drivetype.c enable_priv.c fstype.c mkpath.c \ - savecwd.c + bfile.c drivetype.c enable_priv.c fstype.c mkpath.c \ + savecwd.c LIBBACFIND_OBJS = $(LIBBACFIND_SRCS:.c=.o) LIBBACFIND_LOBJS = $(LIBBACFIND_SRCS:.c=.lo) -LIBBACFIND_LT_CURRENT = 5 -LIBBACFIND_LT_REVISION = 0 -LIBBACFIND_LT_AGE = 0 +LIBBACFIND_LT_CURRENT = @LIBBACFIND_LT_CURRENT@ +LIBBACFIND_LT_REVISION = @LIBBACFIND_LT_REVISION@ +LIBBACFIND_LT_AGE = @LIBBACFIND_LT_AGE@ .SUFFIXES: .c .o .lo .PHONY: @@ -59,7 +59,7 @@ libbacfind.a: $(LIBBACFIND_OBJS) libbacfind.la: Makefile $(LIBBACFIND_LOBJS) @echo "Making $@ ..." - $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACFIND_LT_CURRENT):$(LIBBACFIND_LT_REVISION):$(LIBBACFIND_LT_AGE) + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_CURRENT).$(LIBBACFIND_LT_REVISION).$(LIBBACFIND_LT_AGE) Makefile: $(srcdir)/Makefile.in $(topdir)/config.status cd $(topdir) \ diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in index 6d02b102f9..1379f9d21c 100644 --- a/bacula/src/lib/Makefile.in +++ b/bacula/src/lib/Makefile.in @@ -1,6 +1,21 @@ -# $Id$ +# + @MCOMMON@ +# Define library versions +LIBBAC_LT_CURRENT = @LIBBAC_LT_CURRENT@ +LIBBAC_LT_REVISION = @LIBBAC_LT_REVISION@ +LIBBAC_LT_AGE = @LIBBAC_LT_AGE@ + +LIBBACCFG_LT_CURRENT = @LIBBACCFG_LT_CURRENT@ +LIBBACCFG_LT_REVISION = @LIBBACCFG_LT_REVISION@ +LIBBACCFG_LT_AGE = @LIBBACCFG_LT_AGE@ + +LIBBACPY_LT_CURRENT = @LIBBACPY_LT_CURRENT@ +LIBBACPY_LT_REVISION = @LIBBACPY_LT_REVISION@ +LIBBACPY_LT_AGE = @LIBBACPY_LT_AGE@ + +# python = @PYTHON_INCDIR@ srcdir = . @@ -53,9 +68,6 @@ LIBBAC_SRCS = attr.c base64.c berrno.c bsys.c bget_msg.c \ address_conf.c breg.c htable.c lockmgr.c LIBBAC_OBJS = $(LIBBAC_SRCS:.c=.o) LIBBAC_LOBJS = $(LIBBAC_SRCS:.c=.lo) -LIBBAC_LT_CURRENT = 5 -LIBBAC_LT_REVISION = 0 -LIBBAC_LT_AGE = 0 # # libbaccfg (config functions) @@ -63,9 +75,6 @@ LIBBAC_LT_AGE = 0 LIBBACCFG_SRCS = parse_conf.c res.c LIBBACCFG_OBJS = $(LIBBACCFG_SRCS:.c=.o) LIBBACCFG_LOBJS = $(LIBBACCFG_SRCS:.c=.lo) -LIBBACCFG_LT_CURRENT = 5 -LIBBACCFG_LT_REVISION = 0 -LIBBACCFG_LT_AGE = 0 # # libbacpy (python functions) @@ -73,9 +82,6 @@ LIBBACCFG_LT_AGE = 0 LIBBACPY_SRCS = pythonlib.c LIBBACPY_OBJS = $(LIBBACPY_SRCS:.c=.o) LIBBACPY_LOBJS = $(LIBBACPY_SRCS:.c=.lo) -LIBBACPY_LT_CURRENT = 5 -LIBBACPY_LT_REVISION = 0 -LIBBACPY_LT_AGE = 0 .SUFFIXES: .c .cc .o .lo .ch .dvi .pdf .tex .view .w .1 .PHONY: @@ -120,7 +126,7 @@ libbac.a: $(LIBBAC_OBJS) libbac.la: Makefile $(LIBBAC_LOBJS) @echo "Making $@ ..." - $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBAC_LT_CURRENT):$(LIBBAC_LT_REVISION):$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS) + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS) libbaccfg.a: $(LIBBACCFG_OBJS) @echo "Making $@ ..." @@ -129,7 +135,7 @@ libbaccfg.a: $(LIBBACCFG_OBJS) libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) @echo "Making $@ ..." - $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCFG_LT_CURRENT):$(LIBBACCFG_LT_REVISION):$(LIBBACCFG_LT_AGE) + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_CURRENT).$(LIBBACCFG_LT_REVISION).$(LIBBACCFG_LT_AGE) libbacpy.a: $(LIBBACPY_OBJS) @echo "Making $@ ..." @@ -138,7 +144,7 @@ libbacpy.a: $(LIBBACPY_OBJS) libbacpy.la: Makefile $(LIBBACPY_LOBJS) @echo "Making $@ ..." - $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACPY_LT_CURRENT):$(LIBBACPY_LT_REVISION):$(LIBBACPY_LT_AGE) $(PYTHON_LIBS) + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_CURRENT).$(LIBBACPY_LT_REVISION).$(LIBBACPY_LT_AGE) $(PYTHON_LIBS) Makefile: $(srcdir)/Makefile.in $(topdir)/config.status cd $(topdir) \ diff --git a/bacula/src/version.h b/bacula/src/version.h index 5c10a287af..04bed7c2e8 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -35,6 +35,28 @@ Switzerland, email:ftf@fsfeurope.org. */ +/* Shared object library versions */ +#define LIBBAC_LT_CURRENT 5 +#define LIBBAC_LT_REVISION 1 +#define LIBBAC_LT_AGE 0 + +#define LIBBACCFG_LT_CURRENT 5 +#define LIBBACCFG_LT_REVISION 1 +#define LIBBACCFG_LT_AGE 0 + +#define LIBBACPY_LT_CURRENT 5 +#define LIBBACPY_LT_REVISION 1 +#define LIBBACPY_LT_AGE 0 + +#define LIBBACSQL_LT_CURRENT 5 +#define LIBBACSQL_LT_REVISION 1 +#define LIBBACSQL_LT_AGE 0 + +#define LIBBACFIND_LT_CURRENT 5 +#define LIBBACFIND_LT_REVISION 1 +#define LIBBACFIND_LT_AGE 0 + + /* Debug flags */ #undef DEBUG -- 2.39.5