~ubuntu-branches/ubuntu/oneiric/xfce4-indicator-plugin/oneiric-proposed

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2011-06-26 01:24:54 UTC
  • mfrom: (3.2.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110626012454-u3ra9bypujkz4qgk
Tags: 0.2.1-1ubuntu1
* Merge from Debian unstable, remaining Ubuntu changes:
  - debian/patches:
    + 0004-cherry-pick-vertical-panel-fixes.patch: cherry-pick from upstream
      4e55a3d7292bd4f15b1555530f58e559cb99e965
      2c0cc99c948d1b5e1ff5fb11057a6bb549849a2d
      Fixes vertical panel issue with indicators (LP: #787977)
    + xubuntu_exclude-modules.patch: add a blacklist option. Some modules
      are unneeded/redundant/badly work on Xubuntu (e.g. appmenu), so give
      the possibility to ignore them.
    + series: refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
301
301
 
302
302
    dnl These rules are solely for the distribution goal.  While doing this
303
303
    dnl we only have to keep exactly one list of the available catalogs
304
 
    dnl in configure.in.
 
304
    dnl in configure.ac.
305
305
    for lang in $ALL_LINGUAS; do
306
306
      GMOFILES="$GMOFILES $lang.gmo"
307
307
      POFILES="$POFILES $lang.po"
430
430
dnl
431
431
dnl Now the definitions that aclocal will find
432
432
dnl
433
 
ifdef(glib_configure_in,[],[
 
433
ifdef(glib_configure_ac,[],[
434
434
AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
435
435
AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
436
436
])dnl
9626
9626
AC_SUBST([am__untar])
9627
9627
]) # _AM_PROG_TAR
9628
9628
 
9629
 
dnl $Id: xdt-depends.m4 21591 2006-05-08 09:10:26Z benny $
 
9629
dnl $Id$
9630
9630
dnl
9631
9631
dnl Copyright (c) 2002-2006
9632
9632
dnl         The Xfce development team. All rights reserved.
10056
10056
])
10057
10057
 
10058
10058
 
10059
 
dnl $Id: xdt-features.m4 22990 2006-09-02 11:33:28Z benny $
 
10059
dnl $Id$
10060
10060
dnl
10061
10061
dnl Copyright (c) 2002-2006
10062
10062
dnl         The Xfce development team. All rights reserved.
10089
10089
AC_PREREQ([2.53])
10090
10090
 
10091
10091
 
10092
 
 
10093
 
dnl XDT_FEATURE_DEBUG()
 
10092
dnl XDT_SUPPORTED_FLAGS(VAR, FLAGS)
 
10093
dnl
 
10094
dnl For each token in FLAGS, checks to be sure the compiler supports
 
10095
dnl the flag, and if so, adds each one to VAR.
 
10096
dnl
 
10097
AC_DEFUN([XDT_SUPPORTED_FLAGS],
 
10098
[
 
10099
  for flag in $2; do
 
10100
    AC_MSG_CHECKING([if $CC supports $flag])
 
10101
    saved_CFLAGS="$CFLAGS"
 
10102
    CFLAGS="$CFLAGS $flag"
 
10103
    AC_COMPILE_IFELSE([ ], [flag_supported=yes], [flag_supported=no])
 
10104
    CFLAGS="$saved_CFLAGS"
 
10105
    AC_MSG_RESULT([$flag_supported])
 
10106
 
 
10107
    if test "x$flag_supported" = "xyes"; then
 
10108
      $1="$$1 $flag"
 
10109
    fi
 
10110
  done
 
10111
])
 
