emacs: configure.in comparison

comparison configure.in @ 107407:975563054751

Replace some cpp with autoconf. * configure.in (--with-mmdf, --with-mail-unlink): New options, off by default. (--with-mailhost): New option to set default POP host. (LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL) (LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB): New variables, substituted in Makefiles. (try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF. (LIBGIF): Use AC_SUBST rather than AC_DEFINE. (HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO) (HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES) (HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs. * lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB) (HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp. (BASE_CFLAGS): Remove (identical to CPP_CFLAGS). * src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF) (LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.

author	Glenn Morris <rgm@gnu.org>
date	Wed, 17 Mar 2010 22:49:31 -0700
parents	5a46c741f65e
children	eba6eb70e988

comparison

equal deleted inserted replaced

-:1de48da1419b
+:975563054751
 fi
 AC_DEFINE(KERBEROS5, 1, [Define to use Kerberos 5 instead of Kerberos 4.])
 fi
 OPTION_DEFAULT_OFF([hesiod],[support Hesiod to get the POP server host])
+dnl FIXME hesiod support may not be present, so it seems like an error
+dnl to define, or at least use, this unconditionally.
 if test "$with_hesiod" != no; then
 AC_DEFINE(HESIOD, 1, [Define to support using a Hesiod database to find the POP server.])
 fi
+OPTION_DEFAULT_OFF([mmdf],[support MMDF mailboxes])
+if test "$with_mmdf" != no; then
+AC_DEFINE(MAIL_USE_MMDF, 1, [Define to support MMDF mailboxes in movemail.])
+fi
+OPTION_DEFAULT_OFF([mail-unlink],[unlink, rather than empty, mail spool after reading])
+if test "$with_mail_unlink" != no; then
+AC_DEFINE(MAIL_UNLINK_SPOOL, 1, [Define to unlink, rather than empty, mail spool after reading.])
+fi
+AC_ARG_WITH([mailhost],[AS_HELP_STRING([--with-mailhost=HOSTNAME],
+[string giving default POP mail host])],
+AC_DEFINE_UNQUOTED(MAILHOST, ["$withval"], [String giving fallback POP mail host.]))
 OPTION_DEFAULT_ON([sound],[don't compile with sound support])
 OPTION_DEFAULT_ON([sync-input],[process async input synchronously])
 if test "$with_sync_input" = yes; then
 AC_SUBST(M17N_FLT_CFLAGS)
 AC_SUBST(M17N_FLT_LIBS)
 ### Use -lXpm if available, unless `--with-xpm=no'.
 HAVE_XPM=no
+LIBXPM=
 if test "${HAVE_X11}" = "yes"; then
 if test "${with_xpm}" != "no"; then
 AC_CHECK_HEADER(X11/xpm.h,
 [AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, HAVE_XPM=yes, , -lX11)])
 if test "${HAVE_XPM}" = "yes"; then
 fi
 fi
 if test "${HAVE_XPM}" = "yes"; then
 AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm libary (-lXpm).])
-fi
+LIBXPM=-lXpm
 fi
+fi
+AC_SUBST(LIBXPM)
 ### Use -ljpeg if available, unless `--with-jpeg=no'.
 HAVE_JPEG=no
+LIBJPEG=
 if test "${HAVE_X11}" = "yes"; then
 if test "${with_jpeg}" != "no"; then
 dnl Checking for jpeglib.h can lose because of a redefinition of
 dnl  HAVE_STDLIB_H.
 AC_CHECK_HEADER(jerror.h,
 ],
 [AC_DEFINE(HAVE_JPEG)],
 [AC_MSG_WARN([libjpeg found, but not version 6b or later])
 HAVE_JPEG=no])
 fi
-fi
+if test "${HAVE_JPEG}" = "yes"; then
+LIBJPEG=-ljpeg
+fi
+fi
+AC_SUBST(LIBJPEG)
 ### Use -lpng if available, unless `--with-png=no'.
 HAVE_PNG=no
+LIBPNG=
 if test "${HAVE_X11}" = "yes"; then
 if test "${with_png}" != "no"; then
 # Debian unstable as of July 2003 has multiple libpngs, and puts png.h
 # in /usr/include/libpng.
 AC_CHECK_HEADERS(png.h libpng/png.h)
 fi
 fi
 if test "${HAVE_PNG}" = "yes"; then
 AC_DEFINE(HAVE_PNG, 1, [Define to 1 if you have the png library (-lpng).])
-fi
+LIBPNG="-lpng -lz -lm"
 fi
