← Back to branch summary

~mterry/ubuntu/natty/gnome-shell/wip

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2009-10-14 11:31:23 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20091014113123-bf8e1l5lqd4r788k
Tags: 2.28.1~git20091020-1
http://bugs.debian.org/550956
* Initial upload, based on the Ubuntu package (Closes: #550956)
* debian/patches:
- drop two unnecessary patches
* debian/rules:
- cleanup, and add Debian GNOME Team rules include
* debian/control.in:
- add Debian GNOME Team stuff
- fix alignment
- remove Recommends for xserver-xephyr
- fix build-dependencies package names
- build-depend on gnome-pkg-tools for uploaders

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
13
13
 
14
14
m4_ifndef([AC_AUTOCONF_VERSION],
15
15
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16
 
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
17
 
[m4_warning([this file was generated for autoconf 2.63.
 
16
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
 
17
[m4_warning([this file was generated for autoconf 2.64.
18
18
You have another version of autoconf.  It may work, but is not guaranteed to.
19
19
If you have problems, you may need to regenerate the build system entirely.
20
20
To do so, use the procedure documented by the package, typically `autoreconf'.])])
3370
3370
  # before this can be enabled.
3371
3371
  hardcode_into_libs=yes
3372
3372
 
3373
 
  # Add ABI-specific directories to the system library path.
3374
 
  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
3375
 
 
3376
3373
  # Append ld.so.conf contents to the search path
3377
3374
  if test -f /etc/ld.so.conf; then
3378
3375
    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;/^$/d' | tr '\n' ' '`
3379
 
    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
 
3376
    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
3380
3377
  fi
3381
3378
 
3382
3379
  # We used to test for /lib/ld.so.1 and disable shared libraries on
3388
3385
  dynamic_linker='GNU/Linux ld.so'
3389
3386
  ;;
3390
3387
 
 
3388
netbsdelf*-gnu)
 
3389
  version_type=linux
 
3390
  need_lib_prefix=no
 
3391
  need_version=no
 
3392
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 
3393
  soname_spec='${libname}${release}${shared_ext}$major'
 
3394
  shlibpath_var=LD_LIBRARY_PATH
 
3395
  shlibpath_overrides_runpath=no
 
3396
  hardcode_into_libs=yes
 
3397
  dynamic_linker='NetBSD ld.elf_so'
 
3398
  ;;
 
3399
 
3391
3400
netbsd*)
3392
3401
  version_type=sunos
3393
3402
  need_lib_prefix=no
3979
3988
  lt_cv_deplibs_check_method=pass_all
3980
3989
  ;;
3981
3990
 
3982
 
netbsd*)
 
3991
netbsd* | netbsdelf*-gnu)
3983
3992
  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
3984
3993
    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
3985
3994
  else
4660
4669
            ;;
4661
4670
        esac
4662
4671
        ;;
4663
 
      netbsd*)
 
4672
      netbsd* | netbsdelf*-gnu)
4664
4673
        ;;
4665
4674
      *qnx* | *nto*)
4666
4675
        # QNX uses GNU C++, but need to define -shared option too, otherwise
5085
5094
  cygwin* | mingw* | cegcc*)
5086
5095
    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
5087
5096
  ;;
 
5097
  linux* | k*bsd*-gnu)
 
5098
    _LT_TAGVAR(link_all_deplibs, $1)=no
 
5099
  ;;
5088
5100
  *)
5089
5101
    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
5090
5102
  ;;
5149
5161
  openbsd*)
5150
5162
    with_gnu_ld=no
5151
5163
    ;;
 
5164
  linux* | k*bsd*-gnu)
 
5165
    _LT_TAGVAR(link_all_deplibs, $1)=no
 
5166
    ;;
5152
5167
  esac
5153
5168
 
5154
5169
  _LT_TAGVAR(ld_shlibs, $1)=yes
5331
5346
      fi
5332
5347
      ;;
5333
5348
 
5334
 
    netbsd*)
 
5349
    netbsd* | netbsdelf*-gnu)
5335
5350
      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
5336
5351
        _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
5337
5352
        wlarc=
5506
5521
        if test "$aix_use_runtimelinking" = yes; then
5507
5522
          shared_flag="$shared_flag "'${wl}-G'
5508
5523
        fi
 
5524
        _LT_TAGVAR(link_all_deplibs, $1)=no
5509
5525
      else
5510
5526
        # not using gcc
5511
5527
        if test "$host_cpu" = ia64; then
5744
5760
      _LT_TAGVAR(link_all_deplibs, $1)=yes
5745
5761
      ;;
5746
5762
 
5747
 
    netbsd*)
 
5763
    netbsd* | netbsdelf*-gnu)
5748
5764
      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
5749
5765
        _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
5750
5766
      else
8953
8969
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
8954
8970
# ---------------------------------------------
8955
8971
m4_define([_PKG_CONFIG],
8956
 
[if test -n "$$1"; then
8957
 
    pkg_cv_[]$1="$$1"
8958
 
 elif test -n "$PKG_CONFIG"; then
8959
 
    PKG_CHECK_EXISTS([$3],
8960
 
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
8961
 
                     [pkg_failed=yes])
8962
 
 else
8963
 
    pkg_failed=untried
 
8972
[if test -n "$PKG_CONFIG"; then
 
8973
    if test -n "$$1"; then
 
8974
        pkg_cv_[]$1="$$1"
 
8975
    else
 
8976
        PKG_CHECK_EXISTS([$3],
 
8977
                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
 
8978
                         [pkg_failed=yes])
 
8979
    fi
 
8980
else
 
8981
        pkg_failed=untried
8964
8982
fi[]dnl
8965
8983
])# _PKG_CONFIG
8966
8984
 
9004
9022
if test $pkg_failed = yes; then
9005
9023
        _PKG_SHORT_ERRORS_SUPPORTED
9006
9024
        if test $_pkg_short_errors_supported = yes; then
9007
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
 
9025
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
9008
9026
        else 
9009
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
 
9027
                $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
9010
9028
        fi
9011
9029
        # Put the nasty error message in config.log where it belongs
9012
9030
        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD