diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 55 |
1 files changed, 23 insertions, 32 deletions
diff --git a/configure.ac b/configure.ac index b5fc7ace0..51be4534b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.187 2004/01/23 11:03:10 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.188 2004/01/24 02:35:16 tim Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -67,11 +67,9 @@ AC_ARG_WITH(rpath, | |||
67 | # Check for some target-specific stuff | 67 | # Check for some target-specific stuff |
68 | case "$host" in | 68 | case "$host" in |
69 | *-*-aix*) | 69 | *-*-aix*) |
70 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | ||
71 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | ||
72 | AC_MSG_CHECKING([how to specify blibpath for linker ($LD)]) | 70 | AC_MSG_CHECKING([how to specify blibpath for linker ($LD)]) |
73 | if (test -z "$blibpath"); then | 71 | if (test -z "$blibpath"); then |
74 | blibpath="/usr/lib:/lib:/usr/local/lib" | 72 | blibpath="/usr/lib:/lib" |
75 | fi | 73 | fi |
76 | saved_LDFLAGS="$LDFLAGS" | 74 | saved_LDFLAGS="$LDFLAGS" |
77 | for tryflags in -blibpath: -Wl,-blibpath: -Wl,-rpath, ;do | 75 | for tryflags in -blibpath: -Wl,-blibpath: -Wl,-rpath, ;do |
@@ -198,8 +196,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | |||
198 | AC_CHECK_LIB(xnet, t_error, ,AC_MSG_ERROR([*** -lxnet needed on HP-UX - check config.log ***])) | 196 | AC_CHECK_LIB(xnet, t_error, ,AC_MSG_ERROR([*** -lxnet needed on HP-UX - check config.log ***])) |
199 | ;; | 197 | ;; |
200 | *-*-irix5*) | 198 | *-*-irix5*) |
201 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | ||
202 | LDFLAGS="$LDFLAGS" | ||
203 | PATH="$PATH:/usr/etc" | 199 | PATH="$PATH:/usr/etc" |
204 | AC_DEFINE(BROKEN_INET_NTOA) | 200 | AC_DEFINE(BROKEN_INET_NTOA) |
205 | AC_DEFINE(SETEUID_BREAKS_SETUID) | 201 | AC_DEFINE(SETEUID_BREAKS_SETUID) |
@@ -209,8 +205,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | |||
209 | AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") | 205 | AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") |
210 | ;; | 206 | ;; |
211 | *-*-irix6*) | 207 | *-*-irix6*) |
212 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | ||
213 | LDFLAGS="$LDFLAGS" | ||
214 | PATH="$PATH:/usr/etc" | 208 | PATH="$PATH:/usr/etc" |
215 | AC_DEFINE(WITH_IRIX_ARRAY) | 209 | AC_DEFINE(WITH_IRIX_ARRAY) |
216 | AC_DEFINE(WITH_IRIX_PROJECT) | 210 | AC_DEFINE(WITH_IRIX_PROJECT) |
@@ -265,17 +259,8 @@ mips-sony-bsd|mips-sony-newsos4) | |||
265 | AC_DEFINE(BROKEN_REALPATH) | 259 | AC_DEFINE(BROKEN_REALPATH) |
266 | AC_DEFINE(USE_PIPES) | 260 | AC_DEFINE(USE_PIPES) |
267 | AC_DEFINE(BROKEN_SAVED_UIDS) | 261 | AC_DEFINE(BROKEN_SAVED_UIDS) |
268 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | ||
269 | CFLAGS="$CFLAGS" | ||
270 | ;; | 262 | ;; |
271 | *-*-solaris*) | 263 | *-*-solaris*) |
272 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | ||
273 | if test "x$withval" = "xno" ; then | ||
274 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | ||
275 | else | ||
276 | LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib" | ||
277 | need_dash_r=1 | ||
278 | fi | ||
279 | AC_DEFINE(PAM_SUN_CODEBASE) | 264 | AC_DEFINE(PAM_SUN_CODEBASE) |
280 | AC_DEFINE(LOGIN_NEEDS_UTMPX) | 265 | AC_DEFINE(LOGIN_NEEDS_UTMPX) |
281 | AC_DEFINE(LOGIN_NEEDS_TERM) | 266 | AC_DEFINE(LOGIN_NEEDS_TERM) |
@@ -306,8 +291,6 @@ mips-sony-bsd|mips-sony-newsos4) | |||
306 | AC_DEFINE(USE_PIPES) | 291 | AC_DEFINE(USE_PIPES) |
307 | ;; | 292 | ;; |
308 | *-ncr-sysv*) | 293 | *-ncr-sysv*) |
309 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | ||
310 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | ||
311 | LIBS="$LIBS -lc89" | 294 | LIBS="$LIBS -lc89" |
312 | AC_DEFINE(USE_PIPES) | 295 | AC_DEFINE(USE_PIPES) |
313 | AC_DEFINE(SSHD_ACQUIRES_CTTY) | 296 | AC_DEFINE(SSHD_ACQUIRES_CTTY) |
@@ -316,9 +299,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
316 | AC_DEFINE(BROKEN_SETREGID) | 299 | AC_DEFINE(BROKEN_SETREGID) |
317 | ;; | 300 | ;; |
318 | *-sni-sysv*) | 301 | *-sni-sysv*) |
319 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | ||
320 | # /usr/ucblib MUST NOT be searched on ReliantUNIX | 302 | # /usr/ucblib MUST NOT be searched on ReliantUNIX |
321 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | ||
322 | AC_CHECK_LIB(dl, dlsym, ,) | 303 | AC_CHECK_LIB(dl, dlsym, ,) |
323 | IPADDR_IN_DISPLAY=yes | 304 | IPADDR_IN_DISPLAY=yes |
324 | AC_DEFINE(USE_PIPES) | 305 | AC_DEFINE(USE_PIPES) |
@@ -333,28 +314,21 @@ mips-sony-bsd|mips-sony-newsos4) | |||
333 | # otherwise you will find lots of "SIOCGPGRP errno 22" on syslog | 314 | # otherwise you will find lots of "SIOCGPGRP errno 22" on syslog |
334 | ;; | 315 | ;; |
335 | *-*-sysv4.2*) | 316 | *-*-sysv4.2*) |
336 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | ||
337 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | ||
338 | AC_DEFINE(USE_PIPES) | 317 | AC_DEFINE(USE_PIPES) |
339 | AC_DEFINE(SETEUID_BREAKS_SETUID) | 318 | AC_DEFINE(SETEUID_BREAKS_SETUID) |
340 | AC_DEFINE(BROKEN_SETREUID) | 319 | AC_DEFINE(BROKEN_SETREUID) |
341 | AC_DEFINE(BROKEN_SETREGID) | 320 | AC_DEFINE(BROKEN_SETREGID) |
342 | ;; | 321 | ;; |
343 | *-*-sysv5*) | 322 | *-*-sysv5*) |
344 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | ||
345 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | ||
346 | AC_DEFINE(USE_PIPES) | 323 | AC_DEFINE(USE_PIPES) |
347 | AC_DEFINE(SETEUID_BREAKS_SETUID) | 324 | AC_DEFINE(SETEUID_BREAKS_SETUID) |
348 | AC_DEFINE(BROKEN_SETREUID) | 325 | AC_DEFINE(BROKEN_SETREUID) |
349 | AC_DEFINE(BROKEN_SETREGID) | 326 | AC_DEFINE(BROKEN_SETREGID) |
350 | ;; | 327 | ;; |
351 | *-*-sysv*) | 328 | *-*-sysv*) |
352 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | ||
353 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | ||
354 | ;; | 329 | ;; |
355 | *-*-sco3.2v4*) | 330 | *-*-sco3.2v4*) |
356 | CPPFLAGS="$CPPFLAGS -Dftruncate=chsize -I/usr/local/include" | 331 | CPPFLAGS="$CPPFLAGS -Dftruncate=chsize" |
357 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | ||
358 | LIBS="$LIBS -los -lprot -lx -ltinfo -lm" | 332 | LIBS="$LIBS -los -lprot -lx -ltinfo -lm" |
359 | RANLIB=true | 333 | RANLIB=true |
360 | no_dev_ptmx=1 | 334 | no_dev_ptmx=1 |
@@ -372,8 +346,6 @@ mips-sony-bsd|mips-sony-newsos4) | |||
372 | if test -z "$GCC"; then | 346 | if test -z "$GCC"; then |
373 | CFLAGS="$CFLAGS -belf" | 347 | CFLAGS="$CFLAGS -belf" |
374 | fi | 348 | fi |
375 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | ||
376 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | ||
377 | LIBS="$LIBS -lprot -lx -ltinfo -lm" | 349 | LIBS="$LIBS -lprot -lx -ltinfo -lm" |
378 | no_dev_ptmx=1 | 350 | no_dev_ptmx=1 |
379 | AC_DEFINE(USE_PIPES) | 351 | AC_DEFINE(USE_PIPES) |
@@ -587,7 +559,26 @@ AC_ARG_WITH(zlib, | |||
587 | ] | 559 | ] |
588 | ) | 560 | ) |
589 | 561 | ||
590 | AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first or check config.log ***])) | 562 | AC_CHECK_LIB(z, deflate, , |
563 | [ | ||
564 | saved_CPPFLAGS="$CPPFLAGS" | ||
565 | saved_LDFLAGS="$LDFLAGS" | ||
566 | save_LIBS="$LIBS" | ||
567 | dnl Check default zlib install dir | ||
568 | if test -n "${need_dash_r}"; then | ||
569 | LDFLAGS="-L/usr/local/lib -R/usr/local/lib ${saved_LDFLAGS}" | ||
570 | else | ||
571 | LDFLAGS="-L/usr/local/lib ${saved_LDFLAGS}" | ||
572 | fi | ||
573 | CPPFLAGS="-I/usr/local/include ${saved_CPPFLAGS}" | ||
574 | LIBS="$LIBS -lz" | ||
575 | AC_TRY_LINK_FUNC(deflate, AC_DEFINE(HAVE_LIBZ), | ||
576 | [ | ||
577 | AC_MSG_ERROR([*** zlib missing - please install first or check config.log ***]) | ||
578 | ] | ||
579 | ) | ||
580 | ] | ||
581 | ) | ||
591 | AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***])) | 582 | AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***])) |
592 | AC_MSG_CHECKING(for zlib 1.1.4 or greater) | 583 | AC_MSG_CHECKING(for zlib 1.1.4 or greater) |
593 | AC_TRY_RUN([ | 584 | AC_TRY_RUN([ |