+fi
+AC_SUBST(LIBPNG)
 ### Use -ltiff if available, unless `--with-tiff=no'.
 HAVE_TIFF=no
+LIBTIFF=
 if test "${HAVE_X11}" = "yes"; then
 if test "${with_tiff}" != "no"; then
 AC_CHECK_HEADER(tiffio.h,
 [tifflibs="-lz -lm"
 # At least one tiff package requires the jpeg library.
 AC_CHECK_LIB(tiff, TIFFGetVersion, HAVE_TIFF=yes, , $tifflibs)])
 fi
 if test "${HAVE_TIFF}" = "yes"; then
 AC_DEFINE(HAVE_TIFF, 1, [Define to 1 if you have the tiff library (-ltiff).])
-fi
+dnl FIXME -lz -lm, as per libpng?
-fi
+LIBTIFF=-ltiff
+fi
+fi
+AC_SUBST(LIBTIFF)
 ### Use -lgif or -lungif if available, unless `--with-gif=no'.
 HAVE_GIF=no
+LIBGIF=
 if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then
 AC_CHECK_HEADER(gif_lib.h,
 # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
 # Earlier versions can crash Emacs.
-[AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes, try_libungif=yes)])
+[AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes, HAVE_GIF=maybe)])
 if test "$HAVE_GIF" = yes; then
-ac_gif_lib_name="-lgif"
+LIBGIF=-lgif
-fi
+elif test "$HAVE_GIF" = maybe; then
 # If gif_lib.h but no libgif, try libungif.
-if test x"$try_libungif" = xyes; then
+AC_CHECK_LIB(ungif, EGifPutExtensionLast, HAVE_GIF=yes, HAVE_GIF=no)
-AC_CHECK_LIB(ungif, EGifPutExtensionLast, HAVE_GIF=yes)
+test "$HAVE_GIF" = yes && LIBGIF=-lungif
-if test "$HAVE_GIF" = yes; then
-AC_DEFINE(LIBGIF, -lungif, [Compiler option to link with the gif library (if not -lgif).])
-ac_gif_lib_name="-lungif"
-fi
 fi
 if test "${HAVE_GIF}" = "yes"; then
-AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif library (default -lgif; otherwise specify with LIBGIF).])
+AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif (or ungif) library.])
 fi
 fi
+AC_SUBST(LIBGIF)
 dnl Check for required libraries.
 if test "${HAVE_X11}" = "yes"; then
 MISSING=""
 WITH_NO=""
 fi
 fi
 ### Use -lgpm if available, unless `--with-gpm=no'.
 HAVE_GPM=no
+LIBGPM=
 if test "${with_gpm}" != "no"; then
 AC_CHECK_HEADER(gpm.h,
 [AC_CHECK_LIB(gpm, Gpm_Open, HAVE_GPM=yes)])
-fi
+if test "${HAVE_GPM}" = "yes"; then
-if test "${HAVE_GPM}" = "yes"; then
+AC_DEFINE(HAVE_GPM, 1, [Define to 1 if you have the gpm library (-lgpm).])
-AC_DEFINE(HAVE_GPM, 1, [Define to 1 if you have the gpm library (-lgpm).])
+LIBGPM=-lgpm
 fi
+fi
+AC_SUBST(LIBGPM)
 dnl Check for malloc/malloc.h on darwin
 AC_CHECK_HEADER(malloc/malloc.h, [AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the <malloc/malloc.h> header file.])])
 ### Use NeXTstep API to implement GUI.
 # On HPUX 9.01, -lm does not contain logb, so check for sqrt.
 AC_CHECK_LIB(m, sqrt)
 # Check for mail-locking functions in a "mail" library.  Probably this should
 # have the same check as for liblockfile below.
