Better warning messages.

[gedcom-parse.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index ac07948cde1ddf32d1c549be97cfd233fc687869..502ee42b7c6dffc376a086b409fdedd41e4bfb0d 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,56 +1,6 @@
 dnl $Id$
 dnl $Name$
 
-dnl From codeset.m4 (in libcharset):
-#serial 2
-
-dnl From Bruno Haible.
-
-AC_DEFUN(jm_LANGINFO_CODESET,
-[
-  AC_CHECK_HEADERS(langinfo.h)
-  AC_CHECK_FUNCS(nl_langinfo)
-
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], jm_cv_langinfo_codeset,
-    [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
-      jm_cv_langinfo_codeset=yes,
-      jm_cv_langinfo_codeset=no)
-    ])
-  if test $jm_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-  fi
-])
-
-dnl From glibc21.m4 (in libcharset):
-#serial 2
-
-# Test for the GNU C Library, version 2.1 or newer.
-# From Bruno Haible.
-
-AC_DEFUN(jm_GLIBC21,
-  [
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-      ac_cv_gnu_library_2_1,
-      [AC_EGREP_CPP([Lucky GNU user],
-       [
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-       ],
-       ac_cv_gnu_library_2_1=yes,
-       ac_cv_gnu_library_2_1=no)
-      ]
-    )
-    AC_SUBST(GLIBC21)
-    GLIBC21="$ac_cv_gnu_library_2_1"
-  ]
-)
-
 dnl Own functions
 dnl gedcom_GLIBC_ICONV()
 dnl Checks whether iconv is coming from glibc, defines USE_GLIBC_ICONV if so
@@ -130,3 +80,48 @@ AC_DEFUN(gedcom_LIBICONV_HAS_ANSEL, [
     fi
   ])
 ])
+
+dnl gedcom_SYS_NEWLINE()
+dnl Checks how newline is written on the system
+dnl SYS_NEWLINE is set to one of the following:
+dnl END_CR, END_LF, END_CR_LF, END_LF_CR
+AC_DEFUN(gedcom_SYS_NEWLINE, [
+  AC_CACHE_CHECK(how to represent newline, ac_cv_system_newline, [
+    echo > newlinetest
+    AC_TRY_RUN([
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdio.h>
+int main() {
+  char buffer[11];
+  int i, fd;
+  FILE* f;
+  for (i=0; i<10; i++) { buffer[i] = '\0'; }
+  fd = open("newlinetest", O_RDONLY);
+  if (fd == -1) return 1;
+  read(fd, buffer, 10);
+  close(fd);
+  f = fopen("newlinetest", "w");
+  if (!f) return 1;
+  i = 0;
+  while (buffer[i] != '\0') { fprintf(f, "%02x", buffer[i++]); }
+  fclose(f);
+  return 0;
+}
+    ],
+    [system_newline_output=`cat newlinetest`
+     case "$system_newline_output" in
+       0a0d) ac_cv_system_newline="\"\x0A\x0D\"" ;;
+       0d0a) ac_cv_system_newline="\"\x0D\x0A\"" ;;
+       0a)   ac_cv_system_newline="\"\x0A\"" ;;
+       0d)   ac_cv_system_newline="\"\x0D\"" ;;
+       *)    ac_cv_system_newline="\"\x0A\"" ;;
+     esac],
+    ac_cv_system_newline="\"\x0A\"",
+    ac_cv_system_newline="\"\x0A\"")
+    rm -f newlinetest
+  ])
+  AC_DEFINE_UNQUOTED(SYS_NEWLINE,$ac_cv_system_newline,
+    [The representation of newline in text files in the system])
+])