From 1b9fcf59fb32f0cf29fad5bf63e04f3d18e47852 Mon Sep 17 00:00:00 2001 From: Marco van Wieringen Date: Mon, 21 Oct 2013 15:38:08 +0200 Subject: [PATCH] Some fixes to allow non libtool building on AIX. --- autoconf/configure.in | 14 ++++++++++++++ src/console/Makefile.in | 5 ++++- src/dird/Makefile.in | 11 ++++++++--- src/filed/Makefile.in | 4 +++- src/stored/Makefile.in | 41 +++++++++++++++++++++++++++++------------ src/stored/stored.h | 3 +++ src/tools/Makefile.in | 18 +++++++++++------- 7 files changed, 72 insertions(+), 24 deletions(-) diff --git a/autoconf/configure.in b/autoconf/configure.in index 451d735d57f..180ab5e7a7b 100644 --- a/autoconf/configure.in +++ b/autoconf/configure.in @@ -1121,8 +1121,15 @@ if test "$have_openssl" = "no"; then OPENSSL_INC="" fi +if test x$use_libtool != xno; then + OPENSSL_LIBS_NONSHARED="" +else + OPENSSL_LIBS_NONSHARED="${OPENSSL_LIBS}" +fi + AC_SUBST(OPENSSL_LIBS) AC_SUBST(OPENSSL_INC) +AC_SUBST(OPENSSL_LIBS_NONSHARED) dnl ----------------------------------------------------------- dnl Check whether GNUTLS is available @@ -1192,8 +1199,15 @@ if test "$have_gnutls" = "no"; then GNUTLS_INC="" fi +if test x$use_libtool != xno; then + GNUTLS_LIBS_NONSHARED="" +else + GNUTLS_LIBS_NONSHARED="${GNUTLS_LIBS}" +fi + AC_SUBST(GNUTLS_LIBS) AC_SUBST(GNUTLS_INC) +AC_SUBST(GNUTLS_LIBS_NONSHARED) dnl ----------------------------------------------------------- dnl dlopen is needed for plugins diff --git a/src/console/Makefile.in b/src/console/Makefile.in index 40666f14096..850ab57533d 100644 --- a/src/console/Makefile.in +++ b/src/console/Makefile.in @@ -21,6 +21,8 @@ CONSSRCS = console.c console_conf.c @CONS_SRC@ CONSOBJS = $(CONSSRCS:.c=.o) GETTEXT_LIBS = @LIBINTL@ +OPENSSL_LIBS_NONSHARED = @OPENSSL_LIBS_NONSHARED@ +GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@ CONS_INC = @CONS_INC@ CONS_LIBS = @CONS_LIBS@ @@ -44,7 +46,8 @@ all: Makefile bconsole @STATIC_CONS@ bconsole: Makefile $(CONSOBJS) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ - $(DLIB) $(CONS_LIBS) -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) + $(DLIB) $(CONS_LIBS) -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \ + $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) static-bconsole: Makefile $(CONSOBJS) ../lib/libbareos.a ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ diff --git a/src/dird/Makefile.in b/src/dird/Makefile.in index e043344fec6..352cb699e9a 100644 --- a/src/dird/Makefile.in +++ b/src/dird/Makefile.in @@ -22,6 +22,8 @@ GETTEXT_LIBS = @LIBINTL@ CAP_LIBS = @CAP_LIBS@ NDMP_LIBS = @NDMP_LIBS@ DB_LIBS=@DB_LIBS@ +OPENSSL_LIBS_NONSHARED = @OPENSSL_LIBS_NONSHARED@ +GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@ first_rule: all dummy: @@ -68,7 +70,8 @@ bareos-dir: Makefile $(SVROBJS) \ @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ $(NDMP_LIBS) -lbareosfind -lbareossql -lbareoscats -lbareoscfg -lbareos -lm $(DLIB) \ - $(DB_LIBS) $(LIBS) $(WRAPLIBS) $(GETTEXT_LIBS) $(CAP_LIBS) + $(DB_LIBS) $(LIBS) $(WRAPLIBS) $(GETTEXT_LIBS) $(CAP_LIBS) \ + $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) bareos-dbcheck: Makefile $(DBCHKOBJS) \ ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \ @@ -78,7 +81,8 @@ bareos-dbcheck: Makefile $(DBCHKOBJS) \ ../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(DBCHKOBJS) \ - -lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) + -lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) \ + $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) testfind: Makefile $(TSTFNDOBJS) \ ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \ @@ -88,7 +92,8 @@ testfind: Makefile $(TSTFNDOBJS) \ ../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(TSTFNDOBJS) \ - -lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) + -lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) \ + $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) static-bareos-dir: Makefile $(SVROBJS) \ ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \ diff --git a/src/filed/Makefile.in b/src/filed/Makefile.in index cdb54b06924..776694394c7 100644 --- a/src/filed/Makefile.in +++ b/src/filed/Makefile.in @@ -21,6 +21,8 @@ thisdir = src/filed DEBUG=@DEBUG@ GETTEXT_LIBS = @LIBINTL@ +OPENSSL_LIBS_NONSHARED = @OPENSSL_LIBS_NONSHARED@ +GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@ COMPRESS_CPPFLAGS += @ZLIB_INC@ @LZO_INC@ @FASTLZ_INC@ @@ -86,7 +88,7 @@ bareos-fd: Makefile $(SVROBJS) \ @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ $(FDLIBS) -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) \ - $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) + $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) static-bareos-fd: Makefile $(SVROBJS) \ ../findlib/libbareosfind.a \ diff --git a/src/stored/Makefile.in b/src/stored/Makefile.in index 417149ac1fe..4ce97da686a 100644 --- a/src/stored/Makefile.in +++ b/src/stored/Makefile.in @@ -20,6 +20,8 @@ DB_LIBS = @DB_LIBS@ AFS_LIBS = @AFS_LIBS_NONSHARED@ ACL_LIBS = @ACL_LIBS_NONSHARED@ XATTR_LIBS = @XATTR_LIBS_NONSHARED@ +OPENSSL_LIBS_NONSHARED = @OPENSSL_LIBS_NONSHARED@ +GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@ first_rule: all dummy: @@ -103,7 +105,7 @@ bareos-sd: Makefile $(SDOBJS) \ @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) \ $(NDMP_LIBS) -lbareoscfg -lbareos -lm $(DLIB) $(LIBS) $(WRAPLIBS) \ - $(SD_LIBS) $(GETTEXT_LIBS) + $(SD_LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) static-bareos-sd: Makefile $(SDOBJS) \ ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \ @@ -119,31 +121,46 @@ ndmp_tape.o: ndmp_tape.c @echo "Compiling $<" $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I../lib $(INCLUDES) $(DINCLUDE) $(CXXFLAGS) $< -btape: Makefile $(TAPEOBJS) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) +btape: Makefile $(TAPEOBJS) \ + ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \ + ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(TAPEOBJS) \ - -lbareoscfg -lbareos $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) + -lbareoscfg -lbareos $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) \ + $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) -bls: Makefile $(BLSOBJS) ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) +bls: Makefile $(BLSOBJS) \ + ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \ + ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \ + ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ - -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) + -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \ + $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) -bextract: Makefile $(BEXTOBJS) ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) +bextract: Makefile $(BEXTOBJS) \ + ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \ + ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \ + ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) \ - -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) $(BEXTRACT_LIBS) $(GETTEXT_LIBS) - -bscan: Makefile $(SCNOBJS) ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \ - ../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE) + -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) $(BEXTRACT_LIBS) \ + $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) + +bscan: Makefile $(SCNOBJS) \ + ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \ + ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \ + ../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) \ + ../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ - -lbareossql -lbareoscats $(DB_LIBS) -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) $(GETTEXT_LIBS) + -lbareossql -lbareoscats $(DB_LIBS) -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) \ + $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) bcopy: Makefile $(COPYOBJS) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(COPYOBJS) \ - -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) + -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) Makefile: $(srcdir)/Makefile.in $(topdir)/config.status cd $(topdir) \ diff --git a/src/stored/stored.h b/src/stored/stored.h index c1543481079..7ae7d357ce5 100644 --- a/src/stored/stored.h +++ b/src/stored/stored.h @@ -39,6 +39,9 @@ const int sd_dbglvl = 300; #include #else #ifdef HAVE_SYS_MTIO_H +#ifdef HAVE_AIX_OS +#define _MTEXTEND_H 1 +#endif #include #else #ifdef HAVE_SYS_TAPE_H diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in index 0ee70a55ef5..83d04b2f1e8 100644 --- a/src/tools/Makefile.in +++ b/src/tools/Makefile.in @@ -22,6 +22,8 @@ first_rule: all dummy: GETTEXT_LIBS = @LIBINTL@ +OPENSSL_LIBS_NONSHARED = @OPENSSL_LIBS_NONSHARED@ +GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@ TOOLS = bsmtp drivetype fstype bregex bwild bpluginfo bscrypto timelimit INSTOOLS = bsmtp bwild bregex bpluginfo bscrypto @@ -43,38 +45,39 @@ all: Makefile $(TOOLS) bsmtp: Makefile bsmtp.o ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbareos -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) + $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbareos -lm $(DLIB) $(LIBS) \ + $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) fstype: Makefile fstype.o \ ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \ ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbareosfind -lbareos -lm \ - $(DLIB) $(LIBS) $(GETTEXT_LIBS) + $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) drivetype: Makefile drivetype.o \ ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \ ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o -lbareosfind -lbareos -lm \ - $(DLIB) $(LIBS) $(GETTEXT_LIBS) + $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) bregex: Makefile bregex.o \ ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \ ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L. -L../lib -o $@ bregex.o \ - $(DLIB) -lbareos -lm $(LIBS) $(GETTEXT_LIBS) + $(DLIB) -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) bwild: Makefile bwild.o ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L. -L../lib -o $@ bwild.o \ - $(DLIB) -lbareos -lm $(LIBS) $(GETTEXT_LIBS) + $(DLIB) -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) bscrypto: Makefile bscrypto.o ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L. -L../lib -o $@ bscrypto.o \ - $(DLIB) -lbareos -lm $(LIBS) $(GETTEXT_LIBS) + $(DLIB) -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) bpluginfo.o: bpluginfo.c @echo "Compiling $<" @@ -82,7 +85,8 @@ bpluginfo.o: bpluginfo.c bpluginfo: Makefile bpluginfo.o ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bpluginfo.o -lbareos $(GETTEXT_LIBS) + $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bpluginfo.o -lbareos $(LIBS) \ + $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) timelimit.o: timelimit.c @echo "Compiling $<"