X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.in;h=e43fca106eb5531a35d4f05f6cc34d0048e12a7c;hb=8b0b9f913c2f0987ba8337178d3a6b3dcae906e6;hp=c5a90506c5115d04f7b98c293b5efa836295c506;hpb=faa066cb24d3308ab5d2c40ed145ecb3940461bf;p=mmh diff --git a/configure.in b/configure.in index c5a9050..e43fca1 100644 --- a/configure.in +++ b/configure.in @@ -70,7 +70,8 @@ AC_ARG_ENABLE(masquerade, masquerade="draft_from mmailid username_extension" else masquerade="$enable_masquerade" - fi]) + fi], + masquerade="draft_from mmailid username_extension") AC_SUBST(masquerade)dnl dnl Do you want mhe support? @@ -520,12 +521,9 @@ AC_CHECK_FUNCS(waitpid wait3 sigaction sigprocmask sigblock sigsetmask \ getutent nl_langinfo mbtowc wcwidth) dnl solaris has these in the nsl library -AC_SEARCH_LIBS(gethostbyname, nsl, - [AC_DEFINE(HAVE_GETHOSTBYNAME,1, - [Define to 1 if you have the `gethostbyname' function.])]) -AC_SEARCH_LIBS(sethostent, nsl, - [AC_DEFINE(HAVE_SETHOSTENT,1, - [Define to 1 if you have the `sethostent' function.])]) +AC_SEARCH_LIBS(getaddrinfo, nsl, + [AC_DEFINE(HAVE_GETADDRINFO,1, + [Define to 1 if you have the `getaddrinfo' function.])]) dnl sigsetjmp may be a macro AC_MSG_CHECKING(for sigsetjmp) @@ -949,6 +947,8 @@ if test "$nmh_cv_union_wait" = yes; then fi AC_MSG_RESULT($nmh_cv_union_wait) +CHECK_TYPE_STRUCT_DIRENT_D_TYPE() + dnl ------------- dnl CHECK SIGNALS dnl ------------- @@ -1057,11 +1057,17 @@ AC_CONFIG_FILES(Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefile \ AC_CONFIG_COMMANDS([stamp],[test -z "$CONFIG_HEADERS" || echo > stamp-h]) AC_OUTPUT -dnl Umm, what's the point of these assignments?? -- -eval "nmhbin=${bindir}"; eval "nmhbin2=${nmhbin}" -eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}" -eval "nmhlib=${libdir}"; eval "nmhlib2=${nmhlib}" -eval "nmhman=${mandir}" +dnl These odd looking assignments are done to expand out unexpanded +dnl variables in bindir et al (for instance mandir is '${datarootdir}/man', +dnl but expanding that gives '${prefix}/share/man', so we need to expand +dnl again to get the final answer. +dnl We only use the expanded versions to print the install paths in +dnl the final summary and should use them nowhere else (see the autoconf +dnl docs for the rationale for bindir etc being unexpanded). +eval "nmhbin=${bindir}"; eval "nmhbin=${nmhbin}" +eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf=${nmhsysconf}" +eval "nmhlib=${libdir}"; eval "nmhlib=${nmhlib}" +eval "nmhman=${mandir}"; eval "nmhman=${nmhman}" pop_kinds=no if test x"$enable_pop" = x"yes"; then @@ -1088,9 +1094,9 @@ compiler flags : ${CFLAGS} linker flags : ${LDFLAGS} definitions : ${OURDEFS} source code location : ${srcdir} -binary install path : ${nmhbin2} -libary install path : ${nmhlib2} -config files install path : ${nmhsysconf2} +binary install path : ${nmhbin} +library install path : ${nmhlib} +config files install path : ${nmhsysconf} man page install path : ${nmhman} backup prefix : ${backup_prefix} transport system : ${MTS}