-AC_CHECK_LIB(mail, maillock)
+AC_CHECK_LIB(mail, maillock, have_mail=yes, have_mail=no)
+if test $have_mail = yes; then
+LIBS_MAIL=-lmail
+LIBS="$LIBS_MAIL $LIBS"
+AC_DEFINE(HAVE_LIBMAIL, 1, [Define to 1 if you have the `mail' library (-lmail).])
+else
+LIBS_MAIL=
+fi
 dnl Debian, at least:
-AC_CHECK_LIB(lockfile, maillock)
+AC_CHECK_LIB(lockfile, maillock, have_lockfile=yes, have_lockfile=no)
+if test $have_lockfile = yes; then
+LIBS_MAIL=-llockfile
+LIBS="$LIBS_MAIL $LIBS"
+AC_DEFINE(HAVE_LIBLOCKFILE, 1, [Define to 1 if you have the `lockfile' library (-llockfile).])
+else
 # If we have the shared liblockfile, assume we must use it for mail
 # locking (e.g. Debian).  If we couldn't link against liblockfile
 # (no liblockfile.a installed), ensure that we don't need to.
-if test "$ac_cv_lib_lockfile_maillock" = no; then
 dnl This works for files generally, not just executables.
 dnl Should we look elsewhere for it?  Maybe examine /etc/ld.so.conf?
 AC_CHECK_PROG(liblockfile, liblockfile.so, yes, no,
 /usr/lib:/lib:/usr/local/lib:$LD_LIBRARY_PATH)
 if test $ac_cv_prog_liblockfile = yes; then
 AC_MSG_ERROR([Shared liblockfile found but can't link against it.
 This probably means that movemail could lose mail.
 There may be a `development' package to install containing liblockfile.])
-else :
 fi
 fi
 AC_CHECK_FUNCS(touchlock)
 AC_CHECK_HEADERS(maillock.h)
+AC_SUBST(LIBS_MAIL)
 AC_CHECK_FUNCS(gethostname getdomainname dup2 \
 rename closedir mkdir rmdir sysinfo getrusage get_current_dir_name \
 random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime setsid \
 strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \
 if test "$have_res_init" = yes; then
 AC_DEFINE(HAVE_RES_INIT, 1, [Define to 1 if res_init is available.])
 fi
 # Do we need the Hesiod library to provide the support routines?
+LIBHESIOD=
 if test "$with_hesiod" != no ; then
-# Don't set $LIBS here -- see comments above.
+# Don't set $LIBS here -- see comments above.  FIXME which comments?
 AC_CHECK_FUNC(res_send, , [AC_CHECK_FUNC(__res_send, ,
 [AC_CHECK_LIB(resolv, res_send, resolv=yes,
 		  [AC_CHECK_LIB(resolv, __res_send, resolv=yes)])])])
 if test "$resolv" = yes ; then
 RESOLVLIB=-lresolv
 else
 RESOLVLIB=
 fi
 AC_CHECK_FUNC(hes_getmailhost, , [AC_CHECK_LIB(hesiod, hes_getmailhost,
-	[AC_DEFINE(HAVE_LIBHESIOD, 1,
+	hesiod=yes, :, $RESOLVLIB)])
-		  [Define to 1 if you have the hesiod library (-lhesiod).])],
-	:, $RESOLVLIB)])
+if test x"$hesiod" = xyes; then
-fi
+AC_DEFINE(HAVE_LIBHESIOD, 1,
+[Define to 1 if you have the hesiod library (-lhesiod).])
+LIBHESIOD=-lhesiod
+fi
+fi
+AC_SUBST(LIBHESIOD)
 # Do we need libresolv (due to res_init or Hesiod)?
 if test "$resolv" = yes ; then
 AC_DEFINE(HAVE_LIBRESOLV, 1,
 [Define to 1 if you have the resolv library (-lresolv).])
-fi
+LIBRESOLV=-lresolv
+else
+LIBRESOLV=
+fi
+AC_SUBST(LIBRESOLV)
 # These tell us which Kerberos-related libraries to use.
+COM_ERRLIB=
+CRYPTOLIB=
+KRB5LIB=
+DESLIB=
+KRB4LIB=
 if test "${with_kerberos}" != no; then
-AC_CHECK_LIB(com_err, com_err)
+AC_CHECK_LIB(com_err, com_err, have_com_err=yes, have_com_err=no)
-AC_CHECK_LIB(k5crypto, mit_des_cbc_encrypt)
+if test $have_com_err = yes; then
-AC_CHECK_LIB(crypto, mit_des_cbc_encrypt)
+COM_ERRLIB=-lcom_err
-AC_CHECK_LIB(krb5, krb5_init_context)
+LIBS="$COM_ERRLIB $LIBS"
+AC_DEFINE(HAVE_LIBCOM_ERR, 1, [Define to 1 if you have the `com_err' library (-lcom_err).])
+fi
+AC_CHECK_LIB(crypto, mit_des_cbc_encrypt, have_crypto=yes, have_crypto=no)
+if test $have_crypto = yes; then
+CRYPTOLIB=-lcrypto
+LIBS="$CRYPTOLIB $LIBS"
+AC_DEFINE(HAVE_LIBCRYPTO, 1, [Define to 1 if you have the `crypto' library (-lcrypto).])
+fi
+AC_CHECK_LIB(k5crypto, mit_des_cbc_encrypt, have_k5crypto=yes, have_k5crypto=no)
+if test $have_k5crypto = yes; then
+CRYPTOLIB=-lk5crypto
+LIBS="$CRYPTOLIB $LIBS"
+AC_DEFINE(HAVE_LIBK5CRYPTO, 1, [Define to 1 if you have the `k5crypto' library (-lk5crypto).])
+fi
+AC_CHECK_LIB(krb5, krb5_init_context, have_krb5=yes, have_krb5=no)
+if test $have_krb5=yes; then
+KRB5LIB=-lkrb5
+LIBS="$KRB5LIB $LIBS"
+AC_DEFINE(HAVE_LIBKRB5, 1, [Define to 1 if you have the `krb5' library (-lkrb5).])
+fi
+dnl FIXME Simplify.  Does not match 22 logic, thanks to default_off?
 if test "${with_kerberos5}" = no; then
-AC_CHECK_LIB(des425, des_cbc_encrypt,,
+AC_CHECK_LIB(des425, des_cbc_encrypt, have_des425=yes, have_des425=no )
-		 [AC_CHECK_LIB(des, des_cbc_encrypt)])
+if test $have_des425 = yes; then
-AC_CHECK_LIB(krb4, krb_get_cred,,
+DESLIB=-ldes425
-		 [AC_CHECK_LIB(krb, krb_get_cred)])
+LIBS="$DESLIB $LIBS"
+AC_DEFINE(HAVE_LIBDES425, 1, [Define to 1 if you have the `des425' library (-ldes425).])
+else
+AC_CHECK_LIB(des, des_cbc_encrypt, have_des=yes, have_des=no)
+if test $have_des = yes; then
+DESLIB=-ldes
+LIBS="$DESLIB $LIBS"
+AC_DEFINE(HAVE_LIBDES, 1, [Define to 1 if you have the `des' library (-ldes).])
+fi
+fi
+AC_CHECK_LIB(krb4, krb_get_cred, have_krb4=yes, have_krb4=no)
+if test $have_krb4 = yes; then
+KRB4LIB=-lkrb4
+LIBS="$KRB4LIB $LIBS"
+AC_DEFINE(HAVE_LIBKRB4, 1, [Define to 1 if you have the `krb4' library (-lkrb4).])
+else
+AC_CHECK_LIB(krb, krb_get_cred, have_krb=yes, have_krb=no)
+if test $have_krb = yes; then
+KRB4LIB=-lkrb
+LIBS="$KRB4LIB $LIBS"
+AC_DEFINE(HAVE_LIBKRB, 1, [Define to 1 if you have the `krb' library (-lkrb).])
+fi
+fi
 fi
 if test "${with_kerberos5}" != no; then
 AC_CHECK_HEADERS(krb5.h,
 [AC_CHECK_MEMBERS([krb5_error.text, krb5_error.e_text],,,
 		     [AC_CHECK_HEADERS(kerberosIV/krb.h,,
 				       [AC_CHECK_HEADERS(kerberos/krb.h)])])
 fi
 AC_CHECK_HEADERS(com_err.h)
 fi
+AC_SUBST(COM_ERRLIB)
+AC_SUBST(CRYPTOLIB)
+AC_SUBST(KRB5LIB)
+AC_SUBST(DESLIB)
+AC_SUBST(KRB4LIB)
 # Solaris requires -lintl if you want strerror (which calls dgettext)
 # to return localized messages.
 AC_CHECK_LIB(intl, dgettext)
 echo "  Does Emacs use -lXaw3d?                                 ${HAVE_XAW3D}"
 echo "  Does Emacs use -lXpm?                                   ${HAVE_XPM}"
 echo "  Does Emacs use -ljpeg?                                  ${HAVE_JPEG}"
 echo "  Does Emacs use -ltiff?                                  ${HAVE_TIFF}"
-echo "  Does Emacs use a gif library?                           ${HAVE_GIF} $ac_gif_lib_name"
+echo "  Does Emacs use a gif library?                           ${HAVE_GIF} $LIBGIF"
 echo "  Does Emacs use -lpng?                                   ${HAVE_PNG}"
 echo "  Does Emacs use -lrsvg-2?                                ${HAVE_RSVG}"
 echo "  Does Emacs use -lgpm?                                   ${HAVE_GPM}"
 echo "  Does Emacs use -ldbus?                                  ${HAVE_DBUS}"
 echo "  Does Emacs use -lgconf?                                 ${HAVE_GCONF}"

Mercurial > emacs

comparison configure.in @ 107407:975563054751