From 18de912f285788ad1a13ff9d27d7103c5f166fad Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 31 Mar 2014 20:40:47 +0200 Subject: [PATCH] Remove more vestiges of Python --- bacula/autoconf/config.h.in | 3 -- bacula/autoconf/configure.in | 92 ----------------------------------- bacula/src/dird/Makefile.in | 8 +-- bacula/src/filed/Makefile.in | 8 +-- bacula/src/lib/Makefile.in | 21 +------- bacula/src/stored/Makefile.in | 8 +-- 6 files changed, 14 insertions(+), 126 deletions(-) diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in index d41ae04b4b..12b0bb86b6 100644 --- a/bacula/autoconf/config.h.in +++ b/bacula/autoconf/config.h.in @@ -561,9 +561,6 @@ /* Define to 1 if you have the `sun' library (-lsun). */ #undef HAVE_LIBSUN -/* Define to 1 if you have the `util' library (-lutil). */ -#undef HAVE_LIBUTIL - /* Defines if your system have the libutil.h header file */ #undef HAVE_LIBUTIL_H diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 94df39f4ad..d79874e633 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -122,7 +122,6 @@ AC_PATH_PROG(OPENSSL, openssl, none) AC_PATH_PROG(MTX, mtx, mtx) AC_PATH_PROG(DD, dd, dd) AC_PATH_PROG(MKISOFS, mkisofs, mkisofs) -AC_PATH_PROG(PYTHON, python, python) AC_PATH_PROG(GROWISOFS, growisofs, growisofs) AC_PATH_PROG(DVDRWMEDIAINFO, dvd+rw-mediainfo, dvd+rw-mediainfo) AC_PATH_PROG(DVDRWFORMAT, dvd+rw-format, dvd+rw-format) @@ -365,7 +364,6 @@ support_static_fd=no support_static_sd=no support_static_dir=no support_static_cons=no -support_python=no build_client_only=no build_dird=yes build_stored=yes @@ -841,95 +839,6 @@ AC_CHECK_HEADERS(varargs.h) dnl End of readline/conio stuff dnl ----------------------------------------------------------------------- -dnl ----------------------------------------------------------------------- -dnl Check for Python support -dnl -AC_MSG_CHECKING(for Python support) -AC_ARG_WITH(python, - AC_HELP_STRING([--with-python@<:@=DIR@:>@], [Include Python support. DIR is the Python base install directory, default is to search through a number of common places for the Python files.]), - [ - PYTHON_INCDIR= - PYTHON_LIBS= - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - if test -e /usr/bin/python-config ; then - PYTHON_INCDIR=`/usr/bin/python-config --includes` - PYTHON_LIBS=`/usr/bin/python-config --libs` - else - for python_root in /usr /usr/local /usr/sfw; do - for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python2.7 python3; do - if test -f $python_root/include/${ver}/Python.h; then - PYTHON_INCDIR=-I$python_root/include/${ver} - if test -d $python_root/lib64/${ver}/config; then - PYTHON_LIBS="-L$python_root/lib64/${ver}/config -l${ver}" - else - PYTHON_LIBS="-L$python_root/lib/${ver}/config -l${ver}" - fi - break - fi - done - done - - if test x$PYTHON_INCDIR = x; then - if test -f $prefix/include/Python.h; then - PYTHON_INCDIR=-I$prefix/include - if test -d $prefix/lib64/config; then - PYTHON_LIBS="-L$prefix/lib64/config -lpython" - else - PYTHON_LIBS="-L$prefix/lib/config -lpython" - fi - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Unable to find Python.h in standard locations) - fi - fi - fi - else - if test -e $withval/bin/python-config ; then - PYTHON_INCDIR=`$withval/bin/python-config --includes` - PYTHON_LIBS=`$withval/bin/python-config --libs` - elif test -f $withval/Python.h; then - PYTHON_INCDIR=-I$withval - PYTHON_LIBS="-L$withval/config -lpython" - elif test -f $withval/include/Python.h; then - PYTHON_INCDIR=-I$withval/include - if test -d $withval/lib64/config; then - PYTHON_LIBS="-L$withval/lib64/config -lpython" - else - PYTHON_LIBS="-L$withval/lib/config -lpython" - fi - elif test -f $withval/include/python/Python.h; then - PYTHON_INCDIR=-I$withval/include/python - if test -d $withval/lib64/python/config; then - PYTHON_LIBS="-L$withval/lib64/python/config -lpython" - else - PYTHON_LIBS="-L$withval/lib/python/config -lpython" - fi - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid Python directory $withval - unable to find Python.h under $withval) - fi - fi - - AC_DEFINE([HAVE_PYTHON], 1) - AC_MSG_RESULT(yes) - support_python=yes - AC_MSG_NOTICE(checking for more Python libs) - saved_LIBS="$LIBS"; LIBS= - AC_SEARCH_LIBS(shm_open, [rt]) - AC_CHECK_LIB(util, openpty) - PYTHON_LIBS="$PYTHON_LIBS $LIBS" - LIBS="$saved_LIBS" - else - AC_MSG_RESULT(no) - fi - ],[ - AC_MSG_RESULT(no) - ] -) -AC_SUBST(PYTHON_LIBS) -AC_SUBST(PYTHON_INCDIR) - dnl dnl Find where sockets are (especially for Solaris) dnl Do this before the TCP Wrappers test since tcp wrappers @@ -3572,7 +3481,6 @@ Configuration on `date`: AFS support: ${have_afs} ACL support: ${have_acl} XATTR support: ${have_xattr} - Python support: ${support_python} ${PYTHON_LIBS} systemd support: ${support_systemd} ${SYSTEMD_UNITDIR} Batch insert enabled: ${batch_insert_db_backends} diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in index 6d9e181148..c4c47df965 100644 --- a/bacula/src/dird/Makefile.in +++ b/bacula/src/dird/Makefile.in @@ -61,18 +61,18 @@ all: Makefile bacula-dir @STATIC_DIR@ @echo " " bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ - ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \ + ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \ ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ - -lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(DLIB) $(DB_LIBS) $(LIBS) \ + -lbacfind -lbacsql -lbaccats -lbaccfg -lbac -lm $(DLIB) $(DB_LIBS) $(LIBS) \ $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) static-bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ - ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \ + ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \ ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ - -lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(DLIB) $(DB_LIBS) $(LIBS) \ + -lbacfind -lbacsql -lbaccats -lbaccfg -lbac -lm $(DLIB) $(DB_LIBS) $(LIBS) \ $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) strip $@ diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in index 9b7b611f1a..1a6ca05db7 100644 --- a/bacula/src/filed/Makefile.in +++ b/bacula/src/filed/Makefile.in @@ -86,15 +86,15 @@ win32: $(WIN32OBJS) fi @rm -f bacula-fd.exe -bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) +bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ - $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(LIBS) \ + $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) -static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) +static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ - $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(LIBS) \ + $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) strip $@ diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in index e29e906948..82ec57e9b5 100644 --- a/bacula/src/lib/Makefile.in +++ b/bacula/src/lib/Makefile.in @@ -5,7 +5,6 @@ # Define library versions LIBBAC_LT_RELEASE = @LIBBAC_LT_RELEASE@ LIBBACCFG_LT_RELEASE = @LIBBACCFG_LT_RELEASE@ -LIBBACPY_LT_RELEASE = @LIBBACPY_LT_RELEASE@ # @@ -69,12 +68,6 @@ LIBBACCFG_SRCS = ini.c parse_conf.c res.c LIBBACCFG_OBJS = $(LIBBACCFG_SRCS:.c=.o) LIBBACCFG_LOBJS = $(LIBBACCFG_SRCS:.c=.lo) -# -# libbacpy (python functions) -# -LIBBACPY_SRCS = -LIBBACPY_OBJS = $(LIBBACPY_SRCS:.c=.o) -LIBBACPY_LOBJS = $(LIBBACPY_SRCS:.c=.lo) .SUFFIXES: .c .cc .o .lo .ch .dvi .pdf .tex .view .w .1 .PHONY: @@ -101,7 +94,7 @@ LIBBACPY_LOBJS = $(LIBBACPY_SRCS:.c=.lo) #------------------------------------------------------------------------- -all: Makefile libbac$(DEFAULT_ARCHIVE_TYPE) libbaccfg$(DEFAULT_ARCHIVE_TYPE) libbacpy$(DEFAULT_ARCHIVE_TYPE) +all: Makefile libbac$(DEFAULT_ARCHIVE_TYPE) libbaccfg$(DEFAULT_ARCHIVE_TYPE) @echo "==== Make of lib is good ====" @echo " " @@ -123,15 +116,6 @@ libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) @echo "Making $@ ..." $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE) $(OPENSSL_LIBS) $(LIBS) -libbacpy.a: $(LIBBACPY_OBJS) - @echo "Making $@ ..." - $(AR) rc $@ $(LIBBACPY_OBJS) - $(RANLIB) $@ - -libbacpy.la: Makefile $(LIBBACPY_LOBJS) - @echo "Making $@ ..." - $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_RELEASE) $(OPENSSL_LIBS) $(LIBS) - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status cd $(topdir) \ && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -224,7 +208,6 @@ libtool-install: all $(RMF) $(DESTDIR)$(libdir)/libbacpy-*.so $(DESTDIR)$(libdir)/libbacpy.la $(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbac.la $(DESTDIR)$(libdir) $(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbaccfg.la $(DESTDIR)$(libdir) - $(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbacpy.la $(DESTDIR)$(libdir) libtool-uninstall: $(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbac.la @@ -260,7 +243,7 @@ depend: @$(MV) Makefile Makefile.bak @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile - @for src in $(LIBBAC_SRCS) $(LIBBACCFG_SRCS) $(LIBBACPY_SRCS); do \ + @for src in $(LIBBAC_SRCS) $(LIBBACCFG_SRCS); do \ $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $$src >> Makefile; \ done @if test -f Makefile ; then \ diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in index 4e2740ea09..7a765a544b 100644 --- a/bacula/src/stored/Makefile.in +++ b/bacula/src/stored/Makefile.in @@ -109,15 +109,15 @@ all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan btape bcopy @echo "===== Make of stored is good ====" @echo " " -bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) +bacula-sd: Makefile $(SDOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(ZLIBS) \ - -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \ + -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) -static-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) +static-bacula-sd: Makefile $(SDOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SDOBJS) $(ZLIBS) \ - -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \ + -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) strip $@ -- 2.39.2