~ubuntu-branches/ubuntu/precise/gconf/precise-201203060106

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-08-16 12:12:23 UTC
  • mfrom: (1.1.31 upstream)
  • Revision ID: james.westby@ubuntu.com-20110816121223-20e8lg1110yb6y75
Tags: 3.1.6-0ubuntu1
New upstream version

Show diffs side-by-side

added added

removed removed

Lines of Context:
3260
3260
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
3261
3261
  soname_spec='${libname}${release}${shared_ext}$major'
3262
3262
  shlibpath_var=LD_LIBRARY_PATH
3263
 
  shlibpath_overrides_runpath=no
3264
3263
  hardcode_into_libs=yes
3265
3264
  ;;
3266
3265
 
3410
3409
  # before this can be enabled.
3411
3410
  hardcode_into_libs=yes
3412
3411
 
 
3412
  # Add ABI-specific directories to the system library path.
 
3413
  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 
3414
 
3413
3415
  # Append ld.so.conf contents to the search path
3414
3416
  if test -f /etc/ld.so.conf; then
3415
3417
    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[   ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
3416
 
    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 
3418
    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
 
3419
 
3417
3420
  fi
3418
3421
 
3419
3422
  # We used to test for /lib/ld.so.1 and disable shared libraries on
3425
3428
  dynamic_linker='GNU/Linux ld.so'
3426
3429
  ;;
3427
3430
 
3428
 
netbsdelf*-gnu)
3429
 
  version_type=linux
3430
 
  need_lib_prefix=no
3431
 
  need_version=no
3432
 
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
3433
 
  soname_spec='${libname}${release}${shared_ext}$major'
3434
 
  shlibpath_var=LD_LIBRARY_PATH
3435
 
  shlibpath_overrides_runpath=no
3436
 
  hardcode_into_libs=yes
3437
 
  dynamic_linker='NetBSD ld.elf_so'
3438
 
  ;;
3439
 
 
3440
3431
netbsd*)
3441
3432
  version_type=sunos
3442
3433
  need_lib_prefix=no
4042
4033
  lt_cv_deplibs_check_method=pass_all
4043
4034
  ;;
4044
4035
 
4045
 
netbsd* | netbsdelf*-gnu)
 
4036
netbsd*)
4046
4037
  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
4047
4038
    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
4048
4039
  else
4853
4844
            ;;
4854
4845
        esac
4855
4846
        ;;
4856
 
      netbsd* | netbsdelf*-gnu)
 
4847
      netbsd*)
4857
4848
        ;;
4858
4849
      *qnx* | *nto*)
4859
4850
        # QNX uses GNU C++, but need to define -shared option too, otherwise
5311
5302
      ;;
5312
5303
    esac
5313
5304
    ;;
5314
 
  linux* | k*bsd*-gnu | gnu*)
5315
 
    _LT_TAGVAR(link_all_deplibs, $1)=no
5316
 
    ;;
5317
5305
  *)
5318
5306
    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
5319
5307
    ;;
5377
5365
  openbsd*)
5378
5366
    with_gnu_ld=no
5379
5367
    ;;
5380
 
  linux* | k*bsd*-gnu | gnu*)
5381
 
    _LT_TAGVAR(link_all_deplibs, $1)=no
5382
 
    ;;
5383
5368
  esac
5384
5369
 
5385
5370
  _LT_TAGVAR(ld_shlibs, $1)=yes
5602
5587
      fi
5603
5588
      ;;
5604
5589
 
5605
 
    netbsd* | netbsdelf*-gnu)
 
5590
    netbsd*)
5606
5591
      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
5607
5592
        _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
5608
5593
        wlarc=
5779
5764
        if test "$aix_use_runtimelinking" = yes; then
5780
5765
          shared_flag="$shared_flag "'${wl}-G'
5781
5766
        fi
5782
 
        _LT_TAGVAR(link_all_deplibs, $1)=no
5783
5767
      else
5784
5768
        # not using gcc
5785
5769
        if test "$host_cpu" = ia64; then
6088
6072
      _LT_TAGVAR(link_all_deplibs, $1)=yes
6089
6073
      ;;
6090
6074
 
6091
 
    netbsd* | netbsdelf*-gnu)
 
6075
    netbsd*)
6092
6076
      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
6093
6077
        _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
6094
6078
      else
9311
9295
# ----------------------------------
9312
9296
AC_DEFUN([PKG_PROG_PKG_CONFIG],
9313
9297
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
9314
 
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
9315
 
m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
 
9298
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
9316
9299
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
9317
9300
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
9318
9301
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
9358
9341
    pkg_cv_[]$1="$$1"
9359
9342
 elif test -n "$PKG_CONFIG"; then
9360
9343
    PKG_CHECK_EXISTS([$3],
9361
 
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
9362
 
                      test "x$?" != "x0" && pkg_failed=yes ],
 
9344
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
9363
9345
                     [pkg_failed=yes])
9364
9346
 else
9365
9347
    pkg_failed=untried
9407
9389
        AC_MSG_RESULT([no])
9408
9390
        _PKG_SHORT_ERRORS_SUPPORTED
9409
9391
        if test $_pkg_short_errors_supported = yes; then
9410
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
 
9392
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
9411
9393
        else 
9412
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
 
9394
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
9413
9395
        fi
9414
9396
        # Put the nasty error message in config.log where it belongs
9415
9397
        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
9422
9404
Consider adjusting the PKG_CONFIG_PATH environment variable if you
9423
9405
installed software in a non-standard prefix.
9424
9406
 
9425
 
_PKG_TEXT])[]dnl
 
9407
_PKG_TEXT])
9426
9408
        ])
9427
9409
elif test $pkg_failed = untried; then
9428
9410
        AC_MSG_RESULT([no])
9433
9415
 
9434
9416
_PKG_TEXT
9435
9417
 
9436
 
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
 
9418
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
9437
9419
        ])
9438
9420
else
9439
9421
        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS