Attached is a patch used for NMU which fixed several FTBFS (4 if I count correctly, three listed in BTS and one new - see the changelog).
O. -- System Information: Debian Release: 6.0.1 APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'stable') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=cs_CZ.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff --git a/debian/changelog b/debian/changelog index f802ff1..b8d8d9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +nordugrid-arc-nox (1.1.0~rc6-2.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with openssl 1.0.0, cherry-picked from upstream version + 1.2.1 (Closes: #623500) + * Fix build failures with ld --no-add-needed, cherry-picked from + Ubuntu (Closes: #607126) + * Build depend on libdb++-dev only (Closes: #621378) + * Remove unneeded *.la from packages (Closes: #622421) + * Fix FTBFS for ptrdiff_t without #include <cstddef> in arc_wrap.cpp + + -- Ondřej Surý <[email protected]> Thu, 12 May 2011 16:03:24 +0200 + nordugrid-arc-nox (1.1.0~rc6-2.1) unstable; urgency=high * Non-maintainer upload. diff --git a/debian/control b/debian/control index 03523e0..7b6a4c7 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Anders Waananen <[email protected]> Uploaders: Steffen Moeller <[email protected]>, Mattias Ellert <[email protected]> DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 5), autotools-dev, libxml2-dev (>=2.4.0), libssl-dev, libglibmm-2.4-dev, python-dev, libltdl-dev | libltdl7-dev | libltdl3-dev, libldap2-dev, uuid-dev, libcppunit-dev, pkg-config, libdb4.8++-dev | libdb4.7++-dev | libdb4.6++-dev | libdb4.5++-dev | libdb4.4++-dev | libdb4.3++-dev | libdb4.2++-dev | libdb++-dev, libxmlsec1-dev (>=1.2.4), gsoap, libglobus-common-dev, libglobus-gssapi-gsi-dev, libglobus-rls-client-dev, libglobus-ftp-client-dev, libglobus-ftp-control-dev, python-support, default-jdk-builddep | java-gcj-compat-dev +Build-Depends: debhelper (>= 5), autotools-dev, libxml2-dev (>=2.4.0), libssl-dev, libglibmm-2.4-dev, python-dev, libltdl-dev | libltdl7-dev | libltdl3-dev, libldap2-dev, uuid-dev, libcppunit-dev, pkg-config, libdb++-dev, libxmlsec1-dev (>=1.2.4), gsoap, libglobus-common-dev, libglobus-gssapi-gsi-dev, libglobus-rls-client-dev, libglobus-ftp-client-dev, libglobus-ftp-control-dev, python-support, default-jdk-builddep | java-gcj-compat-dev Build-Depends-Indep: graphviz, doxygen XS-Python-Version: current Standards-Version: 3.8.4 diff --git a/debian/nordugrid-arc-nox-dev.install b/debian/nordugrid-arc-nox-dev.install index 15ef236..c1ff585 100644 --- a/debian/nordugrid-arc-nox-dev.install +++ b/debian/nordugrid-arc-nox-dev.install @@ -1,6 +1,5 @@ debian/tmp/usr/include/arc debian/tmp/usr/lib/lib*.so -debian/tmp/usr/lib/lib*.la debian/tmp/usr/bin/wsdl2hed debian/tmp/usr/share/man/man1/wsdl2hed.1 debian/tmp/usr/bin/arcplugin diff --git a/debian/nordugrid-arc-nox-java.install b/debian/nordugrid-arc-nox-java.install index 0f95aef..78c91f6 100644 --- a/debian/nordugrid-arc-nox-java.install +++ b/debian/nordugrid-arc-nox-java.install @@ -1,5 +1,4 @@ debian/tmp/usr/lib/java/libjarc.so -debian/tmp/usr/lib/java/libjarc.la debian/tmp/usr/lib/java/arc.jar debian/tmp/usr/lib/arc/libjavaservice.so debian/tmp/usr/lib/arc/libjavaservice.apd diff --git a/debian/patches/VOMSAttribute.cpp.diff b/debian/patches/VOMSAttribute.cpp.diff new file mode 100644 index 0000000..fd5526a --- /dev/null +++ b/debian/patches/VOMSAttribute.cpp.diff @@ -0,0 +1,26 @@ +--- a/src/hed/libs/credential/VOMSAttribute.cpp ++++ b/src/hed/libs/credential/VOMSAttribute.cpp +@@ -540,11 +540,7 @@ AC_INFO *d2i_AC_INFO(AC_INFO **a, SSLCON + M_ASN1_D2I_get_seq_type(AC_ATTR, ret->attrib, (AC_ATTR* (*)())d2i_AC_ATTR, AC_ATTR_free); + #endif + M_ASN1_D2I_get_opt(ret->id, d2i_ASN1_BIT_STRING, V_ASN1_BIT_STRING); +-#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) +- M_ASN1_D2I_get_seq_opt_type(X509_EXTENSION, *ret->exts, d2i_X509_EXTENSION, X509_EXTENSION_free); +-#else + M_ASN1_D2I_get_seq_opt_type(X509_EXTENSION, ret->exts, d2i_X509_EXTENSION, X509_EXTENSION_free); +-#endif + M_ASN1_D2I_Finish(a, AC_INFO_free, AC_F_D2I_AC); + } + +@@ -811,11 +807,7 @@ AC_CERTS *d2i_AC_CERTS(AC_CERTS **a, SSL + + M_ASN1_D2I_Init(); + M_ASN1_D2I_start_sequence(); +-#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) +- M_ASN1_D2I_get_seq_type(X509, *ret->stackcert, d2i_X509, X509_free); +-#else + M_ASN1_D2I_get_seq_type(X509, ret->stackcert, d2i_X509, X509_free); +-#endif + M_ASN1_D2I_Finish(a, AC_CERTS_free, ASN1_F_D2I_AC_CERTS); + } + diff --git a/debian/patches/cstddef-ptrdiff_t.patch b/debian/patches/cstddef-ptrdiff_t.patch new file mode 100644 index 0000000..61bd0d6 --- /dev/null +++ b/debian/patches/cstddef-ptrdiff_t.patch @@ -0,0 +1,11 @@ +--- a/python/arc_wrap.cpp ++++ b/python/arc_wrap.cpp +@@ -8,6 +8,8 @@ + * interface file instead. + * ----------------------------------------------------------------------------- */ + ++#include <cstddef> ++ + #define SWIGPYTHON + #define SWIG_PYTHON_THREADS + #define SWIG_PYTHON_DIRECTOR_NO_VTABLE diff --git a/debian/patches/ld-no-add-needed.diff b/debian/patches/ld-no-add-needed.diff new file mode 100644 index 0000000..5bc9d07 --- /dev/null +++ b/debian/patches/ld-no-add-needed.diff @@ -0,0 +1,670 @@ +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/tests/perf/Makefile.am 2010-12-08 23:00:30.417186230 +0000 ++++ nordugrid-arc-nox-1.1.0~rc6/src/tests/perf/Makefile.am 2010-12-08 23:19:07.947185086 +0000 +@@ -10,43 +10,35 @@ + + perftest_SOURCES = perftest.cpp + perftest_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-perftest_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) +-perftest_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la ++perftest_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) + + perftest_msgsize_SOURCES = perftest_msgsize.cpp + perftest_msgsize_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-perftest_msgsize_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) +-perftest_msgsize_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la ++perftest_msgsize_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) + + if XMLSEC_ENABLED + perftest_saml2sso_SOURCES = perftest_saml2sso.cpp + perftest_saml2sso_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include $(XMLSEC_OPENSSL_CFLAGS) $(XMLSEC_CFLAGS) +-perftest_saml2sso_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(XMLSEC_OPENSSL_LIBS) $(XMLSEC_LIBS) +-perftest_saml2sso_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(top_srcdir)/src/hed/libs/xmlsec/libarcxmlsec.la ++perftest_saml2sso_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(top_srcdir)/src/hed/libs/xmlsec/libarcxmlsec.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(XMLSEC_OPENSSL_LIBS) $(XMLSEC_LIBS) + + perftest_slcs_SOURCES = perftest_slcs.cpp + perftest_slcs_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include $(XMLSEC_OPENSSL_CFLAGS) $(XMLSEC_CFLAGS) +-perftest_slcs_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(XMLSEC_OPENSSL_LIBS) $(XMLSEC_LIBS) +-perftest_slcs_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(top_srcdir)/src/hed/libs/xmlsec/libarcxmlsec.la ++perftest_slcs_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(top_srcdir)/src/hed/libs/xmlsec/libarcxmlsec.la $(top_srcdir)/src/hed/libs/credential/libarccredential.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(XMLSEC_OPENSSL_LIBS) $(XMLSEC_LIBS) + endif + + perftest_deleg_bysechandler_SOURCES = perftest_deleg_bysechandler.cpp + perftest_deleg_bysechandler_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-perftest_deleg_bysechandler_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) +-perftest_deleg_bysechandler_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la ++perftest_deleg_bysechandler_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) + + perftest_deleg_bydelegclient_SOURCES = perftest_deleg_bydelegclient.cpp + perftest_deleg_bydelegclient_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-perftest_deleg_bydelegclient_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) +-perftest_deleg_bydelegclient_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la ++perftest_deleg_bydelegclient_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) + + perftest_cmd_duration_SOURCES = perftest_cmd_duration.cpp + perftest_cmd_duration_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-perftest_cmd_duration_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) +-perftest_cmd_duration_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la ++perftest_cmd_duration_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) + + perftest_cmd_times_SOURCES = perftest_cmd_times.cpp + perftest_cmd_times_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-perftest_cmd_times_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) +-perftest_cmd_times_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la ++perftest_cmd_times_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) + +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/tests/perf/Makefile.in 2010-12-14 19:03:44.917187078 +0000 ++++ nordugrid-arc-nox-1.1.0~rc6/src/tests/perf/Makefile.in 2010-12-14 19:03:44.777187391 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -76,14 +76,16 @@ + PROGRAMS = $(noinst_PROGRAMS) + am_perftest_OBJECTS = perftest-perftest.$(OBJEXT) + perftest_OBJECTS = $(am_perftest_OBJECTS) ++am__DEPENDENCIES_1 = + perftest_DEPENDENCIES = \ + $(top_srcdir)/src/hed/libs/common/libarccommon.la \ + $(top_srcdir)/src/hed/libs/loader/libarcloader.la \ + $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ +- $(top_srcdir)/src/hed/libs/client/libarcclient.la ++ $(top_srcdir)/src/hed/libs/client/libarcclient.la \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + perftest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(perftest_CXXFLAGS) \ +- $(CXXFLAGS) $(perftest_LDFLAGS) $(LDFLAGS) -o $@ ++ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + am_perftest_cmd_duration_OBJECTS = \ + perftest_cmd_duration-perftest_cmd_duration.$(OBJEXT) + perftest_cmd_duration_OBJECTS = $(am_perftest_cmd_duration_OBJECTS) +@@ -91,11 +93,12 @@ + $(top_srcdir)/src/hed/libs/common/libarccommon.la \ + $(top_srcdir)/src/hed/libs/loader/libarcloader.la \ + $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ +- $(top_srcdir)/src/hed/libs/client/libarcclient.la ++ $(top_srcdir)/src/hed/libs/client/libarcclient.la \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + perftest_cmd_duration_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ +- $(perftest_cmd_duration_CXXFLAGS) $(CXXFLAGS) \ +- $(perftest_cmd_duration_LDFLAGS) $(LDFLAGS) -o $@ ++ $(perftest_cmd_duration_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + am_perftest_cmd_times_OBJECTS = \ + perftest_cmd_times-perftest_cmd_times.$(OBJEXT) + perftest_cmd_times_OBJECTS = $(am_perftest_cmd_times_OBJECTS) +@@ -103,11 +106,12 @@ + $(top_srcdir)/src/hed/libs/common/libarccommon.la \ + $(top_srcdir)/src/hed/libs/loader/libarcloader.la \ + $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ +- $(top_srcdir)/src/hed/libs/client/libarcclient.la ++ $(top_srcdir)/src/hed/libs/client/libarcclient.la \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + perftest_cmd_times_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ +- $(perftest_cmd_times_CXXFLAGS) $(CXXFLAGS) \ +- $(perftest_cmd_times_LDFLAGS) $(LDFLAGS) -o $@ ++ $(perftest_cmd_times_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + am_perftest_deleg_bydelegclient_OBJECTS = perftest_deleg_bydelegclient-perftest_deleg_bydelegclient.$(OBJEXT) + perftest_deleg_bydelegclient_OBJECTS = \ + $(am_perftest_deleg_bydelegclient_OBJECTS) +@@ -115,11 +119,12 @@ + $(top_srcdir)/src/hed/libs/common/libarccommon.la \ + $(top_srcdir)/src/hed/libs/loader/libarcloader.la \ + $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ +- $(top_srcdir)/src/hed/libs/client/libarcclient.la ++ $(top_srcdir)/src/hed/libs/client/libarcclient.la \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + perftest_deleg_bydelegclient_LINK = $(LIBTOOL) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(perftest_deleg_bydelegclient_CXXFLAGS) $(CXXFLAGS) \ +- $(perftest_deleg_bydelegclient_LDFLAGS) $(LDFLAGS) -o $@ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ + am_perftest_deleg_bysechandler_OBJECTS = perftest_deleg_bysechandler-perftest_deleg_bysechandler.$(OBJEXT) + perftest_deleg_bysechandler_OBJECTS = \ + $(am_perftest_deleg_bysechandler_OBJECTS) +@@ -127,11 +132,12 @@ + $(top_srcdir)/src/hed/libs/common/libarccommon.la \ + $(top_srcdir)/src/hed/libs/loader/libarcloader.la \ + $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ +- $(top_srcdir)/src/hed/libs/client/libarcclient.la ++ $(top_srcdir)/src/hed/libs/client/libarcclient.la \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + perftest_deleg_bysechandler_LINK = $(LIBTOOL) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(perftest_deleg_bysechandler_CXXFLAGS) $(CXXFLAGS) \ +- $(perftest_deleg_bysechandler_LDFLAGS) $(LDFLAGS) -o $@ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ + am_perftest_msgsize_OBJECTS = \ + perftest_msgsize-perftest_msgsize.$(OBJEXT) + perftest_msgsize_OBJECTS = $(am_perftest_msgsize_OBJECTS) +@@ -139,11 +145,12 @@ + $(top_srcdir)/src/hed/libs/common/libarccommon.la \ + $(top_srcdir)/src/hed/libs/loader/libarcloader.la \ + $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ +- $(top_srcdir)/src/hed/libs/client/libarcclient.la ++ $(top_srcdir)/src/hed/libs/client/libarcclient.la \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + perftest_msgsize_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ +- $(perftest_msgsize_CXXFLAGS) $(CXXFLAGS) \ +- $(perftest_msgsize_LDFLAGS) $(LDFLAGS) -o $@ ++ $(perftest_msgsize_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + am__perftest_saml2sso_SOURCES_DIST = perftest_saml2sso.cpp + @XMLSEC_ENABLED_TRUE@am_perftest_saml2sso_OBJECTS = perftest_saml2sso-perftest_saml2sso.$(OBJEXT) + perftest_saml2sso_OBJECTS = $(am_perftest_saml2sso_OBJECTS) +@@ -151,11 +158,15 @@ + @XMLSEC_ENABLED_TRUE@ $(top_srcdir)/src/hed/libs/loader/libarcloader.la \ + @XMLSEC_ENABLED_TRUE@ $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ + @XMLSEC_ENABLED_TRUE@ $(top_srcdir)/src/hed/libs/client/libarcclient.la \ +-@XMLSEC_ENABLED_TRUE@ $(top_srcdir)/src/hed/libs/xmlsec/libarcxmlsec.la ++@XMLSEC_ENABLED_TRUE@ $(top_srcdir)/src/hed/libs/xmlsec/libarcxmlsec.la \ ++@XMLSEC_ENABLED_TRUE@ $(am__DEPENDENCIES_1) \ ++@XMLSEC_ENABLED_TRUE@ $(am__DEPENDENCIES_1) \ ++@XMLSEC_ENABLED_TRUE@ $(am__DEPENDENCIES_1) \ ++@XMLSEC_ENABLED_TRUE@ $(am__DEPENDENCIES_1) + perftest_saml2sso_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ +- $(perftest_saml2sso_CXXFLAGS) $(CXXFLAGS) \ +- $(perftest_saml2sso_LDFLAGS) $(LDFLAGS) -o $@ ++ $(perftest_saml2sso_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + am__perftest_slcs_SOURCES_DIST = perftest_slcs.cpp + @XMLSEC_ENABLED_TRUE@am_perftest_slcs_OBJECTS = \ + @XMLSEC_ENABLED_TRUE@ perftest_slcs-perftest_slcs.$(OBJEXT) +@@ -164,10 +175,14 @@ + @XMLSEC_ENABLED_TRUE@ $(top_srcdir)/src/hed/libs/loader/libarcloader.la \ + @XMLSEC_ENABLED_TRUE@ $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ + @XMLSEC_ENABLED_TRUE@ $(top_srcdir)/src/hed/libs/client/libarcclient.la \ +-@XMLSEC_ENABLED_TRUE@ $(top_srcdir)/src/hed/libs/xmlsec/libarcxmlsec.la ++@XMLSEC_ENABLED_TRUE@ $(top_srcdir)/src/hed/libs/xmlsec/libarcxmlsec.la \ ++@XMLSEC_ENABLED_TRUE@ $(am__DEPENDENCIES_1) \ ++@XMLSEC_ENABLED_TRUE@ $(am__DEPENDENCIES_1) \ ++@XMLSEC_ENABLED_TRUE@ $(am__DEPENDENCIES_1) \ ++@XMLSEC_ENABLED_TRUE@ $(am__DEPENDENCIES_1) + perftest_slcs_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(perftest_slcs_CXXFLAGS) \ +- $(CXXFLAGS) $(perftest_slcs_LDFLAGS) $(LDFLAGS) -o $@ ++ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -342,6 +357,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PDFLATEX = @PDFLATEX@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POSUB = @POSUB@ + PYTHON = @PYTHON@ + PYTHON_CFLAGS = @PYTHON_CFLAGS@ +@@ -441,36 +458,28 @@ + top_srcdir = @top_srcdir@ + perftest_SOURCES = perftest.cpp + perftest_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-perftest_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) +-perftest_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la ++perftest_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) + perftest_msgsize_SOURCES = perftest_msgsize.cpp + perftest_msgsize_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-perftest_msgsize_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) +-perftest_msgsize_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la ++perftest_msgsize_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) + @XMLSEC_ENABLED_TRUE@perftest_saml2sso_SOURCES = perftest_saml2sso.cpp + @XMLSEC_ENABLED_TRUE@perftest_saml2sso_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include $(XMLSEC_OPENSSL_CFLAGS) $(XMLSEC_CFLAGS) +-@XMLSEC_ENABLED_TRUE@perftest_saml2sso_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(XMLSEC_OPENSSL_LIBS) $(XMLSEC_LIBS) +-@XMLSEC_ENABLED_TRUE@perftest_saml2sso_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(top_srcdir)/src/hed/libs/xmlsec/libarcxmlsec.la ++@XMLSEC_ENABLED_TRUE@perftest_saml2sso_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(top_srcdir)/src/hed/libs/xmlsec/libarcxmlsec.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(XMLSEC_OPENSSL_LIBS) $(XMLSEC_LIBS) + @XMLSEC_ENABLED_TRUE@perftest_slcs_SOURCES = perftest_slcs.cpp + @XMLSEC_ENABLED_TRUE@perftest_slcs_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include $(XMLSEC_OPENSSL_CFLAGS) $(XMLSEC_CFLAGS) +-@XMLSEC_ENABLED_TRUE@perftest_slcs_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(XMLSEC_OPENSSL_LIBS) $(XMLSEC_LIBS) +-@XMLSEC_ENABLED_TRUE@perftest_slcs_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(top_srcdir)/src/hed/libs/xmlsec/libarcxmlsec.la ++@XMLSEC_ENABLED_TRUE@perftest_slcs_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(top_srcdir)/src/hed/libs/xmlsec/libarcxmlsec.la $(top_srcdir)/src/hed/libs/credential/libarccredential.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(XMLSEC_OPENSSL_LIBS) $(XMLSEC_LIBS) + perftest_deleg_bysechandler_SOURCES = perftest_deleg_bysechandler.cpp + perftest_deleg_bysechandler_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-perftest_deleg_bysechandler_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) +-perftest_deleg_bysechandler_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la ++perftest_deleg_bysechandler_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) + perftest_deleg_bydelegclient_SOURCES = perftest_deleg_bydelegclient.cpp + perftest_deleg_bydelegclient_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-perftest_deleg_bydelegclient_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) +-perftest_deleg_bydelegclient_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la ++perftest_deleg_bydelegclient_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) + perftest_cmd_duration_SOURCES = perftest_cmd_duration.cpp + perftest_cmd_duration_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-perftest_cmd_duration_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) +-perftest_cmd_duration_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la ++perftest_cmd_duration_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) + perftest_cmd_times_SOURCES = perftest_cmd_times.cpp + perftest_cmd_times_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-perftest_cmd_times_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) +-perftest_cmd_times_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la ++perftest_cmd_times_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la $(top_srcdir)/src/hed/libs/loader/libarcloader.la $(top_srcdir)/src/hed/libs/message/libarcmessage.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) + all: all-am + + .SUFFIXES: +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/services/a-rex/grid-manager/loaders/Makefile.am 2010-12-08 23:26:06.890935962 +0000 ++++ nordugrid-arc-nox-1.1.0~rc6/src/services/a-rex/grid-manager/loaders/Makefile.am 2010-12-14 18:09:01.257184469 +0000 +@@ -2,9 +2,9 @@ + + downloader_SOURCES=downloader.cpp janitor.cpp janitor.h + downloader_CXXFLAGS=$(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-downloader_LDADD=$(top_srcdir)/src/hed/libs/data/libarcdata2.la $(top_srcdir)/src/hed/libs/client/libarcclient.la ../jobs/libjobs.la ../files/libfiles.la ../run/librun.la ../conf/libconf.la ../misc/libmisc.la ++downloader_LDADD=../jobs/libjobs.la ../files/libfiles.la ../run/librun.la ../conf/libconf.la ../misc/libmisc.la $(top_srcdir)/src/hed/libs/data/libarcdata2.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(top_srcdir)/src/hed/libs/credential/libarccredential.la + + uploader_SOURCES=uploader.cpp janitor.cpp janitor.h + uploader_CXXFLAGS=$(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-uploader_LDADD=$(top_srcdir)/src/hed/libs/data/libarcdata2.la ../jobs/libjobs.la ../files/libfiles.la ../run/librun.la ../conf/libconf.la ../misc/libmisc.la ++uploader_LDADD=../jobs/libjobs.la ../files/libfiles.la ../run/librun.la ../conf/libconf.la ../misc/libmisc.la $(top_srcdir)/src/hed/libs/data/libarcdata2.la $(top_srcdir)/src/hed/libs/client/libarcclient.la + +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/services/a-rex/grid-manager/loaders/Makefile.in 2010-12-14 19:03:44.927186965 +0000 ++++ nordugrid-arc-nox-1.1.0~rc6/src/services/a-rex/grid-manager/loaders/Makefile.in 2010-12-14 19:03:44.817186174 +0000 +@@ -350,10 +350,10 @@ + top_srcdir = @top_srcdir@ + downloader_SOURCES = downloader.cpp janitor.cpp janitor.h + downloader_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-downloader_LDADD = $(top_srcdir)/src/hed/libs/data/libarcdata2.la $(top_srcdir)/src/hed/libs/client/libarcclient.la ../jobs/libjobs.la ../files/libfiles.la ../run/librun.la ../conf/libconf.la ../misc/libmisc.la ++downloader_LDADD=../jobs/libjobs.la ../files/libfiles.la ../run/librun.la ../conf/libconf.la ../misc/libmisc.la $(top_srcdir)/src/hed/libs/data/libarcdata2.la $(top_srcdir)/src/hed/libs/client/libarcclient.la $(top_srcdir)/src/hed/libs/credential/libarccredential.la + uploader_SOURCES = uploader.cpp janitor.cpp janitor.h + uploader_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-uploader_LDADD = $(top_srcdir)/src/hed/libs/data/libarcdata2.la ../jobs/libjobs.la ../files/libfiles.la ../run/librun.la ../conf/libconf.la ../misc/libmisc.la ++uploader_LDADD=../jobs/libjobs.la ../files/libfiles.la ../run/librun.la ../conf/libconf.la ../misc/libmisc.la $(top_srcdir)/src/hed/libs/data/libarcdata2.la $(top_srcdir)/src/hed/libs/client/libarcclient.la + all: all-am + + .SUFFIXES: +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/clients/data/Makefile.in ++++ nordugrid-arc-nox-1.1.0~rc6/src/clients/data/Makefile.in +@@ -364,17 +364,18 @@ top_srcdir = @top_srcdir@ + man_MANS = arccp.1 arcls.1 arcrm.1 + CLILIBS = $(top_srcdir)/src/hed/libs/data/libarcdata2.la \ + $(top_srcdir)/src/hed/libs/client/libarcclient.la \ ++ $(top_srcdir)/src/hed/libs/credential/libarccredential.la \ + $(top_srcdir)/src/hed/libs/common/libarccommon.la + + arccp_SOURCES = arccp.cpp + arccp_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arccp_LDADD = $(CLILIBS) ++arccp_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + arcls_SOURCES = arcls.cpp + arcls_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcls_LDADD = $(CLILIBS) ++arcls_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + arcrm_SOURCES = arcrm.cpp + arcrm_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcrm_LDADD = $(CLILIBS) ++arcrm_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + all: all-am + + .SUFFIXES: +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/clients/data/Makefile.am ++++ nordugrid-arc-nox-1.1.0~rc6/src/clients/data/Makefile.am +@@ -4,16 +4,17 @@ man_MANS = arccp.1 arcls.1 arcrm.1 + + CLILIBS = $(top_srcdir)/src/hed/libs/data/libarcdata2.la \ + $(top_srcdir)/src/hed/libs/client/libarcclient.la \ ++ $(top_srcdir)/src/hed/libs/credential/libarccredential.la \ + $(top_srcdir)/src/hed/libs/common/libarccommon.la + + arccp_SOURCES = arccp.cpp + arccp_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arccp_LDADD = $(CLILIBS) ++arccp_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + + arcls_SOURCES = arcls.cpp + arcls_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcls_LDADD = $(CLILIBS) ++arcls_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + + arcrm_SOURCES = arcrm.cpp + arcrm_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcrm_LDADD = $(CLILIBS) ++arcrm_LDADD = $(CLILIBS) $(GLIBMM_LIBS) +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/clients/saml/Makefile.in ++++ nordugrid-arc-nox-1.1.0~rc6/src/clients/saml/Makefile.in +@@ -365,7 +365,7 @@ CLILIBS = $(top_srcdir)/src/hed/libs/com + + saml_assertion_init_SOURCES = saml_assertion_init.cpp + saml_assertion_init_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) $(XMLSEC_CFLAGS) -I$(top_srcdir)/include +-saml_assertion_init_LDADD = $(CLILIBS) ++saml_assertion_init_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + EXTRA_DIST = $(doc_DATA) + all: all-am + +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/clients/saml/Makefile.am ++++ nordugrid-arc-nox-1.1.0~rc6/src/clients/saml/Makefile.am +@@ -12,6 +12,6 @@ CLILIBS = $(top_srcdir)/src/hed/libs/com + + saml_assertion_init_SOURCES = saml_assertion_init.cpp + saml_assertion_init_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) $(XMLSEC_CFLAGS) -I$(top_srcdir)/include +-saml_assertion_init_LDADD = $(CLILIBS) ++saml_assertion_init_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + + EXTRA_DIST = $(doc_DATA) +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/clients/charon/Makefile.in ++++ nordugrid-arc-nox-1.1.0~rc6/src/clients/charon/Makefile.in +@@ -360,11 +360,12 @@ CLILIBS = $(top_srcdir)/src/hed/libs/com + $(top_srcdir)/src/hed/libs/data/libarcdata2.la \ + $(top_srcdir)/src/hed/libs/loader/libarcloader.la \ + $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ ++ $(top_srcdir)/src/hed/libs/credential/libarccredential.la \ + $(top_srcdir)/src/hed/libs/security/libarcsecurity.la + + arcdecision_SOURCES = arcdecision.cpp + arcdecision_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcdecision_LDADD = $(CLILIBS) ++arcdecision_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + EXTRA_DIST = $(example_DATA) + all: all-am + +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/clients/charon/Makefile.am ++++ nordugrid-arc-nox-1.1.0~rc6/src/clients/charon/Makefile.am +@@ -10,10 +10,11 @@ CLILIBS = $(top_srcdir)/src/hed/libs/com + $(top_srcdir)/src/hed/libs/data/libarcdata2.la \ + $(top_srcdir)/src/hed/libs/loader/libarcloader.la \ + $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ ++ $(top_srcdir)/src/hed/libs/credential/libarccredential.la \ + $(top_srcdir)/src/hed/libs/security/libarcsecurity.la + + arcdecision_SOURCES = arcdecision.cpp + arcdecision_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcdecision_LDADD = $(CLILIBS) ++arcdecision_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + + EXTRA_DIST = $(example_DATA) +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/clients/wsrf/Makefile.in ++++ nordugrid-arc-nox-1.1.0~rc6/src/clients/wsrf/Makefile.in +@@ -356,7 +356,7 @@ top_srcdir = @top_srcdir@ + man_MANS = arcwsrf.1 + arcwsrf_SOURCES = arcwsrf.cpp + arcwsrf_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcwsrf_LDADD = ../../hed/libs/ws/libarcws.la ../../hed/libs/client/libarcclient.la ++arcwsrf_LDADD = ../../hed/libs/ws/libarcws.la ../../hed/libs/client/libarcclient.la ../../hed/libs/message/libarcmessage.la ../../hed/libs/common/libarccommon.la $(GLIBMM_LIBS) + sysconf_DATA = + doc_DATA = + EXTRA_DIST = $(doc_DATA) $(sysconf_DATA) +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/clients/wsrf/Makefile.am ++++ nordugrid-arc-nox-1.1.0~rc6/src/clients/wsrf/Makefile.am +@@ -4,7 +4,7 @@ man_MANS = arcwsrf.1 + + arcwsrf_SOURCES = arcwsrf.cpp + arcwsrf_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcwsrf_LDADD = ../../hed/libs/ws/libarcws.la ../../hed/libs/client/libarcclient.la ++arcwsrf_LDADD = ../../hed/libs/ws/libarcws.la ../../hed/libs/client/libarcclient.la ../../hed/libs/message/libarcmessage.la ../../hed/libs/common/libarccommon.la $(GLIBMM_LIBS) + + sysconf_DATA = + doc_DATA = +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/clients/credentials/Makefile.in ++++ nordugrid-arc-nox-1.1.0~rc6/src/clients/credentials/Makefile.in +@@ -425,39 +425,36 @@ arcproxy_LDADD = $(top_srcdir)/src/hed/l + + @XMLSEC_ENABLED_TRUE@arcslcs_SOURCES = arcslcs.cpp + @XMLSEC_ENABLED_TRUE@arcslcs_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) $(OPENSSL_CFLAGS) -I$(top_srcdir)/include $(XMLSEC_OPENSSL_CFLAGS) $(XMLSEC_CFLAGS) +-@XMLSEC_ENABLED_TRUE@arcslcs_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(XMLSEC_OPENSSL_LIBS) $(XMLSEC_LIBS) + @XMLSEC_ENABLED_TRUE@arcslcs_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la \ + @XMLSEC_ENABLED_TRUE@ $(top_srcdir)/src/hed/libs/client/libarcclient.la \ + @XMLSEC_ENABLED_TRUE@ $(top_srcdir)/src/hed/libs/credential/libarccredential.la \ +-@XMLSEC_ENABLED_TRUE@ $(top_srcdir)/src/hed/libs/xmlsec/libarcxmlsec.la ++@XMLSEC_ENABLED_TRUE@ $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ ++@XMLSEC_ENABLED_TRUE@ $(top_srcdir)/src/hed/libs/xmlsec/libarcxmlsec.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(XMLSEC_OPENSSL_LIBS) $(XMLSEC_LIBS) + + test2vomsserver_SOURCES = test2vomsserver.cpp + test2vomsserver_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-test2vomsserver_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) + test2vomsserver_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la \ + $(top_srcdir)/src/hed/libs/loader/libarcloader.la \ + $(top_srcdir)/src/hed/libs/client/libarcclient.la \ + $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ + $(top_srcdir)/src/hed/libs/crypto/libarccrypto.la \ +- $(top_srcdir)/src/hed/libs/credential/libarccredential.la ++ $(top_srcdir)/src/hed/libs/credential/libarccredential.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) + + test2myproxyserver_put_SOURCES = test2myproxyserver_put.cpp + test2myproxyserver_put_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-test2myproxyserver_put_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) + test2myproxyserver_put_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la \ + $(top_srcdir)/src/hed/libs/loader/libarcloader.la \ + $(top_srcdir)/src/hed/libs/client/libarcclient.la \ + $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ +- $(top_srcdir)/src/hed/libs/credential/libarccredential.la ++ $(top_srcdir)/src/hed/libs/credential/libarccredential.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(OPENSSL_LIBS) + + test2myproxyserver_get_SOURCES = test2myproxyserver_get.cpp + test2myproxyserver_get_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-test2myproxyserver_get_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) + test2myproxyserver_get_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la \ + $(top_srcdir)/src/hed/libs/loader/libarcloader.la \ + $(top_srcdir)/src/hed/libs/client/libarcclient.la \ + $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ +- $(top_srcdir)/src/hed/libs/credential/libarccredential.la ++ $(top_srcdir)/src/hed/libs/credential/libarccredential.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(OPENSSL_LIBS) + + man_MANS = arcproxy.1 arcslcs.1 + all: all-am +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/clients/credentials/Makefile.am ++++ nordugrid-arc-nox-1.1.0~rc6/src/clients/credentials/Makefile.am +@@ -19,39 +19,36 @@ arcproxy_LDADD = $(top_srcdir)/src/he + if XMLSEC_ENABLED + arcslcs_SOURCES = arcslcs.cpp + arcslcs_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) $(OPENSSL_CFLAGS) -I$(top_srcdir)/include $(XMLSEC_OPENSSL_CFLAGS) $(XMLSEC_CFLAGS) +-arcslcs_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(XMLSEC_OPENSSL_LIBS) $(XMLSEC_LIBS) + arcslcs_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la \ + $(top_srcdir)/src/hed/libs/client/libarcclient.la \ + $(top_srcdir)/src/hed/libs/credential/libarccredential.la \ +- $(top_srcdir)/src/hed/libs/xmlsec/libarcxmlsec.la ++ $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ ++ $(top_srcdir)/src/hed/libs/xmlsec/libarcxmlsec.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(XMLSEC_OPENSSL_LIBS) $(XMLSEC_LIBS) + endif + + test2vomsserver_SOURCES = test2vomsserver.cpp + test2vomsserver_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-test2vomsserver_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) + test2vomsserver_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la \ + $(top_srcdir)/src/hed/libs/loader/libarcloader.la \ + $(top_srcdir)/src/hed/libs/client/libarcclient.la \ + $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ + $(top_srcdir)/src/hed/libs/crypto/libarccrypto.la \ +- $(top_srcdir)/src/hed/libs/credential/libarccredential.la ++ $(top_srcdir)/src/hed/libs/credential/libarccredential.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) + + test2myproxyserver_put_SOURCES = test2myproxyserver_put.cpp + test2myproxyserver_put_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-test2myproxyserver_put_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) + test2myproxyserver_put_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la \ + $(top_srcdir)/src/hed/libs/loader/libarcloader.la \ + $(top_srcdir)/src/hed/libs/client/libarcclient.la \ + $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ +- $(top_srcdir)/src/hed/libs/credential/libarccredential.la ++ $(top_srcdir)/src/hed/libs/credential/libarccredential.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(OPENSSL_LIBS) + + test2myproxyserver_get_SOURCES = test2myproxyserver_get.cpp + test2myproxyserver_get_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-test2myproxyserver_get_LDFLAGS = $(GLIBMM_LIBS) $(LIBXML2_LIBS) + test2myproxyserver_get_LDADD = $(top_srcdir)/src/hed/libs/common/libarccommon.la \ + $(top_srcdir)/src/hed/libs/loader/libarcloader.la \ + $(top_srcdir)/src/hed/libs/client/libarcclient.la \ + $(top_srcdir)/src/hed/libs/message/libarcmessage.la \ +- $(top_srcdir)/src/hed/libs/credential/libarccredential.la ++ $(top_srcdir)/src/hed/libs/credential/libarccredential.la $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(OPENSSL_LIBS) + + man_MANS = arcproxy.1 arcslcs.1 +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/clients/arclib/Makefile.in ++++ nordugrid-arc-nox-1.1.0~rc6/src/clients/arclib/Makefile.in +@@ -442,40 +442,40 @@ CLILIBS = ../../hed/libs/data/libarcdata + + arcsub_SOURCES = arcsub.cpp + arcsub_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcsub_LDADD = $(CLILIBS) ++arcsub_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + arcget_SOURCES = arcget.cpp + arcget_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcget_LDADD = $(CLILIBS) ++arcget_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + arcstat_SOURCES = arcstat.cpp + arcstat_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcstat_LDADD = $(CLILIBS) ++arcstat_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + arcinfo_SOURCES = arcinfo.cpp + arcinfo_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcinfo_LDADD = $(CLILIBS) ++arcinfo_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + arckill_SOURCES = arckill.cpp + arckill_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arckill_LDADD = $(CLILIBS) ++arckill_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + arcclean_SOURCES = arcclean.cpp + arcclean_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcclean_LDADD = $(CLILIBS) ++arcclean_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + arccat_SOURCES = arccat.cpp + arccat_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arccat_LDADD = $(CLILIBS) ++arccat_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + arcsync_SOURCES = arcsync.cpp + arcsync_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcsync_LDADD = $(CLILIBS) ++arcsync_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + arcresub_SOURCES = arcresub.cpp + arcresub_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcresub_LDADD = $(CLILIBS) ++arcresub_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + arcmigrate_SOURCES = arcmigrate.cpp + arcmigrate_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcmigrate_LDADD = $(CLILIBS) ++arcmigrate_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + arcrenew_SOURCES = arcrenew.cpp + arcrenew_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcrenew_LDADD = $(CLILIBS) ++arcrenew_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + arcresume_SOURCES = arcresume.cpp + arcresume_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcresume_LDADD = $(CLILIBS) ++arcresume_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + all: all-am + + .SUFFIXES: +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/clients/arclib/Makefile.am ++++ nordugrid-arc-nox-1.1.0~rc6/src/clients/arclib/Makefile.am +@@ -12,48 +12,48 @@ CLILIBS = ../../hed/libs/data/libarcdata + + arcsub_SOURCES = arcsub.cpp + arcsub_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcsub_LDADD = $(CLILIBS) ++arcsub_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + + arcget_SOURCES = arcget.cpp + arcget_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcget_LDADD = $(CLILIBS) ++arcget_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + + arcstat_SOURCES = arcstat.cpp + arcstat_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcstat_LDADD = $(CLILIBS) ++arcstat_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + + arcinfo_SOURCES = arcinfo.cpp + arcinfo_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcinfo_LDADD = $(CLILIBS) ++arcinfo_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + + arckill_SOURCES = arckill.cpp + arckill_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arckill_LDADD = $(CLILIBS) ++arckill_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + + arcclean_SOURCES = arcclean.cpp + arcclean_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcclean_LDADD = $(CLILIBS) ++arcclean_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + + arccat_SOURCES = arccat.cpp + arccat_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arccat_LDADD = $(CLILIBS) ++arccat_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + + arcsync_SOURCES = arcsync.cpp + arcsync_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcsync_LDADD = $(CLILIBS) ++arcsync_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + + arcresub_SOURCES = arcresub.cpp + arcresub_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcresub_LDADD = $(CLILIBS) ++arcresub_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + + arcmigrate_SOURCES = arcmigrate.cpp + arcmigrate_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcmigrate_LDADD = $(CLILIBS) ++arcmigrate_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + + arcrenew_SOURCES = arcrenew.cpp + arcrenew_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcrenew_LDADD = $(CLILIBS) ++arcrenew_LDADD = $(CLILIBS) $(GLIBMM_LIBS) + + arcresume_SOURCES = arcresume.cpp + arcresume_CXXFLAGS = $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include +-arcresume_LDADD = $(CLILIBS) ++arcresume_LDADD = $(CLILIBS) $(GLIBMM_LIBS) +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/services/a-rex/grid-manager/conf/Makefile.in ++++ nordugrid-arc-nox-1.1.0~rc6/src/services/a-rex/grid-manager/conf/Makefile.in +@@ -340,6 +340,7 @@ libconf_la_SOURCES = environment.cpp dae + environment.h daemon.h conf_file.h conf.h conf_sections.h gridmap.h conf_pre.h conf_map.h conf_cache.h + + libconf_la_CXXFLAGS = $(LIBXML2_CFLAGS) $(GLIBMM_CFLAGS) -I$(top_srcdir)/include ++libconf_la_LIBADD = $(GLIBMM_LIBS) $(LIBXML2_LIBS) -lpthread + all: all-am + + .SUFFIXES: +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/services/a-rex/grid-manager/conf/Makefile.am ++++ nordugrid-arc-nox-1.1.0~rc6/src/services/a-rex/grid-manager/conf/Makefile.am +@@ -3,4 +3,5 @@ noinst_LTLIBRARIES = libconf.la + libconf_la_SOURCES=environment.cpp daemon.cpp conf_file.cpp conf.cpp conf_sections.cpp gridmap.cpp conf_pre.cpp conf_map.cpp conf_cache.cpp \ + environment.h daemon.h conf_file.h conf.h conf_sections.h gridmap.h conf_pre.h conf_map.h conf_cache.h + libconf_la_CXXFLAGS=$(LIBXML2_CFLAGS) $(GLIBMM_CFLAGS) -I$(top_srcdir)/include ++libconf_la_LIBADD = $(GLIBMM_LIBS) $(LIBXML2_LIBS) -lpthread + #libconf_la_LIBADD=$(top_srcdir)/libs/common/libarccommon.la ../misc/libmisc.la ../run/librun.la ../log/liblog.la ../jobs/libjobs.la +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/hed/libs/data/test/Makefile.in ++++ nordugrid-arc-nox-1.1.0~rc6/src/hed/libs/data/test/Makefile.in +@@ -332,7 +332,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + libarcdatatest_SOURCES = Test.cpp FileCacheTest.cpp + libarcdatatest_CXXFLAGS = $(CPPUNIT_CFLAGS) $(LIBXML2_CFLAGS) $(GLIBMM_CFLAGS) -I$(top_srcdir)/include +-libarcdatatest_LDADD = $(CPPUNIT_LIBS) $(top_srcdir)/src/hed/libs/common/libarccommon.la ../libarcdata2.la ++libarcdatatest_LDADD = $(CPPUNIT_LIBS) $(top_srcdir)/src/hed/libs/common/libarccommon.la ../libarcdata2.la $(GLIBMM_LIBS) + all: all-am + + .SUFFIXES: +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/hed/libs/data/test/Makefile.am ++++ nordugrid-arc-nox-1.1.0~rc6/src/hed/libs/data/test/Makefile.am +@@ -3,4 +3,4 @@ check_PROGRAMS = $(TESTS) + + libarcdatatest_SOURCES = Test.cpp FileCacheTest.cpp + libarcdatatest_CXXFLAGS = $(CPPUNIT_CFLAGS) $(LIBXML2_CFLAGS) $(GLIBMM_CFLAGS) -I$(top_srcdir)/include +-libarcdatatest_LDADD = $(CPPUNIT_LIBS) $(top_srcdir)/src/hed/libs/common/libarccommon.la ../libarcdata2.la ++libarcdatatest_LDADD = $(CPPUNIT_LIBS) $(top_srcdir)/src/hed/libs/common/libarccommon.la ../libarcdata2.la $(GLIBMM_LIBS) +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/hed/libs/common/test/Makefile.in ++++ nordugrid-arc-nox-1.1.0~rc6/src/hed/libs/common/test/Makefile.in +@@ -370,7 +370,7 @@ RunTest_CXXFLAGS = $(CPPUNIT_CFLAGS) $(G + RunTest_LDADD = $(CPPUNIT_LIBS) ../libarccommon.la + ThreadTest_SOURCES = $(top_srcdir)/src/Test.cpp ThreadTest.cpp + ThreadTest_CXXFLAGS = $(CPPUNIT_CFLAGS) $(GLIBMM_CFLAGS) -I$(top_srcdir)/include +-ThreadTest_LDADD = $(CPPUNIT_LIBS) ../libarccommon.la ++ThreadTest_LDADD = $(CPPUNIT_LIBS) ../libarccommon.la $(GLIBMM_LIBS) + XMLNodeTest_SOURCES = $(top_srcdir)/src/Test.cpp XMLNodeTest.cpp + XMLNodeTest_CXXFLAGS = $(CPPUNIT_CFLAGS) $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include + XMLNodeTest_LDADD = $(CPPUNIT_LIBS) ../libarccommon.la +--- nordugrid-arc-nox-1.1.0~rc6.orig/src/hed/libs/common/test/Makefile.am ++++ nordugrid-arc-nox-1.1.0~rc6/src/hed/libs/common/test/Makefile.am +@@ -15,7 +15,7 @@ RunTest_LDADD = $(CPPUNIT_LIBS) ../libar + + ThreadTest_SOURCES = $(top_srcdir)/src/Test.cpp ThreadTest.cpp + ThreadTest_CXXFLAGS = $(CPPUNIT_CFLAGS) $(GLIBMM_CFLAGS) -I$(top_srcdir)/include +-ThreadTest_LDADD = $(CPPUNIT_LIBS) ../libarccommon.la ++ThreadTest_LDADD = $(CPPUNIT_LIBS) ../libarccommon.la $(GLIBMM_LIBS) + + XMLNodeTest_SOURCES = $(top_srcdir)/src/Test.cpp XMLNodeTest.cpp + XMLNodeTest_CXXFLAGS = $(CPPUNIT_CFLAGS) $(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/include diff --git a/debian/patches/series b/debian/patches/series index 5138131..519c6aa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,5 @@ debian-changes-1.1.0~rc6-2 +ld-no-add-needed.diff CVE-2010-3372 +VOMSAttribute.cpp.diff +cstddef-ptrdiff_t.patch diff --git a/debian/rules b/debian/rules index e301b81..af45ad4 100755 --- a/debian/rules +++ b/debian/rules @@ -79,6 +79,8 @@ install-arch: build-arch-stamp dh_clean -k -a $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + rm -f $(CURDIR)/debian/tmp/usr/lib/lib*.la + rm -f $(CURDIR)/debian/tmp/usr/lib/java/lib*.la rm -f $(CURDIR)/debian/tmp/usr/lib/arc/lib*.la rm -f $(CURDIR)/debian/tmp/usr/lib/arc/lib*.a rm -rf $(CURDIR)/debian/tmp/usr/share/doc/arc
