See ChangeLog: Sun Jan 3 15:28:44 CET 1999 Werner Koch
[gnupg.git] / acinclude.m4
index 5f7c562..ab6fbf3 100644 (file)
 dnl macros to configure g10
 
 
-dnl WK_MSG_PRINT(STRING)
+dnl GNUPG_MSG_PRINT(STRING)
 dnl print a message
 dnl
-define(WK_MSG_PRINT,
+define(GNUPG_MSG_PRINT,
   [ echo $ac_n "$1"" $ac_c" 1>&AC_FD_MSG
   ])
 
 
-dnl WK_CHECK_TYPEDEF(TYPE, HAVE_NAME)
+dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME)
 dnl Check whether a typedef exists and create a #define $2 if it exists
 dnl
-AC_DEFUN(WK_CHECK_TYPEDEF,
+AC_DEFUN(GNUPG_CHECK_TYPEDEF,
   [ AC_MSG_CHECKING(for $1 typedef)
-    AC_CACHE_VAL(wk_cv_typedef_$1,
+    AC_CACHE_VAL(gnupg_cv_typedef_$1,
     [AC_TRY_COMPILE([#include <stdlib.h>
     #include <sys/types.h>], [
     #undef $1
     int a = sizeof($1);
-    ], wk_cv_typedef_$1=yes, wk_cv_typedef_$1=no )])
-    AC_MSG_RESULT($wk_cv_typedef_$1)
-    if test "$wk_cv_typedef_$1" = yes; then
-       AC_DEFINE($2)
+    ], gnupg_cv_typedef_$1=yes, gnupg_cv_typedef_$1=no )])
+    AC_MSG_RESULT($gnupg_cv_typedef_$1)
+    if test "$gnupg_cv_typedef_$1" = yes; then
+        AC_DEFINE($2)
     fi
   ])
 
 
 
-dnl WK_LINK_FILES( SRC, DEST )
+dnl GNUPG_LINK_FILES( SRC, DEST )
 dnl same as AC_LINK_FILES, but collect the files to link in
 dnl some special variables and do the link
-dnl when WK_DO_LINK_FILES is called
+dnl when GNUPG_DO_LINK_FILES is called
 dnl This is a workaround for AC_LINK_FILES, because it does not work
 dnl correct when using a caching scheme
 dnl
