source: trunk/dports/gnome/gdm/files/patch-configure.ac.diff @ 117869

Last change on this file since 117869 was 117869, checked in by devans@…, 6 years ago

gdm: in configure.ac patch, replace /opt/local with @MP_PREFIX@ and replace with ${prefix} in post-patch.

File size: 2.1 KB
  • configure.ac

    old new  
    499499AC_CHECK_LIB(pam, pam_syslog, [AC_DEFINE(HAVE_PAM_SYSLOG, [], [Define to 1 if you have the pam_syslog function])])
    500500
    501501dnl test whether struct pam_message is const (Linux) or not (Sun)
     502ac_pam_includes="/usr/include"
    502503if test "x$have_pam" = "xyes"; then
    503504   pam_appl_h="$ac_pam_includes/security/pam_appl.h"
    504505   AC_MSG_CHECKING(for const pam_message)
     
    12171218# and /usr/X11 since they often symlink to each other, and configure
    12181219# should use the more stable location (the real directory) if possible.
    12191220#
    1220 if test -x /usr/X11/bin/Xserver; then
     1221if test -x @MP_PREFIX@/bin/Xquartz; then
     1222   X_PATH="@MP_PREFIX@/bin"
     1223   X_SERVER_PATH="@MP_PREFIX@/bin"
     1224   X_SERVER="@MP_PREFIX@/bin/Xquartz"
     1225   X_CONFIG_OPTIONS="-audit 0"
     1226elif test -x /opt/X11/bin/Xquartz; then
     1227   X_PATH="/opt/X11/bin"
     1228   X_SERVER_PATH="/opt/X11/bin"
     1229   X_SERVER="/opt/X11/bin/Xquartz"
     1230   X_CONFIG_OPTIONS="-audit 0"
     1231elif test -x /usr/X11/bin/Xserver; then
    12211232   X_PATH="/usr/X11/bin"
    12221233   X_SERVER_PATH="/usr/X11/bin"
    12231234   X_SERVER="/usr/X11/bin/Xserver"
  • configure.ac

    From c14b16af23529afb7371890e3c686457c365e8be Mon Sep 17 00:00:00 2001
    From: Laurent Bigonville <bigon@bigon.be>
    Date: Mon, 11 Nov 2013 06:36:26 +0000
    Subject: Don't use both AM_GNU_GETTEXT and IT_PROG_INTLTOOL
    
    When using IT_PROG_INTLTOOL using the gettext automake macros isn't
    necessary. To make matters worse, when mixing the marcos both try to
    generate po/Makefile.in.in. Recent versions of intltool detect when
    gettext won and bails when building.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=711818
    ---
    diff --git a/configure.ac b/configure.ac
    index fdb0497..6afa49e 100644
    AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes) 
    5252# i18n stuff
    5353IT_PROG_INTLTOOL([0.40.0])
    5454
    55 AM_GNU_GETTEXT_VERSION([0.17])
    56 AM_GNU_GETTEXT([external])
    57 
    5855GETTEXT_PACKAGE=gdm
    5956AC_SUBST(GETTEXT_PACKAGE)
    6057AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
Note: See TracBrowser for help on using the repository browser.