X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=configure.ac;h=d380827795583a1f6d15f4f4a0f0268dd17584a6;hb=7fc2e450ac68fab9427f89fcd9354f506a4204cb;hp=4bdbb37980e0bcf2457ce4a5f2a13eda1299dead;hpb=f517b7647e28e95081e9392c6989fc6e5d4d6a9e;p=lha%2Flha.git

diff --git a/configure.ac b/configure.ac
index 4bdbb37..d380827 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT([LHa for UNIX], 1.14i-ac20020729, jca02266@nifty.ne.jp, lha)
+AC_INIT([LHa for UNIX], 1.14i-ac20030510, jca02266@nifty.ne.jp, lha)
+AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
@@ -22,7 +23,7 @@ AC_SEARCH_LIBS(opendir, [mingwex])
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h limits.h sys/file.h sys/param.h sys/time.h)
-AC_CHECK_HEADERS(pwd.h grp.h utime.h)
+AC_CHECK_HEADERS(pwd.h grp.h utime.h inttypes.h stdint.h fnmatch.h)
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -30,7 +31,8 @@ AC_HEADER_TIME
 AC_STRUCT_TM
 AC_STRUCT_TIMEZONE
 
-AC_CHECK_TYPES([uid_t, gid_t])
+AC_CHECK_SIZEOF(long)
+AC_CHECK_TYPES([uid_t, gid_t, long long, uint64_t, ssize_t])
 AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct stat.st_ino],,,
 [
 #if HAVE_SYS_TYPES_H
@@ -53,14 +55,15 @@ AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct stat.st_ino],,,
 
 # Checks for library functions.
 AC_TYPE_SIGNAL
-AC_FUNC_FORK
 AC_FUNC_UTIME_NULL
+AC_FUNC_FNMATCH
+AC_FUNC_FSEEKO
 AC_CHECK_FUNCS(strchr strdup memcpy memset memmove strcasecmp)
 AC_CHECK_FUNCS(mktime timelocal tzset ftime gettimeofday utime)
-AC_CHECK_FUNCS(mkdir rmdir ftruncate lchown mkstemp link)
+AC_CHECK_FUNCS(ftruncate chsize lchown mkstemp ftello)
 AC_CHECK_FUNCS(getpwuid getgrgid getpwnam getgrnam)
-AC_CHECK_FUNCS(iconv)
-AC_REPLACE_FUNCS(vsnprintf)
+AC_CHECK_FUNCS(iconv basename)
+AC_REPLACE_FUNCS(vsnprintf fnmatch)
 
 if test $ac_header_dirent = no; then
   AC_LIBOBJ(lhdir)
@@ -68,7 +71,7 @@ fi
 
 # checking whether 8 bit clean or not
 AC_CACHE_CHECK([whether strchr()/strrchr() is 8bit clean],
-  [lha_cv_strchr_8bit_clean],
+  [lha_cv_func_strchr_8bit_clean],
   AC_TRY_RUN([
 #if STDC_HEADERS
 # include <string.h>
@@ -83,28 +86,68 @@ char *strchr (), *strrchr ();
 main()
 {
   char *s = "\377";
-  if (strchr(s, 0xff) != s) return 1;
-  if (strchr(s, '\377') != s) return 1;
-  if (strrchr(s, 0xff) != s) return 1;
-  if (strrchr(s, '\377') != s) return 1;
-  return 0; /* ok */
+  if (strchr(s, 0xff) != s) exit(1);
+  if (strchr(s, '\377') != s) exit(1);
+  if (strrchr(s, 0xff) != s) exit(1);
+  if (strrchr(s, '\377') != s) exit(1);
+  exit(0); /* ok */
 }
-], lha_cv_strchr_8bit_clean=yes,
-   lha_cv_strchr_8bit_clean=no,
-   lha_cv_strchr_8bit_clean=no))
+], lha_cv_func_strchr_8bit_clean=yes,
+   lha_cv_func_strchr_8bit_clean=no,
+   lha_cv_func_strchr_8bit_clean=no))
 
-if test x$lha_cv_strchr_8bit_clean = xyes; then
+if test x$lha_cv_func_strchr_8bit_clean = xyes; then
   AC_DEFINE(STRCHR_8BIT_CLEAN, 1,
 	    [Define to 1 if strchr()/strrchr() works correctly.])
 fi
 
+# checking whether the 2nd argument of gettimeofday() is effective or not.
+# note that this timezone argument is obsolete.
+AC_CACHE_CHECK([whether the 2nd argument of gettimeofday() is effective],
+  [lha_cv_func_gettimeofday_2nd_arg],
+  AC_TRY_RUN([
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
+main()
+{
+    struct timeval tv;
+    struct timezone tz;
+
+    tz.tz_minuteswest = -1;
+    if (gettimeofday(&tv, &tz) == -1)
+        exit(1);
+
+    if (tz.tz_minuteswest == -1)
+        exit(1);	/* the timezone information is no given */
+
+    exit(0);
+}], lha_cv_func_gettimeofday_2nd_arg=yes,
+   lha_cv_func_gettimeofday_2nd_arg=no,
+   lha_cv_func_gettimeofday_2nd_arg=no))
+
+if test x$lha_cv_func_gettimeofday_2nd_arg = xyes; then
+  AC_DEFINE(GETTIMEOFDAY_HAS_2ND_ARG, 1,
+	    [Define to 1 if the 2nd argument of gettimeofday() is effective.])
+fi
+
 # support kanji code conversion
 AC_SUBST(DEF_KCODE)