-define(WK_LINK_FILES,
+define(GNUPG_LINK_FILES,
   [ if test "x$wk_link_files_src" = "x"; then
-       wk_link_files_src="$1"
-       wk_link_files_dst="$2"
+        wk_link_files_src="$1"
+        wk_link_files_dst="$2"
     else
-       wk_link_files_src="$wk_link_files_src $1"
-       wk_link_files_dst="$wk_link_files_dst $2"
+        wk_link_files_src="$wk_link_files_src $1"
+        wk_link_files_dst="$wk_link_files_dst $2"
     fi
   ])
-define(WK_DO_LINK_FILES,
+define(GNUPG_DO_LINK_FILES,
   [ AC_LINK_FILES( $wk_link_files_src, $wk_link_files_dst )
   ])
 
 
-dnl WK_CHECK_ENDIAN
+dnl GNUPG_CHECK_ENDIAN
 dnl define either LITTLE_ENDIAN_HOST or BIG_ENDIAN_HOST
 dnl
-define(WK_CHECK_ENDIAN,
+define(GNUPG_CHECK_ENDIAN,
   [ if test "$cross_compiling" = yes; then
-       AC_MSG_WARN(cross compiling; assuming little endianess)
+        AC_MSG_WARN(cross compiling; assuming little endianess)
     fi
     AC_MSG_CHECKING(endianess)
-    AC_CACHE_VAL(wk_cv_c_endian,
-      [ wk_cv_c_endian=unknown
-       # See if sys/param.h defines the BYTE_ORDER macro.
-       AC_TRY_COMPILE([#include <sys/types.h>
-       #include <sys/param.h>], [
-       #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
-        bogus endian macros
-       #endif], [# It does; now see whether it defined to BIG_ENDIAN or not.
-       AC_TRY_COMPILE([#include <sys/types.h>
-       #include <sys/param.h>], [
-       #if BYTE_ORDER != BIG_ENDIAN
-        not big endian
-       #endif], wk_cv_c_endian=big, wk_cv_c_endian=little)])
-       if test "$wk_cv_c_endian" = unknown; then
-           AC_TRY_RUN([main () {
-             /* Are we little or big endian?  From Harbison&Steele.  */
-             union
-             {
-               long l;
-               char c[sizeof (long)];
-             } u;
-             u.l = 1;
-             exit (u.c[sizeof (long) - 1] == 1);
-             }],
-             wk_cv_c_endian=little,
-             wk_cv_c_endian=big,
-             wk_cv_c_endian=little
-           )
-       fi
+    AC_CACHE_VAL(gnupg_cv_c_endian,
+      [ gnupg_cv_c_endian=unknown
+        # See if sys/param.h defines the BYTE_ORDER macro.
+        AC_TRY_COMPILE([#include <sys/types.h>
+        #include <sys/param.h>], [
+        #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+         bogus endian macros
+        #endif], [# It does; now see whether it defined to BIG_ENDIAN or not.
+        AC_TRY_COMPILE([#include <sys/types.h>
+        #include <sys/param.h>], [
+        #if BYTE_ORDER != BIG_ENDIAN
+         not big endian
+        #endif], gnupg_cv_c_endian=big, gnupg_cv_c_endian=little)])
+        if test "$gnupg_cv_c_endian" = unknown; then
+            AC_TRY_RUN([main () {
+              /* Are we little or big endian?  From Harbison&Steele.  */
+              union
+              {
+                long l;
+                char c[sizeof (long)];
+              } u;
+              u.l = 1;
+              exit (u.c[sizeof (long) - 1] == 1);
+              }],
+              gnupg_cv_c_endian=little,
+              gnupg_cv_c_endian=big,
+              gnupg_cv_c_endian=little
+            )
+        fi
       ])
-    AC_MSG_RESULT([$wk_cv_c_endian])
-    if test "$wk_cv_c_endian" = little; then
+    AC_MSG_RESULT([$gnupg_cv_c_endian])
+    if test "$gnupg_cv_c_endian" = little; then
       AC_DEFINE(LITTLE_ENDIAN_HOST)
     else
       AC_DEFINE(BIG_ENDIAN_HOST)
     fi
   ])
 
-dnl WK_CHECK_CACHE
+dnl GNUPG_CHECK_CACHE
 dnl
-define(WK_CHECK_CACHE,
+define(GNUPG_CHECK_CACHE,
   [ AC_MSG_CHECKING(cached information)
-    wk_hostcheck="$target"
-    AC_CACHE_VAL(wk_cv_hostcheck, [ wk_cv_hostcheck="$wk_hostcheck" ])
-    if test "$wk_cv_hostcheck" != "$wk_hostcheck"; then
-       AC_MSG_RESULT(changed)
-       AC_MSG_WARN(config.cache exists!)
-       AC_MSG_ERROR(you must do 'make distclean' first to compile for
-                different target or different parameters.)
+    gnupg_hostcheck="$target"
+    AC_CACHE_VAL(gnupg_cv_hostcheck, [ gnupg_cv_hostcheck="$gnupg_hostcheck" ])
+    if test "$gnupg_cv_hostcheck" != "$gnupg_hostcheck"; then
+        AC_MSG_RESULT(changed)
+        AC_MSG_WARN(config.cache exists!)
+        AC_MSG_ERROR(you must do 'make distclean' first to compile for
+                 different target or different parameters.)
     else
-       AC_MSG_RESULT(ok)
+        AC_MSG_RESULT(ok)
     fi
   ])
 
 
-
-
 ######################################################################
-# Check for SysV IPC  (from GIMP)
+# Check for -fPIC etc (taken from libtool)
+# This sets CFLAGS_PIC to the required flags
+#           NO_PIC to yes if it is not possible to
+#                  generate PIC
 ######################################################################
-dnl WK_CHECK_IPC
+dnl GNUPG_CHECK_PIC
 dnl
-define(WK_CHECK_IPC,
-  [ AC_CHECK_HEADERS(sys/ipc.h sys/shm.h)
-    if test "$ac_cv_header_sys_shm_h" = "yes"; then
-      AC_MSG_CHECKING(whether shmctl IPC_RMID allowes subsequent attaches)
-      AC_TRY_RUN([
-           #include <sys/types.h>
-           #include <sys/ipc.h>
-           #include <sys/shm.h>
-           int main()
-           {
-             int id;
-             char *shmaddr;
-           id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0777);
-           if (id == -1)
-             exit (2);
-             shmaddr = shmat (id, 0, 0);
-             shmctl (id, IPC_RMID, 0);
-             if ((char*) shmat (id, 0, 0) == (char*) -1)
-             {
-               shmdt (shmaddr);
-               exit (1);
-             }
-             shmdt (shmaddr);
-             shmdt (shmaddr);
-             exit (0);
-           }
-       ],
-       AC_DEFINE(IPC_RMID_DEFERRED_RELEASE)
-       AC_MSG_RESULT(yes),
-       AC_MSG_RESULT(no),
-       AC_MSG_RESULT(assuming no))
+define(GNUPG_CHECK_PIC,
+  [ AC_MSG_CHECKING(for option to create PIC)
+    CFLAGS_PIC=
+    NO_PIC=no
+    if test "$cross_compiling" = yes; then
+        AC_MSG_RESULT(assume none)
+    else
+        if test "$GCC" = yes; then
+            CFLAGS_PIC="-fPIC"
+        else
+            case "$host_os" in
+              aix3* | aix4*)
+                # All rs/6000 code is PIC
+                # but is there any non-rs/6000 AIX platform?
+                ;;
+
+              hpux9* | hpux10*)
+                CFLAGS_PIC="+Z"
+                ;;
+
+              irix5* | irix6*)
+                # PIC (with -KPIC) is the default.
+                ;;
+
+              osf3* | osf4*)
+                # FIXME - pic_flag is probably required for
+                # hppa*-osf* and i860-osf*
+                ;;
+
+              sco3.2v5*)
+                CFLAGS_PIC='-Kpic'
+                ;;
+
+              solaris2* | solaris7* )
+                CFLAGS_PIC='-KPIC'
+                ;;
+
+              sunos4*)
+                CFLAGS_PIC='-PIC'
+                ;;
+
+              *)
+                NO_PIC=yes
+                ;;
+            esac
+        fi
+
+        case "$host_cpu" in
+        rs6000 | powerpc | powerpcle)
+          # Yippee! All RS/6000 and PowerPC code is position-independent.
+          CFLAGS_PIC=""
+          ;;
+        esac
+
+        if test "$NO_PIC" = yes; then
+            AC_MSG_RESULT(not possible)
+        else
+            if test -z "$CFLAGS_PIC"; then
+               AC_MSG_RESULT(none)
+            else
+                AC_MSG_RESULT($CFLAGS_PIC)
+            fi
+        fi
     fi
   ])
 
 
 ######################################################################
-# progtest.m4 from gettext 0.32
+# Check for rdynamic flag
+# This sets CFLAGS_RDYNAMIC to the required flags
 ######################################################################
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 1
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-       ac_cv_path_$1="$ac_dir/$ac_word"
-       break
-      fi
+dnl GNUPG_CHECK_RDYNAMIC
+dnl
+define(GNUPG_CHECK_RDYNAMIC,
+  [ AC_MSG_CHECKING(how to specify -rdynamic)
+    CFLAGS_RDYNAMIC=
+    if test "$cross_compiling" = yes; then
+        AC_MSG_RESULT(assume none)
+    else
+        case "$host_os" in
+          solaris*)
+            CFLAGS_RDYNAMIC="-Wl,-dy"
+            ;;
+          *)
+            CFLAGS_RDYNAMIC="-Wl,-export-dynamic"
+            ;;
+        esac
+        AC_MSG_RESULT($CFLAGS_RDYNAMIC)
     fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
+  ])
+
+
+#####################################################################
+# Check for SysV IPC  (from GIMP)
+#   And see whether we have a SHM_LOCK (FreeBSD does not have it).
+#####################################################################
+dnl GNUPG_CHECK_IPC
+dnl
+define(GNUPG_CHECK_IPC,
+   [ AC_CHECK_HEADERS(sys/ipc.h sys/shm.h)
+     if test "$ac_cv_header_sys_shm_h" = "yes"; then
+       AC_MSG_CHECKING(whether shmctl IPC_RMID allowes subsequent attaches)
+       AC_TRY_RUN([
+             #include <sys/types.h>
+             #include <sys/ipc.h>
+             #include <sys/shm.h>
+             int main()
+             {
+               int id;
+               char *shmaddr;
+             id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0777);
+             if (id == -1)
+               exit (2);
+               shmaddr = shmat (id, 0, 0);
+               shmctl (id, IPC_RMID, 0);
+               if ((char*) shmat (id, 0, 0) == (char*) -1)
+               {
+                 shmdt (shmaddr);
+                 exit (1);
+               }
+               shmdt (shmaddr);
+               shmdt (shmaddr);
+               exit (0);
+             }
+         ],
+         AC_DEFINE(IPC_RMID_DEFERRED_RELEASE)
+         AC_MSG_RESULT(yes),
+         AC_MSG_RESULT(no),
+         AC_MSG_RESULT(assuming no))
+       AC_MSG_CHECKING(whether SHM_LOCK is available)
+       AC_TRY_COMPILE([#include <sys/types.h>
+             #include <sys/ipc.h>
+             #include <sys/shm.h>],[
+             int foo( int shm_id ) {  shmctl(shm_id, SHM_LOCK, 0); }
+             ],
+         AC_DEFINE(IPC_HAVE_SHM_LOCK)
+         AC_MSG_RESULT(yes),
+         AC_MSG_RESULT(no))
+     fi
+   ])
 
 
 ######################################################################
-# lcmessage.m4 from gettext 0.32
+# Check whether mlock is broken (hpux 10.20 raises a SIGBUS if mlock
+# is not called from uid 0 (not tested whether uid 0 works)
 ######################################################################
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+dnl GNUPG_CHECK_MLOCK
+dnl
+define(GNUPG_CHECK_MLOCK,
+  [ AC_CHECK_FUNCS(mlock)
+    if test "$ac_cv_func_mlock" = "yes"; then
+        AC_MSG_CHECKING(whether mlock is broken)
+          AC_TRY_RUN([
+                #include <stdlib.h>
+                #include <unistd.h>
+                #include <errno.h>
+                #include <sys/mman.h>
+                #include <sys/types.h>
+                #include <fcntl.h>
+
+                int main()
+                {
+                    char *pool;
+                    int err;
+                    long int pgsize = getpagesize();
+
+                    pool = malloc( 4096 + pgsize );
+                    if( !pool )
+                        return 2;
+                    pool += (pgsize - ((long int)pool % pgsize));
+
+                    err = mlock( pool, 4096 );
+                    if( !err || errno == EPERM )
+                        return 0; /* okay */
+
+                    return 1;  /* hmmm */
+                }
+
+            ],
+            AC_MSG_RESULT(no),
+            AC_DEFINE(HAVE_BROKEN_MLOCK)
+            AC_MSG_RESULT(yes),
+            AC_MSG_RESULT(assuming no))
+    fi
+  ])
+
+
+
 
-# serial 1
 
-AC_DEFUN(AM_LC_MESSAGES,
-  [if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES)
-    fi
-  fi])
 
 
 
-######################################################################
-# gettext.m4 from gettext 0.32
-######################################################################
 # Macro to add for using GNU gettext.
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
-# This file file be copied and used freely without restrictions.  It can
+# This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU Public License
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
-# serial 3
+# serial 5 + patch (wk 21.10.98)
 
 AC_DEFUN(AM_WITH_NLS,
   [AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
     AC_ARG_ENABLE(nls,
-      [  --disable-nls          do not use Native Language Support],
+      [  --disable-nls           do not use Native Language Support],
       USE_NLS=$enableval, USE_NLS=yes)
     AC_MSG_RESULT($USE_NLS)
     AC_SUBST(USE_NLS)
@@ -260,129 +339,131 @@ AC_DEFUN(AM_WITH_NLS,
       AC_DEFINE(ENABLE_NLS)
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
-       [  --with-included-gettext use the GNU gettext library included here],
-       nls_cv_force_use_gnu_gettext=$withval,
-       nls_cv_force_use_gnu_gettext=no)
+        [  --with-included-gettext use the GNU gettext library included here],
+        nls_cv_force_use_gnu_gettext=$withval,
+        nls_cv_force_use_gnu_gettext=no)
       AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-       dnl User does not insist on using GNU NLS library.  Figure out what
-       dnl to use.  If gettext or catgets are available (in this order) we
-       dnl use this.  Else we have to fall back to GNU NLS library.
-       dnl catgets is only used if permitted by option --with-catgets.
-       nls_cv_header_intl=
-       nls_cv_header_libgt=
-       CATOBJEXT=NONE
-
-       AC_CHECK_HEADER(libintl.h,
-         [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
-           [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
-              gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
-
-          if test "$gt_cv_func_gettext_libc" != "yes"; then
-            AC_CHECK_LIB(intl, bindtextdomain,
-              [AC_CACHE_CHECK([for gettext in libintl],
-                gt_cv_func_gettext_libintl,
-                [AC_TRY_LINK([], [return (int) gettext ("")],
-                gt_cv_func_gettext_libintl=yes,
-                gt_cv_func_gettext_libintl=no)])])
-          fi
-
-          if test "$gt_cv_func_gettext_libc" = "yes" \
-             || test "$gt_cv_func_gettext_libintl" = "yes"; then
-             AC_DEFINE(HAVE_GETTEXT)
-             AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-               [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-             if test "$MSGFMT" != "no"; then
-               AC_CHECK_FUNCS(dcgettext)
-               AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-               AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-                 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-               AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-                              return _nl_msg_cat_cntr],
-                 [CATOBJEXT=.gmo
-                  DATADIRNAME=share],
-                 [CATOBJEXT=.mo
-                  DATADIRNAME=lib])
-               INSTOBJEXT=.mo
-             fi
-           fi
-       ])
-
-       if test "$CATOBJEXT" = "NONE"; then
-         AC_MSG_CHECKING([whether catgets can be used])
-         AC_ARG_WITH(catgets,
-           [  --with-catgets          use catgets functions if available],
-           nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
-         AC_MSG_RESULT($nls_cv_use_catgets)
-
-         if test "$nls_cv_use_catgets" = "yes"; then
-           dnl No gettext in C library.  Try catgets next.
-           AC_CHECK_LIB(i, main)
-           AC_CHECK_FUNC(catgets,
-             [AC_DEFINE(HAVE_CATGETS)
-              INTLOBJS="\$(CATOBJS)"
-              AC_PATH_PROG(GENCAT, gencat, no)dnl
-              if test "$GENCAT" != "no"; then
-                AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
-                if test "$GMSGFMT" = "no"; then
-                  AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
-                   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
-                fi
-                AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-                  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-                USE_INCLUDED_LIBINTL=yes
-                CATOBJEXT=.cat
-                INSTOBJEXT=.cat
-                DATADIRNAME=lib
-                INTLDEPS='$(top_builddir)/intl/libintl.a'
-                INTLLIBS=$INTLDEPS
-                LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-                nls_cv_header_intl=intl/libintl.h
-                nls_cv_header_libgt=intl/libgettext.h
-              fi])
-         fi
-       fi
-
-       if test "$CATOBJEXT" = "NONE"; then
-         dnl Neither gettext nor catgets in included in the C library.
-         dnl Fall back on GNU gettext library.
-         nls_cv_use_gnu_gettext=yes
-       fi
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If gettext or catgets are available (in this order) we
+        dnl use this.  Else we have to fall back to GNU NLS library.
+        dnl catgets is only used if permitted by option --with-catgets.
+        nls_cv_header_intl=
+        nls_cv_header_libgt=
+        CATOBJEXT=NONE
+
+        AC_CHECK_HEADER(libintl.h,
+          [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
+            [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
+               gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
+
+           if test "$gt_cv_func_gettext_libc" != "yes"; then
+             AC_CHECK_LIB(intl, bindtextdomain,
+               [AC_CHECK_LIB(intl, gettext,
+                 gt_cv_func_gettext_libintl=yes,
+                 gt_cv_func_gettext_libintl=no)])
+           fi
+
+           if test "$gt_cv_func_gettext_libintl" = "yes" ; then
+             LIBS="-lintl $LIBS"
+           fi
+
+           if test "$gt_cv_func_gettext_libc" = "yes" \
+              || test "$gt_cv_func_gettext_libintl" = "yes"; then
+              AC_DEFINE(HAVE_GETTEXT)
+              AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+                [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+              if test "$MSGFMT" != "no"; then
+                AC_CHECK_FUNCS(dcgettext)
+                AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+                AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+                  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+                AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+                               return _nl_msg_cat_cntr],
+                  [CATOBJEXT=.gmo
+                   DATADIRNAME=share],
+                  [CATOBJEXT=.mo
+                   DATADIRNAME=lib])
+                INSTOBJEXT=.mo
+              fi
+            fi
+        ])
+
+        if test "$CATOBJEXT" = "NONE"; then
+          AC_MSG_CHECKING([whether catgets can be used])
+          AC_ARG_WITH(catgets,
+            [  --with-catgets          use catgets functions if available],
+            nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
+          AC_MSG_RESULT($nls_cv_use_catgets)
+
+          if test "$nls_cv_use_catgets" = "yes"; then
+            dnl No gettext in C library.  Try catgets next.
+            AC_CHECK_LIB(i, main)
+            AC_CHECK_FUNC(catgets,
+              [AC_DEFINE(HAVE_CATGETS)
+               INTLOBJS="\$(CATOBJS)"
+               AC_PATH_PROG(GENCAT, gencat, no)dnl
+               if test "$GENCAT" != "no"; then
+                 AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
+                 if test "$GMSGFMT" = "no"; then
+                   AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
+                    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
+                 fi
+                 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+                   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+                 USE_INCLUDED_LIBINTL=yes
+                 CATOBJEXT=.cat
+                 INSTOBJEXT=.cat
+                 DATADIRNAME=lib
+                 INTLDEPS='$(top_builddir)/intl/libintl.a'
+                 INTLLIBS=$INTLDEPS
+                 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+                 nls_cv_header_intl=intl/libintl.h
+                 nls_cv_header_libgt=intl/libgettext.h
+               fi])
+          fi
+        fi
+
+        if test "$CATOBJEXT" = "NONE"; then
+          dnl Neither gettext nor catgets in included in the C library.
+          dnl Fall back on GNU gettext library.
+          nls_cv_use_gnu_gettext=yes
+        fi
       fi
 
       if test "$nls_cv_use_gnu_gettext" = "yes"; then
-       dnl Mark actions used to generate GNU NLS library.
-       INTLOBJS="\$(GETTOBJS)"
-       AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-         [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
-       AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-       AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-         [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-       AC_SUBST(MSGFMT)
-       USE_INCLUDED_LIBINTL=yes
-       CATOBJEXT=.gmo
-       INSTOBJEXT=.mo
-       DATADIRNAME=share
-       INTLDEPS='$(top_builddir)/intl/libintl.a'
-       INTLLIBS=$INTLDEPS
-       LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-       nls_cv_header_intl=intl/libintl.h
-       nls_cv_header_libgt=intl/libgettext.h
+        dnl Mark actions used to generate GNU NLS library.
+        INTLOBJS="\$(GETTOBJS)"
+        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+          [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
+        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+          [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+        AC_SUBST(MSGFMT)
+        USE_INCLUDED_LIBINTL=yes
+        CATOBJEXT=.gmo
+        INSTOBJEXT=.mo
+        DATADIRNAME=share
+        INTLDEPS='$(top_builddir)/intl/libintl.a'
+        INTLLIBS=$INTLDEPS
+        LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+        nls_cv_header_intl=intl/libintl.h
+        nls_cv_header_libgt=intl/libgettext.h
       fi
 
       dnl Test whether we really found GNU xgettext.
       if test "$XGETTEXT" != ":"; then
-       dnl If it is no GNU xgettext we define it as : so that the
-       dnl Makefiles still can work.
-       if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-         : ;
-       else
-         AC_MSG_RESULT(
-           [found xgettext programs is not GNU xgettext; ignore it])
-         XGETTEXT=":"
-       fi
+        dnl If it is no GNU xgettext we define it as : so that the
+        dnl Makefiles still can work.
+        if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+          : ;
+        else
+          AC_MSG_RESULT(
+            [found xgettext program is not GNU xgettext; ignore it])
+          XGETTEXT=":"
+        fi
       fi
 
       # We need to process the po/ directory.
@@ -392,6 +473,12 @@ AC_DEFUN(AM_WITH_NLS,
       nls_cv_header_intl=intl/libintl.h
       nls_cv_header_libgt=intl/libgettext.h
     fi
+    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+    AC_OUTPUT_COMMANDS(
+     [case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac])
+
 
     # If this is used in GNU gettext we have to set USE_NLS to `yes'
     # because some of the sources are only built for this goal.
@@ -422,6 +509,7 @@ AC_DEFUN(AM_WITH_NLS,
     AC_SUBST(POSUB)
   ])
 
+
 AC_DEFUN(AM_GNU_GETTEXT,
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
@@ -436,9 +524,9 @@ AC_DEFUN(AM_GNU_GETTEXT,
    AC_REQUIRE([AC_FUNC_MMAP])dnl
 
    AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h values.h sys/param.h])
+unistd.h sys/param.h])
    AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next])
+strdup __argz_count __argz_stringify __argz_next])
 
    if test "${ac_cv_func_stpcpy+set}" != "set"; then
      AC_CHECK_FUNCS(stpcpy)
@@ -457,9 +545,9 @@ __argz_count __argz_stringify __argz_next])
        AC_MSG_CHECKING(for catalogs to be installed)
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
-        case "$ALL_LINGUAS" in
-         *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-        esac
+         case "$ALL_LINGUAS" in
+          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+         esac
        done
        LINGUAS=$NEW_LINGUAS
        AC_MSG_RESULT($LINGUAS)
@@ -484,7 +572,7 @@ __argz_count __argz_stringify __argz_next])
 
    dnl Determine which catalog format we have (if any is needed)
    dnl For now we know about two different formats:
-   dnl  Linux libc-5 and the normal X/Open format
+   dnl   Linux libc-5 and the normal X/Open format
    test -d intl || mkdir intl
    if test "$CATOBJEXT" = ".cat"; then
      AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
@@ -498,7 +586,7 @@ __argz_count __argz_stringify __argz_next])
      $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
 
    dnl In the intl/Makefile.in we have a special dependency which makes
-   dnl only sense for gettext. We comment this out for non-gettext
+   dnl only sense for gettext.  We comment this out for non-gettext
    dnl packages.
    if test "$PACKAGE" = "gettext"; then
      GT_NO="#NO#"
@@ -540,8 +628,7 @@ __argz_count __argz_stringify __argz_next])
    fi
    rm -f po/POTFILES
    sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-       < $srcdir/po/POTFILES.in > po/POTFILES
+        < $srcdir/po/POTFILES.in > po/POTFILES
   ])
 
-
-
+dnl *-*wedit:notab*-*  Please keep this as the last line.