← Back to branch summary

~kroq-gar78/ubuntu/precise/gnome-control-center/fix-885947

« back to all changes in this revision

Viewing changes to m4/ltoptions.m4

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya
  • Date: 2011-05-17 10:47:27 UTC
  • mfrom: (0.1.11 experimental) (1.1.45 upstream)
  • Revision ID: james.westby@ubuntu.com-20110517104727-lqel6m8vhfw5jby1
Tags: 1:3.0.1.1-1ubuntu1
* Rebase on Debian, remaining Ubuntu changes:
* debian/control:
  - Build-Depend on hardening-wrapper, dpkg-dev and dh-autoreconf
  - Add dependency on ubuntu-system-service
  - Remove dependency on gnome-icon-theme-symbolic
  - Move dependency on apg, gnome-icon-theme-symbolic and accountsservice to
    be a Recommends: until we get them in main
* debian/rules:
  - Use autoreconf
  - Add binary-post-install rule for gnome-control-center-data
  - Run dh-autoreconf
* debian/gnome-control-center.dirs:
* debian/gnome-control-center.links:
  - Add a link to the control center shell for indicators
* debian/patches/00_disable-nm.patch:
  - Temporary patch to disable building with NetworkManager until we get
    the new one in the archive
* debian/patches/01_git_remove_gettext_calls.patch:
  - Remove calls to AM_GNU_GETTEXT, IT_PROG_INTLTOOL should be enough
* debian/patches/01_git_kill_warning.patch:
  - Kill warning
* debian/patches/50_ubuntu_systemwide_prefs.patch:
  - Ubuntu specific proxy preferences
* debian/patches/51_ubuntu_system_keyboard.patch:
  - Implement the global keyboard spec at https://wiki.ubuntu.com/DefaultKeyboardSettings

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/ltoptions.m4
1
1
# Helper functions for option handling.                    -*- Autoconf -*-
2
2
#
3
 
#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
 
3
#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
 
4
#   Inc.
4
5
#   Written by Gary V. Vaughan, 2004
5
6
#
6
7
# This file is free software; the Free Software Foundation gives
7
8
# unlimited permission to copy and/or distribute it, with or without
8
9
# modifications, as long as this notice is preserved.
9
10
 
10
 
# serial 6 ltoptions.m4
 
11
# serial 7 ltoptions.m4
11
12
 
12
13
# This is to help aclocal find these macros, as it can't see m4_define.
13
14
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
125
126
[enable_win32_dll=yes
126
127
 
127
128
case $host in
128
 
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
 
129
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
129
130
  AC_CHECK_TOOL(AS, as, false)
130
131
  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
131
132
  AC_CHECK_TOOL(OBJDUMP, objdump, false)
133
134
esac
134
135
 
135
136
test -z "$AS" && AS=as
136
 
_LT_DECL([], [AS],      [0], [Assembler program])dnl
 
137
_LT_DECL([], [AS],      [1], [Assembler program])dnl
137
138
 
138
139
test -z "$DLLTOOL" && DLLTOOL=dlltool
139
 
_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
 
140
_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
140
141
 
141
142
test -z "$OBJDUMP" && OBJDUMP=objdump
142
 
_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
 
143
_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
143
144
])# win32-dll
144
145
 
145
146
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],