← Back to branch summary

~ubuntu-branches/ubuntu/hardy/clamav/hardy-backports

« back to all changes in this revision

Viewing changes to m4/lib-link.m4

  • Committer: Bazaar Package Importer
  • Author(s): Michael Meskes, Stephen Gran, Michael Meskes, Michael Tautschnig
  • Date: 2008-11-29 12:15:34 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (4.1.3 sid) (0.5.4 karmic)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20081129121534-8sbpoy6kr01ox2eo
http://bugs.debian.org/506055
http://bugs.debian.org/309067
http://bugs.debian.org/253080
[ Stephen Gran ]
* New upstream version

[ Michael Meskes ]
* Removed unused debconf templates and unfuzzied all translations.

[ Michael Tautschnig ]
* Removed --unzip from clampipe script (closes: #506055)
* Moved clamav-milter specific stuff from its specific README.Debian to
  clamav-global one.
* Sync start of clamav-milter with clamav-daemon when clamav-daemon is being
  upgraded (closes: #309067)
* The TemporaryDirectory option has been added long ago, no need for hacks
  via clamav-daemon.default anymore (closes: #253080)

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/lib-link.m4
161
161
    if test "X$withval" = "Xno"; then
162
162
      use_additional=no
163
163
    else
 
164
      additional_compat_libdir=
164
165
      if test "X$withval" = "X"; then
165
166
        AC_LIB_WITH_FINAL_PREFIX([
166
167
          eval additional_includedir=\"$includedir\"
169
170
      else
170
171
        additional_includedir="$withval/include"
171
172
        additional_libdir="$withval/$acl_libdirstem"
 
173
        if test "X$acl_libdirstem" != "Xlib"; then
 
174
                additional_compat_libdir="-L$withval/lib"
 
175
        fi
172
176
      fi
173
177
    fi
174
178
])
268
272
            fi
269
273
          fi
270
274
          if test "X$found_dir" = "X"; then
271
 
            for x in $LDFLAGS $LTLIB[]NAME; do
 
275
            compat_libdir=
 
276
            if test "X$acl_libdirstem" != "Xlib"; then
 
277
                compat_libdir=-L'${exec_prefix}'/lib
 
278
            fi
 
279
            for x in $LDFLAGS $LTLIB[]NAME $compat_libdir $additional_compat_libdir; do
272
280
              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
273
281
              case "$x" in
274
282
                -L*)
418
426
                LIB[]NAME[]_PREFIX="$basedir"
419
427
                additional_includedir="$basedir/include"
420
428
                ;;
 
429
             */lib | */lib/)
 
430
                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'`
 
431
                LIB[]NAME[]_PREFIX="$basedir"
 
432
                additional_includedir="$basedir/include"
 
433
                ;;
421
434
            esac
422
435
            if test "X$additional_includedir" != "X"; then
423
436
              dnl Potentially add $additional_includedir to $INCNAME.