X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=configure.ac;h=3f1922d0bf66abdbcad03dfd9981ca5293a4b860;hb=f87dd2152a6941dfa7f3ddaf599bc30f58562a98;hp=1885674e396d31cc625d34d029835e15b279dc8d;hpb=dd787c19c4f011cc3adb422ef856f2c58d989640;p=git.git diff --git a/configure.ac b/configure.ac index 1885674e3..3f1922d0b 100644 --- a/configure.ac +++ b/configure.ac @@ -342,9 +342,8 @@ GIT_STASH_FLAGS($OPENSSLDIR) AC_CHECK_LIB([crypto], [SHA1_Init], [NEEDS_SSL_WITH_CRYPTO=], [AC_CHECK_LIB([ssl], [SHA1_Init], - [NEEDS_SSL_WITH_CRYPTO=YesPlease - NEEDS_SSL_WITH_CRYPTO=], - [NO_OPENSSL=YesPlease])]) + [NEEDS_SSL_WITH_CRYPTO=YesPlease], + [NEEDS_SSL_WITH_CRYPTO= NO_OPENSSL=YesPlease])]) GIT_UNSTASH_FLAGS($OPENSSLDIR) @@ -479,12 +478,18 @@ test -n "$NEEDS_SOCKET" && LIBS="$LIBS -lsocket" # Define NEEDS_RESOLV if linking with -lnsl and/or -lsocket is not enough. # Notably on Solaris hstrerror resides in libresolv and on Solaris 7 # inet_ntop and inet_pton additionally reside there. -AC_CHECK_LIB([resolv], [hstrerror], +AC_CHECK_LIB([c], [hstrerror], [NEEDS_RESOLV=], [NEEDS_RESOLV=YesPlease]) AC_SUBST(NEEDS_RESOLV) test -n "$NEEDS_RESOLV" && LIBS="$LIBS -lresolv" +AC_CHECK_LIB([c], [basename], +[NEEDS_LIBGEN=], +[NEEDS_LIBGEN=YesPlease]) +AC_SUBST(NEEDS_LIBGEN) +test -n "$NEEDS_LIBGEN" && LIBS="$LIBS -lgen" + ## Checks for header files. AC_MSG_NOTICE([CHECKS for header files]) #