/[emacs]/emacs/configure.in
ViewVC logotype

Diff of /emacs/configure.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.325 by lektu, Fri Jan 31 15:08:58 2003 UTC revision 1.326 by lektu, Tue Feb 4 14:56:31 2003 UTC
# Line 77  dnl This should be the last --with optio Line 77  dnl This should be the last --with optio
77  dnl added later on when we find the path of X, and it's best to  dnl added later on when we find the path of X, and it's best to
78  dnl keep them together visually.  dnl keep them together visually.
79  AC_ARG_WITH(x-toolkit,  AC_ARG_WITH(x-toolkit,
80  [  --with-x-toolkit=KIT    use an X toolkit  [  --with-x-toolkit=KIT    use an X toolkit
81                                (KIT = yes/lucid/athena/motif/gtk/no)],                                (KIT = yes/lucid/athena/motif/gtk/no)],
82  [         case "${withval}" in  [         case "${withval}" in
83              y | ye | yes )      val=athena ;;              y | ye | yes )      val=athena ;;
# Line 1068  case "${canonical}" in Line 1068  case "${canonical}" in
1068        *-xenix* )                opsys=xenix ;;        *-xenix* )                opsys=xenix ;;
1069        *-linux-gnu* )            opsys=gnu-linux ;;        *-linux-gnu* )            opsys=gnu-linux ;;
1070        *-sco3.2v4* )             opsys=sco4 ; NON_GNU_CPP=/lib/cpp  ;;        *-sco3.2v4* )             opsys=sco4 ; NON_GNU_CPP=/lib/cpp  ;;
1071        *-sco3.2v5* )             opsys=sco5        *-sco3.2v5* )             opsys=sco5
1072                                  NON_GNU_CPP=/lib/cpp                                  NON_GNU_CPP=/lib/cpp
1073                                  # Prevent -belf from being passed to $CPP.                                  # Prevent -belf from being passed to $CPP.
1074                                  # /lib/cpp does not accept it.                                  # /lib/cpp does not accept it.
# Line 1112  case "${canonical}" in Line 1112  case "${canonical}" in
1112    
1113    ## AMD x86-64 Linux-based GNU system    ## AMD x86-64 Linux-based GNU system
1114    x86_64-*-linux-gnu* )    x86_64-*-linux-gnu* )
1115      machine=amdx86-64 opsys=gnu-linux      machine=amdx86-64 opsys=gnu-linux
1116    ;;    ;;
1117    
1118    * )    * )
# Line 1333  configure___ use_mmap_for_buffers=no Line 1333  configure___ use_mmap_for_buffers=no
1333    
1334  #ifndef LD_SWITCH_X_SITE_AUX  #ifndef LD_SWITCH_X_SITE_AUX
1335  #define LD_SWITCH_X_SITE_AUX  #define LD_SWITCH_X_SITE_AUX
1336  #endif    #endif
1337    
1338  configure___ ld_switch_system=LD_SWITCH_SYSTEM  configure___ ld_switch_system=LD_SWITCH_SYSTEM
1339  configure___ ld_switch_machine=LD_SWITCH_MACHINE  configure___ ld_switch_machine=LD_SWITCH_MACHINE
# Line 1447  AC_CACHE_CHECK(for speed_t, emacs_cv_spe Line 1447  AC_CACHE_CHECK(for speed_t, emacs_cv_spe
1447    [AC_TRY_COMPILE([#include <termios.h>], [speed_t x = 1;],    [AC_TRY_COMPILE([#include <termios.h>], [speed_t x = 1;],
1448      emacs_cv_speed_t=yes, emacs_cv_speed_t=no)])      emacs_cv_speed_t=yes, emacs_cv_speed_t=no)])
1449  if test $emacs_cv_speed_t = yes; then  if test $emacs_cv_speed_t = yes; then
1450    AC_DEFINE(HAVE_SPEED_T, 1,    AC_DEFINE(HAVE_SPEED_T, 1,
1451             [Define to 1 if `speed_t' is declared by <termios.h>.])             [Define to 1 if `speed_t' is declared by <termios.h>.])
1452  fi  fi
1453    
# Line 1469  if test $emacs_cv_struct_timeval = yes; Line 1469  if test $emacs_cv_struct_timeval = yes;
1469  fi  fi
1470    
1471  AC_CACHE_CHECK(for struct exception, emacs_cv_struct_exception,  AC_CACHE_CHECK(for struct exception, emacs_cv_struct_exception,
1472  AC_TRY_COMPILE([#include <math.h>],  AC_TRY_COMPILE([#include <math.h>],
1473  [static struct exception x; x.arg1 = x.arg2 = x.retval; x.name = ""; x.type = 1;],  [static struct exception x; x.arg1 = x.arg2 = x.retval; x.name = ""; x.type = 1;],
1474    emacs_cv_struct_exception=yes, emacs_cv_struct_exception=no))    emacs_cv_struct_exception=yes, emacs_cv_struct_exception=no))
1475  HAVE_EXCEPTION=$emacs_cv_struct_exception  HAVE_EXCEPTION=$emacs_cv_struct_exception
# Line 1498  dnl This isn't useful because we can't t Line 1498  dnl This isn't useful because we can't t
1498  dnl the compiler groks `extern inline'.  dnl the compiler groks `extern inline'.
1499  dnl AC_C_INLINE  dnl AC_C_INLINE
1500  AC_CACHE_CHECK([for void * support], emacs_cv_void_star,  AC_CACHE_CHECK([for void * support], emacs_cv_void_star,
1501    [AC_TRY_COMPILE(, [void * foo;],    [AC_TRY_COMPILE(, [void * foo;],
1502                     emacs_cv_void_star=yes, emacs_cv_void_star=no)])                     emacs_cv_void_star=yes, emacs_cv_void_star=no)])
1503  if test $emacs_cv_void_star = yes; then  if test $emacs_cv_void_star = yes; then
1504    AC_DEFINE(POINTER_TYPE, void)    AC_DEFINE(POINTER_TYPE, void)
# Line 1599  HAVE_MENUS=no Line 1599  HAVE_MENUS=no
1599  case ${HAVE_X11} in  case ${HAVE_X11} in
1600    yes ) HAVE_MENUS=yes ;;    yes ) HAVE_MENUS=yes ;;
1601  esac  esac
1602      
1603  if test "${opsys}" = "hpux9"; then  if test "${opsys}" = "hpux9"; then
1604    case "${x_libraries}" in    case "${x_libraries}" in
1605      *X11R4* )      *X11R4* )
# Line 1827  AC_DEFUN(PKG_CHECK_MODULES, [ Line 1827  AC_DEFUN(PKG_CHECK_MODULES, [
1827          else          else
1828              $1_CFLAGS=""              $1_CFLAGS=""
1829              $1_LIBS=""              $1_LIBS=""
1830              ## If we have a custom action on failure, don't print errors, but              ## If we have a custom action on failure, don't print errors, but
1831              ## do set a variable so people can do so.              ## do set a variable so people can do so.
1832              $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`              $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
1833              ifelse([$4], ,echo $$1_PKG_ERRORS,)              ifelse([$4], ,echo $$1_PKG_ERRORS,)
# Line 1978  Motif version prior to 2.1. Line 1978  Motif version prior to 2.1.
1978      if test ${HAVE_LIBXP} = yes; then      if test ${HAVE_LIBXP} = yes; then
1979        AC_DEFINE(HAVE_LIBXP, 1,        AC_DEFINE(HAVE_LIBXP, 1,
1980                  [Define to 1 if you have the Xp library (-lXp).])                  [Define to 1 if you have the Xp library (-lXp).])
1981      fi        fi
1982    fi    fi
1983  fi  fi
1984    
# Line 1996  if test "${HAVE_X11}" = "yes"; then Line 1996  if test "${HAVE_X11}" = "yes"; then
1996      fi      fi
1997    fi    fi
1998  fi  fi
1999      
2000  dnl Use toolkit scroll bars if configured for GTK or X toolkit and either  dnl Use toolkit scroll bars if configured for GTK or X toolkit and either
2001  dnl using Motif or Xaw3d is available, and unless  dnl using Motif or Xaw3d is available, and unless
2002  dnl --with-toolkit-scroll-bars=no was specified.  dnl --with-toolkit-scroll-bars=no was specified.
# Line 2055  no_return_alloc_pixels Line 2055  no_return_alloc_pixels
2055      AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm libary (-lXpm).])      AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm libary (-lXpm).])
2056    fi    fi
2057  fi  fi
2058      
2059  ### Use -ljpeg if available, unless `--with-jpeg=no'.  ### Use -ljpeg if available, unless `--with-jpeg=no'.
2060  HAVE_JPEG=no  HAVE_JPEG=no
2061  if test "${HAVE_X11}" = "yes"; then  if test "${HAVE_X11}" = "yes"; then
# Line 2072  if test "${HAVE_X11}" = "yes"; then Line 2072  if test "${HAVE_X11}" = "yes"; then
2072      AC_EGREP_CPP([version= *(6[2-9]|[7-9][0-9])],      AC_EGREP_CPP([version= *(6[2-9]|[7-9][0-9])],
2073          [#include <jpeglib.h>          [#include <jpeglib.h>
2074           version=JPEG_LIB_VERSION           version=JPEG_LIB_VERSION
2075  ],      ],
2076          AC_DEFINE(HAVE_JPEG),          AC_DEFINE(HAVE_JPEG),
2077          [AC_MSG_WARN([libjpeg found, but not version 6b or later])          [AC_MSG_WARN([libjpeg found, but not version 6b or later])
2078          HAVE_JPEG=no])          HAVE_JPEG=no])
2079    fi    fi
2080  fi  fi
2081      
2082  ### Use -lpng if available, unless `--with-png=no'.  ### Use -lpng if available, unless `--with-png=no'.
2083  HAVE_PNG=no  HAVE_PNG=no
2084  if test "${HAVE_X11}" = "yes"; then  if test "${HAVE_X11}" = "yes"; then
# Line 2091  if test "${HAVE_X11}" = "yes"; then Line 2091  if test "${HAVE_X11}" = "yes"; then
2091      AC_DEFINE(HAVE_PNG, 1, [Define to 1 if you have the png library (-lpng).])      AC_DEFINE(HAVE_PNG, 1, [Define to 1 if you have the png library (-lpng).])
2092    fi    fi
2093  fi  fi
2094      
2095  ### Use -ltiff if available, unless `--with-tiff=no'.  ### Use -ltiff if available, unless `--with-tiff=no'.
2096  HAVE_TIFF=no  HAVE_TIFF=no
2097  if test "${HAVE_X11}" = "yes"; then  if test "${HAVE_X11}" = "yes"; then
# Line 2107  if test "${HAVE_X11}" = "yes"; then Line 2107  if test "${HAVE_X11}" = "yes"; then
2107      AC_DEFINE(HAVE_TIFF, 1, [Define to 1 if you have the tiff library (-ltiff).])      AC_DEFINE(HAVE_TIFF, 1, [Define to 1 if you have the tiff library (-ltiff).])
2108    fi    fi
2109  fi  fi
2110      
2111  ### Use -lgif if available, unless `--with-gif=no'.  ### Use -lgif if available, unless `--with-gif=no'.
2112  HAVE_GIF=no  HAVE_GIF=no
2113  if test "${HAVE_X11}" = "yes"; then  if test "${HAVE_X11}" = "yes"; then
# Line 2158  if test "${HAVE_X11}" = "yes"; then Line 2158  if test "${HAVE_X11}" = "yes"; then
2158      esac      esac
2159    fi    fi
2160  fi  fi
2161      
2162  # If netdb.h doesn't declare h_errno, we must declare it by hand.  # If netdb.h doesn't declare h_errno, we must declare it by hand.
2163  AC_CACHE_CHECK(whether netdb declares h_errno,  AC_CACHE_CHECK(whether netdb declares h_errno,
2164                 emacs_cv_netdb_declares_h_errno,                 emacs_cv_netdb_declares_h_errno,
# Line 2588  Boston, MA 02111-1307, USA.  */ Line 2588  Boston, MA 02111-1307, USA.  */
2588    
2589    
2590  /* No code in Emacs #includes config.h twice, but some bits of code  /* No code in Emacs #includes config.h twice, but some bits of code
2591     intended to work with other packages as well (like gmalloc.c)     intended to work with other packages as well (like gmalloc.c)
2592     think they can include it as many times as they like.  */     think they can include it as many times as they like.  */
2593  #ifndef EMACS_CONFIG_H  #ifndef EMACS_CONFIG_H
2594  #define EMACS_CONFIG_H  #define EMACS_CONFIG_H
# Line 2812  typedef unsigned size_t; Line 2812  typedef unsigned size_t;
2812  #ifdef __GNUC__  #ifdef __GNUC__
2813  #  ifndef GC_SETJMP_WORKS  #  ifndef GC_SETJMP_WORKS
2814    /* GC_SETJMP_WORKS is nearly always appropriate for GCC --    /* GC_SETJMP_WORKS is nearly always appropriate for GCC --
2815       see NON_SAVING_SETJMP in the target descriptions.  */         see NON_SAVING_SETJMP in the target descriptions.  */
2816    /* Exceptions (see NON_SAVING_SETJMP in target description) are ns32k,    /* Exceptions (see NON_SAVING_SETJMP in target description) are ns32k,
2817       SCO5 non-ELF (but Emacs specifies ELF) and SVR3 on x86.       SCO5 non-ELF (but Emacs specifies ELF) and SVR3 on x86.
2818       Fixme: Deal with ns32k, SVR3.  */       Fixme: Deal with ns32k, SVR3.  */
# Line 2835  typedef unsigned size_t; Line 2835  typedef unsigned size_t;
2835    
2836  #endif /* EMACS_CONFIG_H */  #endif /* EMACS_CONFIG_H */
2837    
2838  /*  /*
2839  Local Variables:  Local Variables:
2840  mode: c  mode: c
2841  End:  End:

Legend:
Removed from v.1.325  
changed lines
  Added in v.1.326

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26