See ChangeLog: Sun Jan 3 15:28:44 CET 1999 Werner Koch
[gnupg.git] / acinclude.m4
index bbb409b..ab6fbf3 100644 (file)
@@ -1,41 +1,41 @@
 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
+    ], 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"
@@ -44,21 +44,21 @@ define(WK_LINK_FILES,
         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)
     fi
     AC_MSG_CHECKING(endianess)
-    AC_CACHE_VAL(wk_cv_c_endian,
-      [ wk_cv_c_endian=unknown
+    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>], [
@@ -69,8 +69,8 @@ define(WK_CHECK_ENDIAN,
         #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
+        #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
@@ -81,27 +81,27 @@ define(WK_CHECK_ENDIAN,
               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
+              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
+    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
@@ -113,94 +113,215 @@ define(WK_CHECK_CACHE,
 
 
 ######################################################################
-# progtest.m4 from gettext 0.32
+# 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
 ######################################################################
-# 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.
+dnl GNUPG_CHECK_PIC
+dnl
+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
 
-# 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
+        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
-  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
-])
+  ])
 
 
 ######################################################################
-# lcmessage.m4 from gettext 0.32
+# Check for rdynamic flag
+# This sets CFLAGS_RDYNAMIC to the required flags
 ######################################################################
-# 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.
-
-# 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)
+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
-  fi])
+  ])
+
 
+#####################################################################
+# 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
+   ])
 
 
 ######################################################################
-# gettext.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)
 ######################################################################
+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
+  ])
+
+
+
+
+
+
+
+
 # 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])
@@ -240,11 +361,13 @@ AC_DEFUN(AM_WITH_NLS,
 
            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 ("")],
+               [AC_CHECK_LIB(intl, gettext,
                  gt_cv_func_gettext_libintl=yes,
-                 gt_cv_func_gettext_libintl=no)])])
+                 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" \
@@ -338,7 +461,7 @@ AC_DEFUN(AM_WITH_NLS,
           : ;
         else
           AC_MSG_RESULT(
-            [found xgettext programs is not GNU xgettext; ignore it])
+            [found xgettext program is not GNU xgettext; ignore it])
           XGETTEXT=":"
         fi
       fi
@@ -350,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.
@@ -380,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
@@ -394,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)
@@ -501,5 +631,4 @@ __argz_count __argz_stringify __argz_next])
         < $srcdir/po/POTFILES.in > po/POTFILES
   ])
 
-
-
+dnl *-*wedit:notab*-*  Please keep this as the last line.