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

Diff of /emacs/configure.in

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

revision 1.299.2.1 by miles, Fri Apr 4 06:19:49 2003 UTC revision 1.299.2.2 by miles, Tue Oct 14 23:59:12 2003 UTC
# Line 125  AC_ARG_ENABLE(carbon-app, Line 125  AC_ARG_ENABLE(carbon-app,
125                            specify install directory for Emacs.app on Mac OS X]],                            specify install directory for Emacs.app on Mac OS X]],
126  [ carbon_appdir_x=${enableval}])  [ carbon_appdir_x=${enableval}])
127    
128    AC_ARG_ENABLE(maintainer-mode,
129    [  --enable-maintainer-mode enable make rules and dependencies not useful
130                              (and sometimes confusing) to the casual installer],
131          USE_MAINTAINER_MODE=$enableval,
132          USE_MAINTAINER_MODE=no)
133    if test $USE_MAINTAINER_MODE = yes; then
134      MAINT=
135    else
136      MAINT=#
137    fi
138    AC_SUBST(MAINT)
139    
140  #### Make srcdir absolute, if it isn't already.  It's important to  #### Make srcdir absolute, if it isn't already.  It's important to
141  #### avoid running the path through pwd unnecessarily, since pwd can  #### avoid running the path through pwd unnecessarily, since pwd can
142  #### give you automounter prefixes, which can go away.  We do all this  #### give you automounter prefixes, which can go away.  We do all this
# Line 182  dnl This used to use changequote, but, a Line 194  dnl This used to use changequote, but, a
194  dnl per the autoconf manual, we can speed up autoconf somewhat by quoting  dnl per the autoconf manual, we can speed up autoconf somewhat by quoting
195  dnl the great gob of text.  Thus it's not processed for possible expansion.  dnl the great gob of text.  Thus it's not processed for possible expansion.
196  dnl Just make sure the brackets remain balanced.  dnl Just make sure the brackets remain balanced.
197    dnl
198    dnl Since Emacs can't find matching pairs of quotes, boundaries are
199    dnl indicated by comments.
200    dnl quotation begins
201  [  [
202    
203  ### If you add support for a new configuration, add code to this  ### If you add support for a new configuration, add code to this
# Line 222  case "${canonical}" in Line 238  case "${canonical}" in
238    ## NetBSD ports    ## NetBSD ports
239    *-*-netbsd* )    *-*-netbsd* )
240      opsys=netbsd      opsys=netbsd
241        if test -f /usr/lib/crti.o; then]
242    dnl The close and open brackets here are because this section is quoted --
243    dnl see the `changequote' comment above.
244          AC_DEFINE(HAVE_CRTIN, [], [Define to 1 if you have /usr/lib/crti.o.])
245    [   fi
246    
247      case "${canonical}" in      case "${canonical}" in
248        alpha*-*-netbsd*) machine=alpha ;;        alpha*-*-netbsd*) machine=alpha ;;
249        i[3456]86-*-netbsd*) machine=intel386 ;;        i[3456]86-*-netbsd*) machine=intel386 ;;
# Line 618  case "${canonical}" in Line 640  case "${canonical}" in
640    i370-ibm-aix*)    i370-ibm-aix*)
641      machine=ibm370aix opsys=usg5-3      machine=ibm370aix opsys=usg5-3
642    ;;    ;;
643    s390-*-linux-gnu)    s390-*-linux-gnu* )
644      machine=ibms390 opsys=gnu-linux      machine=ibms390 opsys=gnu-linux
645    ;;    ;;
646    rs6000-ibm-aix3.1* | powerpc-ibm-aix3.1*  )    rs6000-ibm-aix3.1* | powerpc-ibm-aix3.1*  )
# Line 633  case "${canonical}" in Line 655  case "${canonical}" in
655    rs6000-ibm-aix4.2* | powerpc-ibm-aix4.2*  )    rs6000-ibm-aix4.2* | powerpc-ibm-aix4.2*  )
656      machine=ibmrs6000 opsys=aix4-2      machine=ibmrs6000 opsys=aix4-2
657    ;;    ;;
658    rs6000-ibm-aix5.1* | powerpc-ibm-aix5.1*  )    rs6000-ibm-aix5* | powerpc-ibm-aix5*  )
659      machine=ibmrs6000 opsys=aix4-2      machine=ibmrs6000 opsys=aix4-2
660    ;;    ;;
661    rs6000-ibm-aix4.0* | powerpc-ibm-aix4.0*  )    rs6000-ibm-aix4.0* | powerpc-ibm-aix4.0*  )
# Line 1078  case "${canonical}" in Line 1100  case "${canonical}" in
1100                                  OVERRIDE_CPPFLAGS=" "                                  OVERRIDE_CPPFLAGS=" "
1101                                  ;;                                  ;;
1102        *-sysv4.2uw* )            opsys=unixware; NON_GNU_CPP=/lib/cpp ;;        *-sysv4.2uw* )            opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
1103          *-sysv5uw* )              opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
1104          *-sysv5OpenUNIX* )        opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
1105        *-386bsd* )               opsys=386bsd ;;        *-386bsd* )               opsys=386bsd ;;
1106        *-nextstep* )             opsys=nextstep ;;        *-nextstep* )             opsys=nextstep ;;
1107        ## Otherwise, we'll fall through to the generic opsys code at the bottom.        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
# Line 1110  case "${canonical}" in Line 1134  case "${canonical}" in
1134    powerpc-apple-darwin* )    powerpc-apple-darwin* )
1135      machine=powermac opsys=darwin      machine=powermac opsys=darwin
1136      # Define CPP as follows to make autoconf work correctly.      # Define CPP as follows to make autoconf work correctly.
1137      CPP="cc -E -traditional-cpp"      CPP="gcc -E -no-cpp-precomp"
1138    ;;    ;;
1139    
1140    ## AMD x86-64 Linux-based GNU system    ## AMD x86-64 Linux-based GNU system
# Line 1140  if test x"${opsys}" = x; then Line 1164  if test x"${opsys}" = x; then
1164      *-sysv2.2 | *-sysvr2.2 )            opsys=usg5-2-2 ;;      *-sysv2.2 | *-sysvr2.2 )            opsys=usg5-2-2 ;;
1165      *-sysv3* | *-sysvr3* )              opsys=usg5-3 ;;      *-sysv3* | *-sysvr3* )              opsys=usg5-3 ;;
1166      *-sysv4.2uw* )                      opsys=unixware ;;      *-sysv4.2uw* )                      opsys=unixware ;;
1167        *-sysv5uw* )                        opsys=unixware ;;
1168        *-sysv5OpenUNIX* )                  opsys=unixware ;;
1169      *-sysv4.1* | *-sysvr4.1* )      *-sysv4.1* | *-sysvr4.1* )
1170          NON_GNU_CPP=/usr/lib/cpp          NON_GNU_CPP=/usr/lib/cpp
1171          opsys=usg5-4 ;;          opsys=usg5-4 ;;
# Line 1160  if test x"${opsys}" = x; then Line 1186  if test x"${opsys}" = x; then
1186  fi  fi
1187    
1188  ]  ]
1189    dnl quotation ends
1190    
1191  if test $unported = yes; then  if test $unported = yes; then
1192    AC_MSG_ERROR([Emacs hasn't been ported to `${canonical}' systems.    AC_MSG_ERROR([Emacs hasn't been ported to `${canonical}' systems.
# Line 1404  fi Line 1431  fi
1431  dnl checks for header files  dnl checks for header files
1432  AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \  AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
1433    linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \    linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
1434    termcap.h stdio_ext.h fcntl.h term.h strings.h coff.h pty.h sys/mman.h \    termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
1435    sys/param.h sys/vlimit.h sys/resource.h)    sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h)
1436  dnl On Solaris 8 there's a compilation warning for term.h because  dnl On Solaris 8 there's a compilation warning for term.h because
1437  dnl it doesn't define `bool'.  dnl it doesn't define `bool'.
1438  AC_CHECK_HEADERS(term.h, , , -)  AC_CHECK_HEADERS(term.h, , , -)
# Line 1487  AC_CHECK_MEMBER(struct tm.tm_gmtoff, Line 1514  AC_CHECK_MEMBER(struct tm.tm_gmtoff,
1514                  [AC_DEFINE(HAVE_TM_GMTOFF, 1,                  [AC_DEFINE(HAVE_TM_GMTOFF, 1,
1515                             [Define to 1 if `tm_gmtoff' is member of `struct tm'.])],,                             [Define to 1 if `tm_gmtoff' is member of `struct tm'.])],,
1516                  [#include <time.h>])                  [#include <time.h>])
1517    AC_CHECK_MEMBERS([struct ifreq.ifr_flags, struct ifreq.ifr_hwaddr,
1518                      struct ifreq.ifr_netmask, struct ifreq.ifr_broadaddr,
1519                      struct ifreq.ifr_addr], , ,[#include <net/if.h>])
1520    
1521  dnl checks for compiler characteristics  dnl checks for compiler characteristics
1522    
# Line 2039  if test "${with_toolkit_scroll_bars}" != Line 2069  if test "${with_toolkit_scroll_bars}" !=
2069    fi    fi
2070  fi  fi
2071    
2072  dnl Don't use X11 input methods if user specifies he doesn't want it  dnl See if XIM is available.
2073  dnl with `--with-xim=no'.  AC_TRY_COMPILE([
2074              #include <X11/Xlib.h>
2075              #include <X11/Xresource.h>],
2076             [XIMProc  callback;],
2077             HAVE_XIM=yes
2078             AC_DEFINE(HAVE_XIM, 1, [Define to 1 if XIM is available]),
2079             HAVE_XIM=no)
2080    
2081    dnl `--with-xim' now controls only the initial value of use_xim at run time.
2082    
2083  if test "${with_xim}" != "no"; then  if test "${with_xim}" != "no"; then
2084    AC_DEFINE(USE_XIM, 1,    AC_DEFINE(USE_XIM, 1,
2085              [Define to 1 if we should use XIM, if it is available.])              [Define to 1 if we should use XIM, if it is available.])
2086  fi  fi
2087    
2088    
2089    if test "${HAVE_XIM}" != "no"; then
2090      late_CFLAGS=$CFLAGS
2091      if test "$GCC" = yes; then
2092        CFLAGS="$CFLAGS --pedantic-errors"
2093      fi
2094      AC_TRY_COMPILE([
2095    #include <X11/Xlib.h>
2096    #include <X11/Xresource.h>],
2097    [Display *display;
2098    XrmDatabase db;
2099    char *res_name;
2100    char *res_class;
2101    XIMProc  callback;
2102    XPointer *client_data;
2103    #ifndef __GNUC__
2104    /* If we're not using GCC, it's probably not XFree86, and this is
2105       probably right, but we can't use something like --pedantic-errors.  */
2106    extern Bool XRegisterIMInstantiateCallback(Display*, XrmDatabase, char*,
2107                                               char*, XIMProc, XPointer*);
2108    #endif
2109    (void)XRegisterIMInstantiateCallback(display, db, res_name, res_class, callback,
2110       client_data);],
2111        [emacs_cv_arg6_star=yes])
2112      AH_TEMPLATE(XRegisterIMInstantiateCallback_arg6,
2113             [Define to the type of the 6th arg of XRegisterIMInstantiateCallback,
2114    either XPointer or XPointer*.])dnl
2115      if test "$emacs_cv_arg6_star" = yes; then
2116        AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer*])
2117      else
2118        AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer])
2119      fi
2120      CFLAGS=$late_CFLAGS
2121    fi
2122    
2123  ### Use -lXpm if available, unless `--with-xpm=no'.  ### Use -lXpm if available, unless `--with-xpm=no'.
2124  HAVE_XPM=no  HAVE_XPM=no
# Line 2102  fi Line 2175  fi
2175  HAVE_PNG=no  HAVE_PNG=no
2176  if test "${HAVE_X11}" = "yes"; then  if test "${HAVE_X11}" = "yes"; then
2177    if test "${with_png}" != "no"; then    if test "${with_png}" != "no"; then
2178      AC_CHECK_HEADER(png.h,      # Debian unstable as of July 2003 has multiple libpngs, and puts png.h
2179        AC_CHECK_LIB(png, png_get_channels, HAVE_PNG=yes, , -lz -lm))      # in /usr/include/libpng.
2180        AC_CHECK_HEADERS(png.h libpng/png.h)
2181        if test "$ac_cv_header_png_h" = yes || test "$ac_cv_header_libpng_png_h" = yes ; then
2182          AC_CHECK_LIB(png, png_get_channels, HAVE_PNG=yes, , -lz -lm)
2183        fi
2184    fi    fi
2185    
2186    if test "${HAVE_PNG}" = "yes"; then    if test "${HAVE_PNG}" = "yes"; then
# Line 2194  AC_FUNC_ALLOCA Line 2271  AC_FUNC_ALLOCA
2271  # On HPUX 9.01, -lm does not contain logb, so check for sqrt.  # On HPUX 9.01, -lm does not contain logb, so check for sqrt.
2272  AC_CHECK_LIB(m, sqrt)  AC_CHECK_LIB(m, sqrt)
2273    
2274  # Check for mail-locking functions in a "mail" library  # Check for mail-locking functions in a "mail" library.  Probably this should
2275    # have the same check as for liblockfile below.
2276  AC_CHECK_LIB(mail, maillock)  AC_CHECK_LIB(mail, maillock)
2277  dnl Debian, at least:  dnl Debian, at least:
 dnl AC_CHECK_LIB(lockfile, maillock, [AC_DEFINE(HAVE_LIBMAIL)])  
2278  AC_CHECK_LIB(lockfile, maillock)  AC_CHECK_LIB(lockfile, maillock)
2279  # If we have the shared liblockfile, assume we must use it for mail  # If we have the shared liblockfile, assume we must use it for mail
2280  # locking (e.g. Debian).  If we couldn't link against liblockfile  # locking (e.g. Debian).  If we couldn't link against liblockfile
# Line 2211  if test "$ac_cv_lib_lockfile_maillock" = Line 2288  if test "$ac_cv_lib_lockfile_maillock" =
2288      AC_MSG_ERROR([Shared liblockfile found but can't link against it.      AC_MSG_ERROR([Shared liblockfile found but can't link against it.
2289  This probably means that movemail could lose mail.  This probably means that movemail could lose mail.
2290  There may be a `development' package to install containing liblockfile.])  There may be a `development' package to install containing liblockfile.])
   else AC_DEFINE(LIBMAIL, -llockfile, [Define to -llockfile if it is usable.])  
   fi  
2291    else :    else :
2292      fi
2293  fi  fi
2294  AC_CHECK_FUNCS(touchlock)  AC_CHECK_FUNCS(touchlock)
2295  AC_CHECK_HEADERS(maillock.h)  AC_CHECK_HEADERS(maillock.h)
# Line 2222  AC_CHECK_FUNCS(gethostname getdomainname Line 2298  AC_CHECK_FUNCS(gethostname getdomainname
2298  rename closedir mkdir rmdir sysinfo \  rename closedir mkdir rmdir sysinfo \
2299  random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \  random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \
2300  strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \  strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \
2301  utimes setrlimit setpgid getcwd getwd shutdown strftime getaddrinfo \  utimes setrlimit setpgid getcwd getwd shutdown getaddrinfo \
2302  __fpending mblen mbrlen mbsinit strsignal setitimer ualarm index rindex \  __fpending mblen mbrlen mbsinit strsignal setitimer ualarm index rindex \
2303  sendto recvfrom getsockopt setsockopt getsockname getpeername \  sendto recvfrom getsockopt setsockopt getsockname getpeername \
2304  gai_strerror mkstemp getline getdelim mremap memmove fsync bzero \  gai_strerror mkstemp getline getdelim mremap memmove fsync bzero \
2305  memset memcmp memmove)  memset memcmp memmove difftime memcpy mempcpy mblen mbrlen posix_memalign)
2306    
2307  AC_CHECK_HEADERS(sys/un.h)  AC_CHECK_HEADERS(sys/un.h)
2308    
# Line 2241  AC_FUNC_FSEEKO Line 2317  AC_FUNC_FSEEKO
2317    
2318  AC_FUNC_GETPGRP  AC_FUNC_GETPGRP
2319    
2320    AC_FUNC_STRFTIME
2321    
2322  # UNIX98 PTYs.  # UNIX98 PTYs.
2323  AC_CHECK_FUNCS(grantpt)  AC_CHECK_FUNCS(grantpt)
2324    
# Line 2375  if test "x$HAVE_TIMEVAL" = xyes; then Line 2453  if test "x$HAVE_TIMEVAL" = xyes; then
2453    fi    fi
2454  fi  fi
2455    
2456    # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
2457    AC_STRUCT_TIMEZONE
2458    
2459  dnl Note that AC_STRUCT_TIMEZONE doesn't do what you might expect.  dnl Note that AC_STRUCT_TIMEZONE doesn't do what you might expect.
2460  if test "$ac_cv_func_gettimeofday" = yes; then  if test "$ac_cv_func_gettimeofday" = yes; then
2461    AC_CACHE_CHECK([for struct timezone], emacs_cv_struct_timezone,    AC_CACHE_CHECK([for struct timezone], emacs_cv_struct_timezone,
# Line 2418  dnl Fixme: Not used.  Should this be HAV Line 2499  dnl Fixme: Not used.  Should this be HAV
2499              [Define to 1 if you have inet sockets.])              [Define to 1 if you have inet sockets.])
2500  fi  fi
2501    
2502    AC_CHECK_HEADERS(sys/ioctl.h net/if.h)
2503    
2504  if test -f /usr/lpp/X11/bin/smt.exp; then  if test -f /usr/lpp/X11/bin/smt.exp; then
2505    AC_DEFINE(HAVE_AIX_SMT_EXP, 1,    AC_DEFINE(HAVE_AIX_SMT_EXP, 1,
2506              [Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists.])              [Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists.])
# Line 2447  fi Line 2530  fi
2530    
2531  AC_CHECK_TYPES(size_t)  AC_CHECK_TYPES(size_t)
2532    
2533    AC_TYPE_MBSTATE_T
2534    
2535  dnl Restrict could probably be used effectively other than in regex.c.  dnl Restrict could probably be used effectively other than in regex.c.
2536  AC_CACHE_CHECK([for C restrict keyword], emacs_cv_c_restrict,  AC_CACHE_CHECK([for C restrict keyword], emacs_cv_c_restrict,
2537    [AC_TRY_COMPILE([void fred (int *restrict x);], [],    [AC_TRY_COMPILE([void fred (int *restrict x);], [],
# Line 2474  if test "$emacs_cv_c_restrict_arr" = yes Line 2559  if test "$emacs_cv_c_restrict_arr" = yes
2559       declarations.  Define as empty for no equivalent.])       declarations.  Define as empty for no equivalent.])
2560  fi  fi
2561    
 AC_CHECK_HEADERS(nlist.h, [AC_DEFINE(NLIST_STRUCT, 1,  
                  [Define to 1 if you have <nlist.h>.])])  
   
2562  dnl Fixme: AC_SYS_POSIX_TERMIOS should probably be used, but it's not clear  dnl Fixme: AC_SYS_POSIX_TERMIOS should probably be used, but it's not clear
2563  dnl how the tty code is related to POSIX and/or other versions of termios.  dnl how the tty code is related to POSIX and/or other versions of termios.
2564    dnl The following looks like a useful start.
2565    dnl
2566    dnl AC_SYS_POSIX_TERMIOS
2567    dnl if test $ac_cv_sys_posix_termios = yes; then
2568    dnl    AC_DEFINE(HAVE_TERMIOS, 1, [Define to 1 if you have POSIX-style functions
2569    dnl                                and macros for terminal control.])
2570    dnl    AC_DEFINE(HAVE_TCATTR, 1, [Define to 1 if you have tcgetattr and tcsetattr.])
2571    dnl fi
2572    
2573  dnl Fixme: Use AC_FUNC_MEMCMP since memcmp is used.  (Needs libobj replacement.)  dnl Fixme: Use AC_FUNC_MEMCMP since memcmp is used.  (Needs libobj replacement.)
2574    
# Line 2645  AH_BOTTOM([ Line 2735  AH_BOTTOM([
2735  /* Turned on June 1996 supposing nobody will mind it.  */  /* Turned on June 1996 supposing nobody will mind it.  */
2736  #define AMPERSAND_FULL_NAME  #define AMPERSAND_FULL_NAME
2737    
2738    /* We have blockinput.h.  */
2739    #define DO_BLOCK_INPUT
2740    
2741  /* Define HAVE_SOUND if we have sound support.  We know it works  /* Define HAVE_SOUND if we have sound support.  We know it works
2742     and compiles only on the specified platforms.   For others,     and compiles only on the specified platforms.   For others,
2743     it probably doesn't make sense to try.  */     it probably doesn't make sense to try.  */
# Line 2721  AH_BOTTOM([ Line 2814  AH_BOTTOM([
2814  #define mktime emacs_mktime  #define mktime emacs_mktime
2815  #endif  #endif
2816    
2817    #define my_strftime nstrftime   /* for strftime.c */
2818    
2819  /* The rest of the code currently tests the CPP symbol BSTRING.  /* The rest of the code currently tests the CPP symbol BSTRING.
2820     Override any claims made by the system-description files.     Override any claims made by the system-description files.
2821     Note that on some SCO version it is possible to have bcopy and not bcmp.  */     Note that on some SCO version it is possible to have bcopy and not bcmp.  */
# Line 2843  typedef unsigned size_t; Line 2938  typedef unsigned size_t;
2938  #  endif  #  endif
2939  #endif  #endif
2940    
2941  /* avoid deprecated functions */  #ifndef HAVE_BCOPY
2942  #ifdef HAVE_MEMCPY  #define bcopy(a,b,s) memcpy (b,a,s)
2943  #  define bcopy(a,b,s) memcpy (b,a,s)  #endif
2944  #endif  #ifndef HAVE_BZERO
2945  #ifdef HAVE_MEMSET  #define bzero(a,s) memset (a,0,s)
2946  #  define bzero(a,s) memset (a,0,s)  #endif
2947  #endif  #ifndef HAVE_BCMP
2948  #ifdef HAVE_MEMCMP  #define BCMP memcmp
 #  define BCMP memcmp  
 #  define bcmp memcmp  
2949  #endif  #endif
2950    
2951  #endif /* EMACS_CONFIG_H */  #endif /* EMACS_CONFIG_H */
# Line 2997  touch src/config.stamp Line 3090  touch src/config.stamp
3090    
3091  ], [GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPP_NEED_TRADITIONAL="$CPP_NEED_TRADITIONAL" CPPFLAGS="$CPPFLAGS"])  ], [GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPP_NEED_TRADITIONAL="$CPP_NEED_TRADITIONAL" CPPFLAGS="$CPPFLAGS"])
3092    
3093    m4_if(dnl       Do not change this comment
3094       arch-tag: 156a4dd5-bddc-4d18-96ac-f37742cf6a5e
3095    )dnl

Legend:
Removed from v.1.299.2.1  
changed lines
  Added in v.1.299.2.2

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