Mercurial > emacs

comparison src/Makefile.in @ 107407:975563054751

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1b280b2e1b75
children 3447e262f426
comparison
equal deleted inserted replaced
107406:1de48da1419b 107407:975563054751
367 #else 367 #else
368 LIBXT=$(LIBW) 368 LIBXT=$(LIBW)
369 #endif 369 #endif
370 #endif /* not USE_X_TOOLKIT */ 370 #endif /* not USE_X_TOOLKIT */
371 371
372 #if HAVE_XFT
373 XFT_LIBS=@XFT_LIBS@
374 #endif /* HAVE_XFT */
375
376 #if HAVE_XPM
377 #ifndef LIBXPM
378 #define LIBXPM -lXpm
379 #endif /* not defined LIBXPM */
380 #else /* not HAVE_XPM */
381 #define LIBXPM
382 #endif /* not HAVE_XPM */
383
384 #if HAVE_JPEG
385 #ifndef LIBJPEG
386 #define LIBJPEG -ljpeg
387 #endif /* not defined LIBJPEG */
388 #else /* not HAVE_JPEG */
389 #define LIBJPEG
390 #endif /* not HAVE_JPEG */
391
392 #if HAVE_PNG
393 #ifndef LIBPNG
394 #define LIBPNG -lpng -lz -lm
395 #endif /* not defined LIBPNG */
396 #else /* not HAVE_PNG */
397 #define LIBPNG
398 #endif /* not HAVE_PNG */
399
400 #if HAVE_TIFF
401 #ifndef LIBTIFF
402 #define LIBTIFF -ltiff
403 #endif /* not defined LIBTIFF */
404 #else /* not HAVE_TIFF */
405 #define LIBTIFF
406 #endif /* not HAVE_TIFF */
407
408 #if HAVE_GIF
409 #ifndef LIBGIF
410 #define LIBGIF -lgif
411 #endif /* not defined LIBGIF */
412 #else /* not HAVE_GIF */
413 #define LIBGIF
414 #endif /* not HAVE_GIF */
415
416 #ifdef HAVE_X11 372 #ifdef HAVE_X11
417 /* LD_SWITCH_X_DEFAULT comes after everything else that specifies 373 /* LD_SWITCH_X_DEFAULT comes after everything else that specifies
418 options for where to find X libraries, but before those libraries. */ 374 options for where to find X libraries, but before those libraries. */
419 X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT 375 X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT
420 LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_SYSTEM $(XFT_LIBS) 376 LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) @LIBTIFF@ @LIBJPEG@ @LIBPNG@ @LIBGIF@ @LIBXPM@ LIB_X11_LIB LIBX11_SYSTEM @XFT_LIBS@
421 #else /* not HAVE_X11 */ 377 #else /* not HAVE_X11 */
422 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE 378 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE
423 #endif /* not HAVE_X11 */ 379 #endif /* not HAVE_X11 */
424 #endif /* not HAVE_X_WINDOWS */ 380 #endif /* not HAVE_X_WINDOWS */
425
426 #if HAVE_GPM
427 #ifndef LIBGPM
428 #define LIBGPM -lgpm
429 #endif /* not defined LIBGPM */
430 #else /* not HAVE_GPM */
431 #define LIBGPM
432 #endif /* not HAVE_GPM */
433
434 #if HAVE_LIBRESOLV
435 #ifndef LIBRESOLV
436 #define LIBRESOLV -lresolv
437 #endif /* not defined LIBRESOLV */
438 #else /* not HAVE_LIBRESOLV */
439 #define LIBRESOLV
440 #endif /* not HAVE_LIBRESOLV */
441 381
442 LIBSOUND= @LIBSOUND@ 382 LIBSOUND= @LIBSOUND@
443 CFLAGS_SOUND= @CFLAGS_SOUND@ 383 CFLAGS_SOUND= @CFLAGS_SOUND@
444 384
445 RSVG_LIBS= @RSVG_LIBS@ 385 RSVG_LIBS= @RSVG_LIBS@
906 Note that SunOS needs -lm to come before -lc; otherwise, you get 846 Note that SunOS needs -lm to come before -lc; otherwise, you get
907 duplicated symbols. If the standard libraries were compiled 847 duplicated symbols. If the standard libraries were compiled
908 with GCC, we might need gnulib again after them. */ 848 with GCC, we might need gnulib again after them. */
909 849
910 LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) $(DBUS_LIBS) \ 850 LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) $(DBUS_LIBS) \
911 LIBGPM LIBRESOLV LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \ 851 @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
912 LIBS_DEBUG $(GETLOADAVG_LIBS) ${GCONF_LIBS} \ 852 LIBS_DEBUG $(GETLOADAVG_LIBS) ${GCONF_LIBS} \
913 @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \ 853 @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
914 $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR) 854 $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
915 855
916 #ifdef HAVE_SHM 856 #ifdef HAVE_SHM