-AC_ARG_ENABLE(text_conv,
+AC_MSG_CHECKING(kanji code conversion on text file)
+AC_ARG_ENABLE(text-conv,
   AC_HELP_STRING([--enable-text-conv],
 		 [support text code convert from/to EUC [[default=yes]]]),
   , enable_text_conv=yes)
 
+AC_MSG_RESULT($enable_text_conv)
 if test $enable_text_conv = yes; then
   DEF_KCODE=-DEUC
 fi
@@ -114,8 +157,8 @@ AC_SUBST(SUPPORT_LZHUFF_METHOD)
 SUPPORT_LZHUFF_METHOD=-DSUPPORT_LH7
 
 # whether use the -lh567- method
-AC_MSG_CHECKING(default archive method is )
-AC_ARG_WITH(default_method,
+AC_MSG_CHECKING(default archive method)
+AC_ARG_WITH(default-method,
   AC_HELP_STRING([--with-default-method=[[567]]],
 		 [create the -lh[[567]]- archive default [[default=5]]]),
   [case $withval in
@@ -127,8 +170,8 @@ AC_MSG_RESULT(-lh$with_default_method-)
 AC_DEFINE_UNQUOTED(DEFAULT_LZHUFF_METHOD, LZHUFF${with_default_method}_METHOD_NUM, [Define it to 5, 6 or 7 which you want to use -lhX- method, default])
 
 # decide temporary path names
-AC_MSG_CHECKING(template of the temporary file is )
-AC_ARG_WITH(tmp_file,
+AC_MSG_CHECKING(template of the temporary file)
+AC_ARG_WITH(tmp-file,
   AC_HELP_STRING([--with-tmp-file=TEMPLATE],
 		 [temporary file template [[default=/tmp/lhXXXXXX]]]),
   [case $withval in
@@ -136,6 +179,7 @@ AC_ARG_WITH(tmp_file,
    no)   ;;
    esac],
   with_tmp_file=/tmp/lhXXXXXX)
+
 AC_MSG_RESULT($with_tmp_file)
 if test x"$with_tmp_file" != xno; then
   AC_DEFINE_UNQUOTED(TMP_FILENAME_TEMPLATE, "$with_tmp_file",
@@ -143,19 +187,22 @@ if test x"$with_tmp_file" != xno; then
 fi
 
 # incremental indicator
+AC_MSG_CHECKING(whether incremental indicator is needed)
 AC_ARG_ENABLE(indicator,
   AC_HELP_STRING([--enable-indicator],
 		 [need incremental indicator [[default=yes]]]),
   ,
   # default
   enable_indicator=yes)
+
+AC_MSG_RESULT($enable_indicator)
 if test "x$enable_indicator" = xyes; then
   AC_DEFINE(NEED_INCREMENTAL_INDICATOR, 1,
 	    [Define to 1 if you want to use the incremental indicator])
 fi
 
 # support multibyte filename
-AC_MSG_CHECKING(kanji code for filename is )
+AC_MSG_CHECKING(kanji code of filename)
 AC_ARG_ENABLE(multibyte-filename,
   AC_HELP_STRING([--enable-multibyte-filename],
 		 [support multibyte filename. specify kanji code (euc, sjis, utf8 or auto) [[default=auto]]]),,
@@ -194,29 +241,51 @@ if test x$enable_multibyte_filename != xno; then
 fi
 
 # make user/group name extented header
+AC_MSG_CHECKING(whether user/group name extended header is needed)
 AC_ARG_ENABLE(user-name-header,
   AC_HELP_STRING([--enable-user-name-header],
 		 [make user/group name extended header [[default=no]]]),
   ,
   # default
   enable_user_name_header=no)
-if test "x$user_name_header" = xyes; then
+
+AC_MSG_RESULT($enable_user_name_header)
+if test "x$enable_user_name_header" = xyes; then
   AC_DEFINE(INCLUDE_OWNER_NAME_IN_HEADER, 1,
             [Define to 1 if you want to use the user/group name extened header])
 fi
 
 # backup old archive file
-AC_ARG_ENABLE(backup_archive,
+AC_MSG_CHECKING(whether backup file for old archive is left)
+AC_ARG_ENABLE(backup-archive,
   AC_HELP_STRING([--enable-backup-archive],
 		 [backup old archive [[default=no]]]),
   ,
   # default
   enable_backup_archive=no)
+
+AC_MSG_RESULT($enable_backup_archive)
 if test "x$enable_backup_archive" = xyes; then
   AC_DEFINE(BACKUP_OLD_ARCHIVE, 1,
 	    [Define to 1 if you want to leave an old archive])
 fi
 
-AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
+# enable this option if you need to ignore '.file' files
+# (mainly for the Mac OS X) *experimental*
+AC_MSG_CHECKING(whether enable -X option which ignore dot files)
+AC_ARG_ENABLE(ignore-dot-files,
+  AC_HELP_STRING([--enable-ignore-dot-files],
+		 [enable -X option [[default=no]]]),
+  ,
+  # default
+  enable_ignore_dot_files=no)
+
+AC_MSG_RESULT($enable_ignore_dot_files)
+if test "x$enable_ignore_dot_files" = xyes; then
+  AC_DEFINE(IGNORE_DOT_FILES, 1,
+	    [Define to 1 if you want to ignore dot files with -X command line switch])
+fi
+
+AC_CONFIG_FILES([Makefile src/Makefile man/Makefile olddoc/Makefile])
 AC_CONFIG_FILES([tests/Makefile tests/lha-test])
 AC_OUTPUT