10112
 
 
10113
 
 
10114
 
 
10115
dnl XDT_FEATURE_DEBUG(default_level=minimum)
10094
10116
dnl
10095
10117
AC_DEFUN([XDT_FEATURE_DEBUG],
10096
10118
[
 
10119
  dnl weird indentation to keep output indentation correct
10097
10120
  AC_ARG_ENABLE([debug],
10098
 
AC_HELP_STRING([--enable-debug[=yes|no|full]], [Build with debugging support])
10099
 
AC_HELP_STRING([--disable-debug], [Include no debugging support [default]]),
10100
 
  [], [enable_debug=no])
 
10121
                AC_HELP_STRING([--enable-debug@<:@=no|minimum|yes|full@:>@],
 
10122
                               [Build with debugging support @<:@default=m4_default([$1], [minimum])@:>@])
 
10123
AC_HELP_STRING([--disable-debug], [Include no debugging support]),
 
10124
                [enable_debug=$enableval], [enable_debug=m4_default([$1], [minimum])])
10101
10125
 
10102
10126
  AC_MSG_CHECKING([whether to build with debugging support])
10103
 
  if test x"$enable_debug" != x"no"; then
 
10127
  if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
10104
10128
    AC_DEFINE([DEBUG], [1], [Define for debugging support])
10105
10129
 
10106
 
    if test x"$GCC" = x"yes"; then
10107
 
      xdt_cv_additional_CFLAGS="-Wall"
10108
 
    fi
10109
 
    xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -DXFCE_DISABLE_DEPRECATED"
 
10130
    xdt_cv_additional_CFLAGS="-DXFCE_DISABLE_DEPRECATED \
 
10131
                              -Wall -Wextra \
 
10132
                              -Wno-missing-field-initializers \
 
10133
                              -Wno-unused-parameter -Wold-style-definition \
 
10134
                              -Wdeclaration-after-statement \
 
10135
                              -Wmissing-declarations -Wredundant-decls \
 
10136
                              -Wmissing-noreturn -Wshadow -Wpointer-arith \
 
10137
                              -Wcast-align -Wformat-security \
 
10138
                              -Winit-self -Wmissing-include-dirs -Wundef \
 
10139
                              -Wmissing-format-attribute -Wnested-externs \
 
10140
                              -fstack-protector"
 
10141
    CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
10110
10142
    
10111
10143
    if test x"$enable_debug" = x"full"; then
10112
10144
      AC_DEFINE([DEBUG_TRACE], [1], [Define for tracing support])
10113
 
      if test x"$GCC" = x"yes"; then
10114
 
        xdt_cv_additional_CFLAGS="-g3 -Werror $xdt_cv_additional_CFLAGS"
10115
 
      fi
 
10145
      xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g3 -Werror"
 
10146
      CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG"
10116
10147
      AC_MSG_RESULT([full])
10117
10148
    else
10118
 
      if test x"$GCC" = x"yes"; then
10119
 
        xdt_cv_additional_CFLAGS="-g $xdt_cv_additional_CFLAGS"
10120
 
      fi
 
10149
      xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g"
10121
10150
      AC_MSG_RESULT([yes])
10122
10151
    fi
10123
10152
 
10124
 
    CFLAGS="$CFLAGS $xdt_cv_additional_CFLAGS"
10125
 
    CXXFLAGS="$CXXFLAGS $xdt_cv_additional_CFLAGS"
 
10153
    XDT_SUPPORTED_FLAGS([supported_CFLAGS], [$xdt_cv_additional_CFLAGS])
 
10154
 
 
10155
    ifelse([$CXX], , , [
 
10156
      dnl FIXME: should test on c++ compiler, but the following line causes
 
10157
      dnl        autoconf errors for projects that don't check for a
 
10158
      dnl        c++ compiler at all.
 
10159
      dnl AC_LANG_PUSH([C++])
 
10160
      dnl XDT_SUPPORTED_FLAGS([supported_CXXFLAGS], [$xdt_cv_additional_CFLAGS])
 
10161
      dnl AC_LANG_POP()
 
10162
      dnl        instead, just use supported_CFLAGS...
 
10163
      supported_CXXFLAGS="$supported_CFLAGS"
 
10164
    ])
 
10165
 
 
10166
    CFLAGS="$CFLAGS $supported_CFLAGS"
 
10167
    CXXFLAGS="$CXXFLAGS $supported_CXXFLAGS"
10126
10168
  else
10127
 
    AC_MSG_RESULT([no])
10128
 
  fi
10129
 
])
10130
 
 
10131
 
 
 
10169
    CPPFLAGS="$CPPFLAGS -DNDEBUG"
 
10170
 
 
10171
    if test x"$enable_debug" = x"no"; then
 
10172
      CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
 
10173
      AC_MSG_RESULT([no])
 
10174
    else
 
10175
      AC_MSG_RESULT([minimum])
 
10176
    fi
 
10177
  fi
 
10178
])
 
10179
 
 
10180
 
 
10181
dnl XDT_FEATURE_VISIBILITY()
 
10182
dnl
 
10183
dnl Checks to see if the compiler supports the 'visibility' attribute
 
10184
dnl If so, adds -DHAVE_GNUC_VISIBILTY to CPPFLAGS.  Also sets the
 
10185
dnl automake conditional HAVE_GNUC_VISIBILITY.
 
10186
dnl
 
