Cleaned up configure.in. Commented out checks for libraries, headers, typedefs, structs, etc that I"m not absolutely 100% sure are being used. Added $(TINC) to GARBAGE in Makefile.ins. unlabeled-1.1.2
authorcls%seawood.org
Mon, 19 Jul 1999 03:49:29 +0000
branchunlabeled-1.1.2
changeset 712 efb6e4cfeb5365afe628ce59cd27ab5310f81bf9
parent 699 068dd307b90fd6266788a5dab515518e2c42abfd
child 729 15f052f8fec75392f33fafbdda7894e1488db37c
push idunknown
push userunknown
push dateunknown
Cleaned up configure.in. Commented out checks for libraries, headers, typedefs, structs, etc that I"m not absolutely 100% sure are being used. Added $(TINC) to GARBAGE in Makefile.ins.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -73,17 +73,19 @@ AC_ARG_ENABLE(target,
     MOZ_TARGET=`echo $enableval | tr A-Z a-z`,
     MOZ_TARGET=)
 
 if test "$MOZ_DEBUG"; then
     CFLAGS="$CFLAGS -g"
     CXXFLAGS="$CXXFLAGS -g"
 fi
 
-dnl Checks for programs.
+dnl ========================================================
+dnl Checks for compilers.
+dnl ========================================================
 if test "$target" != "$host"; then
     echo "cross compiling from $host to $target"
     cross_compiling=yes
 
     _SAVE_CC="$CC"
     _SAVE_CFLAGS="$CFLAGS"
     _SAVE_LDFLAGS="$LDFLAGS"
 
@@ -150,32 +152,43 @@ else
     if test -z "$HOSTCC"; then
 	HOSTCC="$CC"
     fi
     if test -z "$HOSTCFLAGS"; then
 	HOSTCFLAGS="$CFLAGS"
     fi
 fi
 
+dnl ========================================================
+dnl Checks for programs.
+dnl ========================================================
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PATH_PROGS(PERL, perl5 perl, :)
 
-dnl Defaults
+dnl ========================================================
+dnl Default platform specific options
+dnl ========================================================
 OBJ_SUFFIX=o
 LIB_SUFFIX=a
 DLL_SUFFIX=so
 MKSHLIB='$(CCC) -shared -o $@'
 
+dnl ========================================================
+dnl Override of system specific host options
+dnl ========================================================
 case "$host" in
 *-linux*)
     HOSTCFLAGS="$HOSTCFLAGS -DXP_UNIX"
     ;;
 esac
 
+dnl ========================================================
+dnl Override of system specific target options
+dnl ========================================================
 case "$target" in
 i?86-*-linux*)
     MDCPUCFG_H=_linux.cfg
     PR_MD_CSRCS=linux.c
     PR_MD_ASFILES=
     PR_MD_ARCH_DIR=unix
     if test "$USE_PTHREADS" = 1 ; then
 	DEFINES="$DEFINES -D_REENTRANT"
@@ -240,93 +253,84 @@ alpha-*-linux*)
 	;;
     *)
 	DEFINES="$DEFINES -D_CPU_ARCH_NOT_DEFINED"
 	;;
     esac
     ;;
 esac
 
