← Back to branch summary

~ubuntu-branches/ubuntu/vivid/exim4/vivid

« back to all changes in this revision

Viewing changes to scripts/Configure-Makefile

  • Committer: Package Import Robot
  • Author(s): Corey Bryant
  • Date: 2014-08-04 11:48:39 UTC
  • mfrom: (56.1.2 utopic)
  • Revision ID: package-import@ubuntu.com-20140804114839-xoulpcx9nxi5m72u
Tags: 4.84~RC1-3ubuntu1
https://launchpad.net/bugs/1351470
* Merge from Debian unstable (LP: #1351470). Remaining changes:
  - Show Ubuntu distribution on smtp:
    + debian/patches/fix_smtp_banner.patch: updated SMTP banner
      with Ubuntu distribution
    + debian/control: added lsb-release build dependency
  - Don't provide default-mta; in Ubuntu, we want postfix to be the
    default.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/Configure-Makefile
142
142
        fi
143
143
        if [ ".$need_this" != "." ]; then
144
144
          tls_include=`pkg-config --cflags $pc_value`
 
145
          if [ $? -ne 0 ]; then
 
146
            echo >&2 "*** Missing pkg-config for package $pc_value (for Exim $var build option)"
 
147
            exit 1
 
148
          fi
145
149
          tls_libs=`pkg-config --libs $pc_value`
146
150
          echo "TLS_INCLUDE=$tls_include"
147
151
          echo "TLS_LIBS=$tls_libs"
161
165
        else
162
166
          # main binary
163
167
          cflags=`pkg-config --cflags $pc_value`
 
168
          if [ $? -ne 0 ]; then
 
169
            echo >&2 "*** Missing pkg-config for package $pc_value (for Exim $var build option)"
 
170
            exit 1
 
171
          fi
164
172
          libs=`pkg-config --libs $pc_value`
165
173
          if [ "$var" != "${var#LOOKUP_}" ]; then
166
174
            echo "LOOKUP_INCLUDE += $cflags"
178
186
        case $PCRE_CONFIG in
179
187
          yes|YES|y|Y)
180
188
            cflags=`pcre-config --cflags`
 
189
            if [ $? -ne 0 ]; then
 
190
              echo >&2 "*** Missing pcre-config for regular expression support"
 
191
              exit 1
 
192
            fi
181
193
            libs=`pcre-config --libs`
182
194
            if [ ".$cflags" != "." ]; then
183
195
              echo "INCLUDE += $cflags"
196
208
  echo "# End of pkg-config fixups"
197
209
  echo
198
210
  ) >> $mft
 
211
  subexit=$?
 
212
  if [ $subexit -ne 0 ]; then
 
213
    exit $subexit
 
214
  fi
199
215
fi
200
216
rm -f $mftt
201
217