10187
AC_DEFUN([XDT_FEATURE_VISIBILITY],
 
10188
[
 
10189
  AC_ARG_ENABLE([visibility],
 
10190
                AC_HELP_STRING([--disable-visibility],
 
10191
                               [Don't use ELF visibility attributes]),
 
10192
                [enable_visibility=$enableval], [enable_visibility=yes])
 
10193
  have_gnuc_visibility=no
 
10194
  if test "x$enable_visibility" != "xno"; then
 
10195
    XDT_SUPPORTED_FLAGS([xdt_vis_test_cflags], [-Wall -Werror -Wno-unused-parameter])
 
10196
    saved_CFLAGS="$CFLAGS"
 
10197
    CFLAGS="$CFLAGS $xdt_vis_test_cflags"
 
10198
    AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute])
 
10199
    AC_COMPILE_IFELSE(AC_LANG_SOURCE(
 
10200
    [
 
10201
      void test_default (void);
 
10202
      void test_hidden (void);
 
10203
 
 
10204
      void __attribute__ ((visibility("default"))) test_default (void) {}
 
10205
      void __attribute__ ((visibility("hidden"))) test_hidden (void) {}
 
10206
 
 
10207
      int main (int argc, char **argv) {
 
10208
        test_default ();
 
10209
        test_hidden ();
 
10210
        return 0;
 
10211
      }
 
10212
    ]),
 
10213
    [
 
10214
      have_gnuc_visibility=yes
 
10215
      AC_MSG_RESULT([yes])
 
10216
    ],
 
10217
    [
 
10218
      AC_MSG_RESULT([no])
 
10219
    ])
 
10220
    CFLAGS="$saved_CFLAGS"
 
10221
  fi
 
10222
 
 
10223
  if test "x$have_gnuc_visibility" = "xyes"; then
 
10224
    CPPFLAGS="$CPPFLAGS -DHAVE_GNUC_VISIBILITY"
 
10225
    XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-fvisibility=hidden])
 
10226
    CFLAGS="$CFLAGS $xdt_vis_hidden_cflags"
 
10227
  fi
 
10228
 
 
10229
  AM_CONDITIONAL([HAVE_GNUC_VISIBILITY], [test "x$have_gnuc_visibility" = "xyes"])
 
10230
])
 
10231
 
 
10232
dnl XDT_FEATURE_LINKER_OPTS
 
10233
dnl
 
10234
dnl Checks for and enables any special linker optimizations.
 
10235
dnl
 
10236
AC_DEFUN([XDT_FEATURE_LINKER_OPTS],
 
10237
[
 
10238
  AC_ARG_ENABLE([linker-opts],
 
10239
                AC_HELP_STRING([--disable-linker-opts],
 
10240
                               [Disable linker optimizations]),
 
10241
                [enable_linker_opts=$enableval], [enable_linker_opts=yes])
 
10242
 
 
10243
  if test "x$enable_linker_opts" != "xno"; then
 
10244
    AC_MSG_CHECKING([whether $LD accepts --as-needed])
 
10245
    case `$LD --as-needed -v 2>&1 </dev/null` in
 
10246
    *GNU* | *'with BFD'*)
 
10247
      LDFLAGS="$LDFLAGS -Wl,--as-needed"
 
10248
      AC_MSG_RESULT([yes])
 
10249
      ;;
 
10250
    *)
 
10251
      AC_MSG_RESULT([no])
 
10252
      ;;
 
10253
    esac
 
10254
    AC_MSG_CHECKING([whether $LD accepts -O1])
 
10255
    case `$LD -O1 -v 2>&1 </dev/null` in
 
10256
    *GNU* | *'with BFD'*)
 
10257
      LDFLAGS="$LDFLAGS -Wl,-O1"
 
10258
      AC_MSG_RESULT([yes])
 
10259
      ;;
 
10260
    *)
 
10261
      AC_MSG_RESULT([no])
 
10262
      ;;
 
10263
    esac
 
10264
  fi
 
10265
])
10132
10266
 
10133
10267
dnl BM_DEBUG_SUPPORT()
10134
10268
dnl
10208
10342
  fi
10209
10343
])
10210
10344
 
10211
 
dnl $Id: xdt-i18n.m4 24486 2007-01-15 17:47:49Z benny $
 
10345
dnl $Id$
10212
10346
dnl
10213
10347
dnl Copyright (c) 2002-2006
10214
10348
dnl         The Xfce development team. All rights reserved.