-dnl Replace `main' with a function in -lC:
-AC_CHECK_LIB(C, main)
-dnl Replace `main' with a function in -lC_r:
-AC_CHECK_LIB(C_r, main)
-dnl Replace `main' with a function in -lc:
-AC_CHECK_LIB(c, main)
-dnl Replace `main' with a function in -lc_r:
-AC_CHECK_LIB(c_r, main)
-dnl Replace `main' with a function in -ldce:
-AC_CHECK_LIB(dce, main)
-dnl Replace `main' with a function in -ldl:
-AC_CHECK_LIB(dl, main)
-dnl Replace `main' with a function in -ldld:
-AC_CHECK_LIB(dld, main)
-dnl Replace `main' with a function in -lgen:
-AC_CHECK_LIB(gen, main)
-dnl Replace `main' with a function in -lip6:
-AC_CHECK_LIB(ip6, main)
-dnl Replace `main' with a function in -ll:
-AC_CHECK_LIB(l, main)
-dnl Replace `main' with a function in -lm:
-AC_CHECK_LIB(m, main)
-dnl Replace `main' with a function in -lnsl:
-AC_CHECK_LIB(nsl, main)
-dnl Replace `main' with a function in -lposix4:
-AC_CHECK_LIB(posix4, main)
-dnl Replace `main' with a function in -lprstrms:
-AC_CHECK_LIB(prstrms, main)
-dnl Replace `main' with a function in -lprstrms_shr:
-AC_CHECK_LIB(prstrms_shr, main)
-dnl Replace `main' with a function in -lpthread:
-AC_CHECK_LIB(pthread, main)
-dnl Replace `main' with a function in -lpthreads:
-AC_CHECK_LIB(pthreads, main)
-dnl Replace `main' with a function in -lresolv:
-AC_CHECK_LIB(resolv, main)
-dnl Replace `main' with a function in -lrt:
-AC_CHECK_LIB(rt, main)
-dnl Replace `main' with a function in -lsocket:
-AC_CHECK_LIB(socket, main)
-dnl Replace `main' with a function in -lsvld:
-AC_CHECK_LIB(svld, main)
-dnl Replace `main' with a function in -lthread:
-AC_CHECK_LIB(thread, main)
-dnl Replace `main' with a function in -lvms_jackets:
-AC_CHECK_LIB(vms_jackets, main)
+dnl ========================================================
+dnl Check for system libraries
+dnl ========================================================
+dnl AC_CHECK_LIB(C, main)
+dnl AC_CHECK_LIB(C_r, main)
+dnl AC_CHECK_LIB(c, main)
+dnl AC_CHECK_LIB(c_r, main)
+dnl AC_CHECK_LIB(dce, main)
+dnl AC_CHECK_LIB(dl, main)
+dnl AC_CHECK_LIB(dld, main)
+dnl AC_CHECK_LIB(gen, main)
+dnl AC_CHECK_LIB(ip6, main)
+dnl AC_CHECK_LIB(l, main)
+dnl AC_CHECK_LIB(m, main)
+dnl AC_CHECK_LIB(nsl, main)
+dnl AC_CHECK_LIB(posix4, main)
+dnl AC_CHECK_LIB(prstrms, main)
+dnl AC_CHECK_LIB(prstrms_shr, main)
+dnl AC_CHECK_LIB(pthread, main)
+dnl AC_CHECK_LIB(pthreads, main)
+dnl AC_CHECK_LIB(resolv, main)
+dnl AC_CHECK_LIB(rt, main)
+dnl AC_CHECK_LIB(socket, main)
+dnl AC_CHECK_LIB(svld, main)
+dnl AC_CHECK_LIB(thread, main)
+dnl AC_CHECK_LIB(vms_jackets, main)
 
-dnl Checks for header files.
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h limits.h sys/file.h sys/ioctl.h sys/time.h unistd.h)
+dnl ========================================================
+dnl Check for system header files.
+dnl ========================================================
+dnl AC_HEADER_DIRENT
+dnl AC_HEADER_STDC
+dnl AC_HEADER_SYS_WAIT
+dnl AC_CHECK_HEADERS(fcntl.h limits.h sys/file.h sys/ioctl.h sys/time.h unistd.h)
 
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_UID_T
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_STRUCT_ST_BLKSIZE
-AC_STRUCT_ST_BLOCKS
-AC_STRUCT_ST_RDEV
-AC_HEADER_TIME
-AC_STRUCT_TM
+dnl ========================================================
+dnl Check for typedefs and structs
+dnl ========================================================
+dnl AC_C_CONST
+dnl AC_TYPE_UID_T
+dnl AC_TYPE_MODE_T
+dnl AC_TYPE_OFF_T
+dnl AC_TYPE_PID_T
+dnl AC_TYPE_SIZE_T
+dnl AC_STRUCT_ST_BLKSIZE
+dnl AC_STRUCT_ST_BLOCKS
+dnl AC_STRUCT_ST_RDEV
+dnl AC_HEADER_TIME
+dnl AC_STRUCT_TM
 
+dnl ========================================================
 dnl Checks for library functions.
+dnl ========================================================
 AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MEMCMP
-AC_FUNC_MMAP
+AC_CHECK_FUNCS(lchown strerror)
+
+dnl AC_FUNC_MEMCMP
+dnl AC_FUNC_MMAP
 dnl AC_FUNC_SETVBUF_REVERSED
-AC_FUNC_STRCOLL
-AC_FUNC_STRFTIME
-AC_FUNC_UTIME_NULL
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(ftime getcwd gethostname gettimeofday getwd mkdir mktime putenv rmdir select socket strdup strerror strstr strtol strtoul uname)
+dnl AC_FUNC_STRCOLL
+dnl AC_FUNC_STRFTIME
+dnl AC_FUNC_UTIME_NULL
+dnl AC_FUNC_VPRINTF
+dnl AC_CHECK_FUNCS(ftime getcwd gethostname gettimeofday getwd mkdir mktime putenv rmdir select socket strdup strerror strstr strtol strtoul uname)
 
+dnl ========================================================
+dnl Substitution of found variables.
+dnl ========================================================
 AC_SUBST(CC)
 AC_SUBST(CXX)
 AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(HOSTCC)
 AC_SUBST(HOSTCFLAGS)
 
 AC_SUBST(USE_PTHREADS)
@@ -348,16 +352,19 @@ AC_SUBST(MKSHLIB)
 AC_SUBST(DEFINES)
 AC_SUBST(DEFS)
 AC_SUBST(AR)
 AC_SUBST(DLLTOOL)
 AC_SUBST(WINDRES)
 AC_SUBST(RANLIB)
 AC_SUBST(PERL)
 
+dnl ========================================================
+dnl Generate output files.
+dnl ========================================================
 AC_OUTPUT(
 Makefile 
 config/Makefile
 config/autoconf.mk
 lib/Makefile 
 lib/ds/Makefile 
 lib/libc/Makefile 
 lib/libc/include/Makefile