~ubuntu-branches/ubuntu/trusty/orbit2/trusty

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2008-01-31 23:28:11 UTC
  • mfrom: (1.2.14 upstream)
  • Revision ID: james.westby@ubuntu.com-20080131232811-20kymhisalknudcj
Tags: 1:2.14.12-0ubuntu1
* New upstream version:
  - bug fixes
    + Fix the build with glib 2.15

Show diffs side-by-side

added added

removed removed

Lines of Context:
39
39
                   [use gtk-doc to build documentation [[default=no]]]),,
40
40
    [enable_gtk_doc=no])
41
41
 
 
42
  have_gtk_doc=no
42
43
  if test x$enable_gtk_doc = xyes; then
43
 
    ifelse([$1],[],
44
 
      [PKG_CHECK_EXISTS([gtk-doc],,
45
 
                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
46
 
      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
47
 
                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
 
44
    if test -z "$PKG_CONFIG"; then
 
45
      AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
 
46
    fi
 
47
    if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
 
48
      have_gtk_doc=yes
 
49
    fi
 
50
 
 
51
  dnl do we want to do a version check?
 
52
ifelse([$1],[],,
 
53
    [gtk_doc_min_version=$1
 
54
    if test "$have_gtk_doc" = yes; then
 
55
      AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
 
56
      if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
 
57
        AC_MSG_RESULT([yes])
 
58
      else
 
59
        AC_MSG_RESULT([no])
 
60
        have_gtk_doc=no
 
61
      fi
 
62
    fi
 
63
])
 
64
    if test "$have_gtk_doc" != yes; then
 
65
      enable_gtk_doc=no
 
66
    fi
48
67
  fi
49
68
 
50
 
  AC_MSG_CHECKING([whether to build gtk-doc documentation])
51
 
  AC_MSG_RESULT($enable_gtk_doc)
52
 
 
53
 
  AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
54
 
 
55
69
  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
56
70
  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
57
71
])
58
72
 
59
73
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
60
74
 
61
 
# serial 51 AC_PROG_LIBTOOL
 
75
# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
62
76
 
63
77
 
64
78
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
610
624
      esac
611
625
      ;;
612
626
    *64-bit*)
613
 
      libsuff=64
614
627
      case $host in
615
628
        x86_64-*kfreebsd*-gnu)
616
629
          LD="${LD-ld} -m elf_x86_64_fbsd"
1669
1682
  # Some rework will be needed to allow for fast_install
1670
1683
  # before this can be enabled.
1671
1684
  hardcode_into_libs=yes
1672
 
  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
1673
 
  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
1674
1685
 
1675
1686
  # Append ld.so.conf contents to the search path
1676
1687
  if test -f /etc/ld.so.conf; then
1677
1688
    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' ' '`
1678
 
    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
 
1689
    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
1679
1690
  fi
1680
1691
 
1681
1692
  # We used to test for /lib/ld.so.1 and disable shared libraries on
1687
1698
  dynamic_linker='GNU/Linux ld.so'
1688
1699
  ;;
1689
1700
 
 
1701
netbsdelf*-gnu)
 
1702
  version_type=linux
 
1703
  need_lib_prefix=no
 
1704
  need_version=no
 
1705
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 
1706
  soname_spec='${libname}${release}${shared_ext}$major'
 
1707
  shlibpath_var=LD_LIBRARY_PATH
 
1708
  shlibpath_overrides_runpath=no
 
1709
  hardcode_into_libs=yes
 
1710
  dynamic_linker='NetBSD ld.elf_so'
 
1711
  ;;
 
1712
 
1690
1713
netbsd*)
1691
1714
  version_type=sunos
1692
1715
  need_lib_prefix=no
2461
2484
  lt_cv_deplibs_check_method=pass_all
2462
2485
  ;;
2463
2486
 
2464
 
netbsd*)
 
2487
netbsd* | netbsdelf*-gnu)
2465
2488
  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
2466
2489
    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
2467
2490
  else
3495
3518
        ;;
3496
3519
    esac
3497
3520
    ;;
3498
 
  netbsd*)
 
3521
  netbsd* | netbsdelf*-gnu)
3499
3522
    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
3500
3523
      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
3501
3524
      wlarc=
5176
5199
            ;;
5177
5200
        esac
5178
5201
        ;;
5179
 
      netbsd*)
 
5202
      netbsd* | netbsdelf*-gnu)
5180
5203
        ;;
5181
5204
      osf3* | osf4* | osf5*)
5182
5205
        case $cc_basename in
5551
5574
  cygwin* | mingw*)
5552
5575
    _LT_AC_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'
5553
5576
  ;;
 
5577
  linux* | k*bsd*-gnu)
 
5578
    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
 
5579
  ;;
5554
5580
  *)
5555
5581
    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
5556
5582
  ;;
5756
5782
  $echo "local: *; };" >> $output_objdir/$libname.ver~
5757
5783
          $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
5758
5784
        fi
 
5785
        _LT_AC_TAGVAR(link_all_deplibs, $1)=no
5759
5786
      else
5760
5787
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
5761
5788
      fi
5762
5789
      ;;
5763
5790
 
5764
 
    netbsd*)
 
5791
    netbsd* | netbsdelf*-gnu)
5765
5792
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
5766
5793
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
5767
5794
        wlarc=
6193
6220
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
6194
6221
      ;;
6195
6222
 
6196
 
    netbsd*)
 
6223
    netbsd* | netbsdelf*-gnu)
6197
6224
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
6198
6225
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
6199
6226
      else