← Back to branch summary

~ubuntu-branches/debian/experimental/nzbget/experimental

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Moog
  • Date: 2011-07-13 17:06:08 UTC
  • Revision ID: james.westby@ubuntu.com-20110713170608-or8tx83z2oiu2itm
Tags: 0.7.0-2
http://bugs.debian.org/627940
* debian/control:
  - point to updated gitweb location on alioth
  - update description (Closes: #627940)
* debian/rules:
  - build with libpar2 to enable automatic par-check/-repair
* debian/patches/link-order.patch:
  - Libraries in LDFLAGS cause issues with ld --as-needed, put them in
    LDADD instead.
  - build with dh-autoreconf due to changes to configure.ac
* debian/patches/ac_lang_source.patch:
  - Use AC_LANG_SOURCE macro to make sure configure is generated correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
204
204
        [LIBVAL="no"])
205
205
if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
206
206
        PKG_CHECK_MODULES(libxml2, libxml-2.0,
207
 
                [LDFLAGS="${LDFLAGS} $libxml2_LIBS"]
 
207
                [LDFLAGS="${LDFLAGS}"]
 
208
                [nzbget_LDADD="${nzbget_LDADD} $libxml2_LIBS"]
208
209
                [CPPFLAGS="${CPPFLAGS} $libxml2_CFLAGS"]
209
210
                [CFLAGS="${CFLAGS} $libxml2_CFLAGS"])
210
211
fi
290
291
                [LIBVAL="no"])
291
292
        if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
292
293
                PKG_CHECK_MODULES(libsigc, sigc++-2.0,
293
 
                        [LDFLAGS="${LDFLAGS} $libsigc_LIBS"]
 
294
                        [LDFLAGS="${LDFLAGS}"]
 
295
                        [nzbget_LDADD="${nzbget_LDADD} $libsigc_LIBS"]
294
296
                        [CPPFLAGS="${CPPFLAGS} $libsigc_CFLAGS"])
295
297
        fi
296
298
        
500
502
dnl variadic macros
501
503
dnl 
502
504
AC_MSG_CHECKING(for variadic macros)
503
 
AC_COMPILE_IFELSE([
 
505
AC_COMPILE_IFELSE([AC_LANG_SOURCE([
504
506
        #define macro(...)   macrofunc(__VA_ARGS__)
505
507
        int macrofunc(int a, int b) { return a + b; }
506
508
        int test() { return macro(1, 2); }
507
509
        ],
508
510
        AC_MSG_RESULT([yes])
509
511
        AC_DEFINE([HAVE_VARIADIC_MACROS], 1, Define to 1 if variadic macros are supported),
510
 
        AC_MSG_RESULT([no]))
 
512
        AC_MSG_RESULT([no]))])
511
513
 
512
514
 
513
515
dnl
549
551
AC_SUBST(CFLAGS)
550
552
AC_SUBST(CPPFLAGS)
551
553
AC_SUBST(LDFLAGS)
 
554
AC_SUBST(nzbget_LDADD)
552
555
AC_SUBST(CXXFLAGS)
553
556
AC_SUBST(TAR)
554
557
AC_SUBST(AR)