[BACK]Return to configure.in CVS log [TXT] [DIR] Up to [Public] / Amaya

Diff for /Amaya/configure.in between versions 1.4 and 1.5

version 1.4, 1997/05/13 15:41:04 version 1.5, 1997/05/14 08:52:41
Line 63  AC_PATH_X Line 63  AC_PATH_X
 AC_PATH_XTRA  AC_PATH_XTRA
   
 dnl  dnl
   dnl Checks for header files.
   dnl
   
   AC_HEADER_DIRENT
   AC_HEADER_STDC
   AC_HEADER_SYS_WAIT
   
   AC_CHECK_HEADERS(stdio.h)
   AC_CHECK_HEADERS(sys/types.h types.h)
   AC_CHECK_HEADERS(sys/unistd.h unistd.h)
   AC_CHECK_HEADERS(sys/fcntl.h fcntl.h)
   AC_CHECK_HEADERS(sys/limits.h limits.h)
   AC_CHECK_HEADERS(sys/stat.h stat.h)
   AC_CHECK_HEADERS(sys/file.h)
   AC_CHECK_HEADERS(sys/ioctl.h)
   AC_CHECK_HEADERS(sys/time.h time.h)
   AC_CHECK_HEADERS(sys/systeminfo.h)
   AC_CHECK_HEADERS(string.h strings.h)
   AC_CHECK_HEADERS(syslog.h)
   AC_CHECK_HEADERS(sys/socket.h socket.h)
   AC_CHECK_HEADERS(appkit/appkit.h appkit.h)
   AC_CHECK_HEADERS(netinet/in.h in.h)
   AC_CHECK_HEADERS(dn.h)
   AC_CHECK_HEADERS(sys/ipc.h)
   AC_CHECK_HEADERS(net/errno.h sys/errno.h errno.h)
   AC_CHECK_HEADERS(pwd.h)
   AC_CHECK_HEADERS(grp.h)
   AC_CHECK_HEADERS(arpa/inet.h inet.h)
   AC_CHECK_HEADERS(netdb.h)
   AC_CHECK_HEADERS(manifest.h)
   AC_CHECK_HEADERS(bsdtypes.h)
   AC_CHECK_HEADERS(stdefs.h)
   AC_CHECK_HEADERS(bsdtime.h)
   AC_CHECK_HEADERS(sys/select.h select.h)
   AC_CHECK_HEADERS(dnetdb.h)
   AC_CHECK_HEADERS(libc.h)
   AC_CHECK_HEADERS(stdlib.h)
   AC_CHECK_HEADERS(malloc.h)
   AC_CHECK_HEADERS(memory.h)
   AC_CHECK_HEADERS(unixlib.h)
   AC_CHECK_HEADERS(ctype.h)
   AC_CHECK_HEADERS(cursesX.h curses.h)
   AC_CHECK_HEADERS(sys/resource.h resource.h)
   AC_HEADER_DIRENT
   AC_CHECK_HEADERS(dir.h direct.h) dnl AC_HEADER_DIRENT only checks for some..
   AC_HEADER_STDC
   AC_HEADER_SYS_WAIT
   AC_HEADER_TIME
   AC_HEADER_STAT
   
   dnl
   dnl Checks for typedefs, structures, and compiler characteristics.
   dnl
   
   AC_C_CONST
   AC_C_INLINE
   AC_TYPE_MODE_T
   AC_TYPE_OFF_T
   AC_TYPE_SIZE_T
   AC_HEADER_TIME
   AC_STRUCT_TM
   AC_STRUCT_TIMEZONE
   AC_TYPE_UID_T
   
   dnl
   dnl Checks for library functions.
   dnl
   
   AC_FUNC_ALLOCA
   AC_TYPE_GETGROUPS
   AC_PROG_GCC_TRADITIONAL
   AC_FUNC_MEMCMP
   AC_FUNC_MMAP
   AC_TYPE_SIGNAL
   AC_FUNC_VPRINTF
   AC_CHECK_FUNCS(getcwd gethostname gettimeofday getwd mkdir mktime putenv select socket strdup strerror strftime strstr strtod strtol uname)
   
   dnl
 dnl Checking for Motif libraries and includes  dnl Checking for Motif libraries and includes
 dnl  dnl
 dnl Borrowed from Lesstif configure.in  dnl Borrowed from Lesstif configure.in
Line 162  do Line 240  do
       break 2        break 2
     fi      fi
   done    done
 done])  done
   LIBS="$ac_save_LIBS"
   ])
   
 AC_DEFUN(AC_PATH_MOTIF,  AC_DEFUN(AC_PATH_MOTIF,
 [AC_REQUIRE_CPP()dnl  [AC_REQUIRE_CPP()dnl
Line 194  fi # with_motif != no Line 274  fi # with_motif != no
   
 if test "$no_motif" = yes; then  if test "$no_motif" = yes; then
   AC_MSG_RESULT(no)    AC_MSG_RESULT(no)
     MOTIF_INCLUDES=
     MOTIF_LIBRARIES=
 else  else
   test "x$motif_includes" = xNONE && motif_includes=$ac_motif_includes    test "x$motif_includes" = xNONE && motif_includes=$ac_motif_includes
   test "x$motif_libraries" = xNONE && motif_libraries=$ac_motif_libraries    test "x$motif_libraries" = xNONE && motif_libraries=$ac_motif_libraries
   ac_cv_path_motif="no_motif= ac_motif_includes=$motif_includes ac_motif_libraries=$motif_libraries"    ac_cv_path_motif="no_motif= ac_motif_includes=$motif_includes ac_motif_libraries=$motif_libraries"
   AC_MSG_RESULT([libraries $motif_libraries, headers $motif_includes])    AC_MSG_RESULT([libraries $motif_libraries, headers $motif_includes])
   MOTIF_INCLUDES="$motif_includes"    if test "$motif_includes" != "/usr/include" ; then
   AC_SUBST(MOTIF_INCLUDES)      MOTIF_INCLUDES="-I$motif_includes"
   MOTIF_LIBRARIES="$motif_libraries"    fi
   AC_SUBST(MOTIF_LIBRARIES)    if test "$motif_libraries" != "/usr/lib" ; then
       MOTIF_LIBRARIES="-L$motif_libraries"
     fi
 fi  fi
   AC_SUBST(MOTIF_INCLUDES)
   AC_SUBST(MOTIF_LIBRARIES)
 ])  ])
   
 AC_PATH_MOTIF  AC_PATH_MOTIF
   
 dnl  
 dnl Checks for header files.  
 dnl  
   
 AC_HEADER_DIRENT  
 AC_HEADER_STDC  
 AC_HEADER_SYS_WAIT  
   
 AC_CHECK_HEADERS(stdio.h)  
 AC_CHECK_HEADERS(sys/types.h types.h)  
 AC_CHECK_HEADERS(sys/unistd.h unistd.h)  
 AC_CHECK_HEADERS(sys/fcntl.h fcntl.h)  
 AC_CHECK_HEADERS(sys/limits.h limits.h)  
 AC_CHECK_HEADERS(sys/stat.h stat.h)  
 AC_CHECK_HEADERS(sys/file.h)  
 AC_CHECK_HEADERS(sys/ioctl.h)  
 AC_CHECK_HEADERS(sys/time.h time.h)  
 AC_CHECK_HEADERS(sys/systeminfo.h)  
 AC_CHECK_HEADERS(string.h strings.h)  
 AC_CHECK_HEADERS(syslog.h)  
 AC_CHECK_HEADERS(sys/socket.h socket.h)  
 AC_CHECK_HEADERS(appkit/appkit.h appkit.h)  
 AC_CHECK_HEADERS(netinet/in.h in.h)  
 AC_CHECK_HEADERS(dn.h)  
 AC_CHECK_HEADERS(sys/ipc.h)  
 AC_CHECK_HEADERS(net/errno.h sys/errno.h errno.h)  
 AC_CHECK_HEADERS(pwd.h)  
 AC_CHECK_HEADERS(grp.h)  
 AC_CHECK_HEADERS(arpa/inet.h inet.h)  
 AC_CHECK_HEADERS(netdb.h)  
 AC_CHECK_HEADERS(manifest.h)  
 AC_CHECK_HEADERS(bsdtypes.h)  
 AC_CHECK_HEADERS(stdefs.h)  
 AC_CHECK_HEADERS(bsdtime.h)  
 AC_CHECK_HEADERS(sys/select.h select.h)  
 AC_CHECK_HEADERS(dnetdb.h)  
 AC_CHECK_HEADERS(libc.h)  
 AC_CHECK_HEADERS(stdlib.h)  
 AC_CHECK_HEADERS(malloc.h)  
 AC_CHECK_HEADERS(memory.h)  
 AC_CHECK_HEADERS(unixlib.h)  
 AC_CHECK_HEADERS(ctype.h)  
 AC_CHECK_HEADERS(cursesX.h curses.h)  
 AC_CHECK_HEADERS(sys/resource.h resource.h)  
 AC_HEADER_DIRENT  
 AC_CHECK_HEADERS(dir.h direct.h) dnl AC_HEADER_DIRENT only checks for some..  
 AC_HEADER_STDC  
 AC_HEADER_SYS_WAIT  
 AC_HEADER_TIME  
 AC_HEADER_STAT  
   
 dnl  
 dnl Checks for typedefs, structures, and compiler characteristics.  
 dnl  
   
 AC_C_CONST  
 AC_C_INLINE  
 AC_TYPE_MODE_T  
 AC_TYPE_OFF_T  
 AC_TYPE_SIZE_T  
 AC_HEADER_TIME  
 AC_STRUCT_TM  
 AC_STRUCT_TIMEZONE  
 AC_TYPE_UID_T  
   
 dnl  
 dnl Checks for library functions.  
 dnl  
   
 AC_FUNC_ALLOCA  
 AC_TYPE_GETGROUPS  
 AC_PROG_GCC_TRADITIONAL  
 AC_FUNC_MEMCMP  
 AC_FUNC_MMAP  
 AC_TYPE_SIGNAL  
 AC_FUNC_VPRINTF  
 AC_CHECK_FUNCS(getcwd gethostname gettimeofday getwd mkdir mktime putenv select socket strdup strerror strftime strstr strtod strtol uname)  
   
 dnl  ***************************************************************  dnl  ***************************************************************
 dnl  dnl
 dnl    SPECIFIC STUFF : CONFIGURATION OPTIONS FOR THOT AND AMAYA  dnl    SPECIFIC STUFF : CONFIGURATION OPTIONS FOR THOT AND AMAYA
Line 301  dnl Line 309  dnl
 dnl Check when building with Insure from Parasoft  dnl Check when building with Insure from Parasoft
 dnl  dnl
   
 AC_ARG_WITH(thot, --{with|without}-insure : Uses Insure Parasoft debugger)  AC_ARG_WITH(insure, [  --with-insure           Uses Insure Parasoft debugger])
 if test "$with_insure" = "no" ; then  if test "$with_insure" = "yes" ; then
     build_thot="no"      CC=insight
 fi  fi
   
 dnl  dnl
 dnl Check for availability of amaya and thot editor sources  dnl Check for availability of amaya and thot editor sources
 dnl  dnl
   
 AC_ARG_WITH(thot, --{with|without}-thot : Build the Thot editor or not)  AC_ARG_WITH(thot, [  --with-thot             Build the Thot editor])
 AC_ARG_WITH(amaya, --{with |without}-amaya : Build the Amaya HTML browser/editor or not)  AC_ARG_WITH(amaya, [  --with-amaya            Build the Amaya HTML browser/editor])
   
 build_thot="yes"  build_thot="yes"
 build_amaya="yes"  build_amaya="yes"
Line 368  dnl Check for additionnal packages kaffe Line 376  dnl Check for additionnal packages kaffe
 dnl use AC_CONFIG_SUBDIRS to launch configure in the subdir  dnl use AC_CONFIG_SUBDIRS to launch configure in the subdir
 dnl  dnl
   
 AC_ARG_ENABLE(java, --{enable|disable}-java : With or without Kaffe Java virtual machine)  AC_ARG_ENABLE(java, [  --enable-java           Add Kaffe Java virtual machine])
 AC_ARG_ENABLE(plugin, --{enable|disable}-plugin : With or without support for Netscape Plug-Ins)  AC_ARG_ENABLE(plugin, [  --enable-plugin         Add Netscape Plug-Ins support])
   
 if test "$enable_java" = "no" ; then  if test "$enable_java" = "no" ; then
     with_java="no"      with_java="no"
Line 404  if test "$build_amaya" = "yes" ; then Line 412  if test "$build_amaya" = "yes" ; then
             build_amaya="no"              build_amaya="no"
         fi          fi
     fi      fi
   
     if test "$with_java" = "yes" -a "$with_plugin" = "yes" ; then  
        AC_MSG_WARN(Amaya configured with both Java and Plugins support)  
        AC_MSG_WARN(Beware this combination doesn't work well)  
     fi  
 fi  fi
   
 dnl  dnl
Line 503  make_output="Makefile Options.orig:Optio Line 506  make_output="Makefile Options.orig:Optio
        libjpeg/Makefile libpng/Makefile libpng/zlib/Makefile \         libjpeg/Makefile libpng/Makefile libpng/zlib/Makefile \
        tools/mkdep/Makefile \         tools/mkdep/Makefile \
        tools/cextract-1.7/Makefile thotlib/Makefile \         tools/cextract-1.7/Makefile thotlib/Makefile \
        thotlib/include/Makefile batch/Makefile tablelib/Makefile \         thotlib/include/Makefile batch/Makefile tablelib/Makefile"
        drawlib/Makefile indexlib/Makefile"  
   
 if test "$build_amaya" = "yes" ; then  if test "$build_amaya" = "yes" ; then
   
Line 524  fi Line 526  fi
   
 if test "$build_thot" = "yes" ; then  if test "$build_thot" = "yes" ; then
   
     make_output="$make_output thot/Makefile"      make_output="$make_output thot/Makefile \
   drawlib/Makefile indexlib/Makefile"
   
     EXTRA_MAKEFILE_IN="$EXTRA_MAKEFILE_IN \      EXTRA_MAKEFILE_IN="$EXTRA_MAKEFILE_IN \
 $srcdir/thot/Makefile.in"  $srcdir/thot/Makefile.in \
   $srcdir/drawlib/Makefile.in \
   $srcdir/indexlib/Makefile.in"
   
     if test "$build_misc" = "yes" ; then      if test "$build_misc" = "yes" ; then
   
Line 591  else Line 597  else
 fi  fi
   
 if test "$build_amaya" = "yes" ; then  if test "$build_amaya" = "yes" ; then
     if test "$with_java" = "yes" ; then      if test "$with_java" = "yes" -a "$with_plugin" = "yes" ; then
         echo Amaya configured with Java support          AC_MSG_WARN(Amaya configured with both Java and Plugins support)
           AC_MSG_WARN(Beware this combination doesn't work well)
     else      else
         echo Amaya configured with libWWW          if test "$with_java" = "yes" ; then
     fi              echo Amaya configured with Java support
     if test "$with_plugin" = "yes" ; then          else
         echo Amaya configured with Plugins support              echo Amaya configured with libWWW
           fi
           if test "$with_plugin" = "yes" ; then
               echo Amaya configured with Plugins support
           fi
     fi      fi
 fi  fi
   
   if test "$no_motif" = yes ; then
       echo "Motif seems not installed on this machine"
       echo "Thot and Amaya need Motif 1.2 or 2.0"
       echo "Thot and Amaya probably won't compile"
   else
   if test "$motif_includes" = "" ; then
       echo "Motif includes were not found"
       echo "Thot and Amaya might not compile"
       echo "Edit your Option file"
   else
   if test "$motif_libraries" = "" ; then
       echo "Motif libraries were not found"
       echo "Thot and Amaya might not compile"
       echo "Edit your Option file"
   fi
   fi
   fi
   
 echo "Now start \"make all\" (GNU make preferably) to build the binaries"  echo "Now start \"make all\" (GNU make preferably) to build the binaries"
   
Removed from v.1.4  
changed lines
  Added in v.1.5

Webmaster