Changed name to libgcrypt

4 files changed, 173 insertions, 173 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index fe15c17b..72178305 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,19 +14,19 @@
 
 
 # It seems that we need gcrypt.m4 here too
-EXTRA_DIST = gcrypt-config.in  gcrypt.m4
+EXTRA_DIST = libgcrypt-config.in  libgcrypt.m4
 
-INCLUDES =  -I$(top_srcdir)/intl
+#INCLUDES =  -I$(top_srcdir)/intl
 
 OMIT_DEPENDENCIES = types.h
 
 
 lib_LTLIBRARIES = libgcrypt.la
 
-bin_SCRIPTS = gcrypt-config
+bin_SCRIPTS = libgcrypt-config
 
 m4datadir = $(datadir)/aclocal
-m4data_DATA = gcrypt.m4
+m4data_DATA = libgcrypt.m4
 
 noinst_PROGRAMS = testapi
 testapi_SOURCES = testapi.c
diff --git a/src/gcrypt.m4 b/src/gcrypt.m4
deleted file mode 100644
index 4ac46f12..00000000
--- a/src/gcrypt.m4
+++ /dev/null
@@ -1,163 +0,0 @@
-dnl Autoconf macros for libgcrypt
-dnl $id$
-
-# Configure paths for GCRYPT
-# Shamelessly stolen from the one of XDELTA by Owen Taylor
-# Werner Koch   99-12-09
-
-dnl AM_PATH_GCRYPT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for gcrypt, and define GCRYPT_CFLAGS and GCRYPT_LIBS
-dnl
-AC_DEFUN(AM_PATH_GCRYPT,
-[dnl
-dnl Get the cflags and libraries from the gcrypt-config script
-dnl
-AC_ARG_WITH(gcrypt-prefix,
-          [  --with-gcrypt-prefix=PFX   Prefix where gcrypt is installed (optional)],
-          gcrypt_config_prefix="$withval", gcrypt_config_prefix="")
-AC_ARG_ENABLE(gcrypttest,
-          [  --disable-gcrypttest    Do not try to compile and run a test gcrypt program],
-          , enable_gcrypttest=yes)
-
-  if test x$gcrypt_config_prefix != x ; then
-     gcrypt_config_args="$gcrypt_config_args --prefix=$gcrypt_config_prefix"
-     if test x${GCRYPT_CONFIG+set} != xset ; then
-        GCRYPT_CONFIG=$gcrypt_config_prefix/bin/gcrypt-config
-     fi
-  fi
-
-  AC_PATH_PROG(GCRYPT_CONFIG, gcrypt-config, no)
-  min_gcrypt_version=ifelse([$1], ,1.1.0,$1)
-  AC_MSG_CHECKING(for gcrypt - version >= $min_gcrypt_version)
-  no_gcrypt=""
-  if test "$GCRYPT_CONFIG" = "no" ; then
-    no_gcrypt=yes
-  else
-    GCRYPT_CFLAGS=`$GCRYPT_CONFIG $gcrypt_config_args --cflags`
-    GCRYPT_LIBS=`$GCRYPT_CONFIG $gcrypt_config_args --libs`
-    gcrypt_config_version=`$GCRYPT_CONFIG $gcrypt_config_args --version`
-    if test "x$enable_gcrypttest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GCRYPT_CFLAGS"
-      LIBS="$LIBS $GCRYPT_LIBS"
-dnl
-dnl Now check if the installed gcrypt is sufficiently new. Also sanity
-dnl checks the results of gcrypt-config to some extent
-dnl
-      rm -f conf.gcrypttest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gcrypt.h>
-
-int
-main ()
-{
-    system ("touch conf.gcrypttest");
-
-    if( strcmp( gcry_check_version(NULL), "$gcrypt_config_version" ) )
-    {
-      printf("\n*** 'gcrypt-config --version' returned %s, but GCRYPT (%s)\n",
-             "$gcrypt_config_version", gcry_check_version(NULL) );
-      printf("*** was found! If gcrypt-config was correct, then it is best\n");
-      printf("*** to remove the old version of GCRYPT. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If gcrypt-config was wrong, set the environment variable GCRYPT_CONFIG\n");
-      printf("*** to point to the correct copy of gcrypt-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    }
-    else if ( strcmp(gcry_check_version(NULL), GCRYPT_VERSION ) )
-    {
-      printf("\n*** GCRYPT header file (version %s) does not match\n", GCRYPT_VERSION);
-      printf("*** library (version %s)\n", gcry_check_version(NULL) );
-    }
-    else
-    {
-      if ( gcry_check_version( "$min_gcrypt_version" ) )
-      {
-        return 0;
-      }
-     else
-      {
-        printf("no\n*** An old version of GCRYPT (%s) was found.\n",
-                gcry_check_version(NULL) );
-        printf("*** You need a version of GCRYPT newer than %s. The latest version of\n",
-               "$min_gcrypt_version" );
-        printf("*** GCRYPT is always available from ftp://ftp.gnupg.org/pub/gcrypt/gnupg.\n");
-        printf("*** (It is distributed along with GnuPG).\n");
-        printf("*** \n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the gcrypt-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GCRYPT, but you can also set the GCRYPT_CONFIG environment to point to the\n");
-        printf("*** correct copy of gcrypt-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gcrypt=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gcrypt" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])
-  else
-     if test -f conf.gcrypttest ; then
-        :
-     else
-        AC_MSG_RESULT(no)
-     fi
-     if test "$GCRYPT_CONFIG" = "no" ; then
-       echo "*** The gcrypt-config script installed by GCRYPT could not be found"
-       echo "*** If GCRYPT was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GCRYPT_CONFIG environment variable to the"
-       echo "*** full path to gcrypt-config."
-     else
-       if test -f conf.gcrypttest ; then
-        :
-       else
-          echo "*** Could not run gcrypt test program, checking why..."
-          CFLAGS="$CFLAGS $GCRYPT_CFLAGS"
-          LIBS="$LIBS $GCRYPT_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gcrypt.h>
-],      [ return !!gcry_check_version(NULL); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GCRYPT or finding the wrong"
-          echo "*** version of GCRYPT. If it is not finding GCRYPT, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-          echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GCRYPT was incorrectly installed"
-          echo "*** or that you have moved GCRYPT since it was installed. In the latter case, you"
-          echo "*** may want to edit the gcrypt-config script: $GCRYPT_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GCRYPT_CFLAGS=""
-     GCRYPT_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GCRYPT_CFLAGS)
-  AC_SUBST(GCRYPT_LIBS)
-  rm -f conf.gcrypttest
-])
-
-dnl *-*wedit:notab*-*  Please keep this as the last line.
diff --git a/src/gcrypt-config.in b/src/libgcrypt-config.in
index 0f7fffdd..dbe315bc 100644
--- a/src/gcrypt-config.in
+++ b/src/libgcrypt-config.in
@@ -4,14 +4,14 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
 
-gcrypt_libs="@GCRYPT_LIBS@"
-gcrypt_cflags="@GCRYPT_CFLAGS@"
+libgcrypt_libs="@LIBGCRYPT_LIBS@"
+libgcrypt_cflags="@LIBGCRYPT_CFLAGS@"
 
 
 usage()
 {
 	cat <<EOF
-Usage: gcrypt-config [OPTIONS]
+Usage: libgcrypt-config [OPTIONS]
 Options:
 	[--prefix[=DIR]]
 	[--exec-prefix[=DIR]]
@@ -77,17 +77,17 @@ fi
 if test "$echo_cflags" = "yes"; then
     if test "@includedir@" != "/usr/include" ; then
       includes="-I@includedir@"
-      for i in $gcrypt_cflags ; do
+      for i in $libgcrypt_cflags ; do
 	if test "$i" = "-I@includedir@" ; then
 	  includes=""
 	fi
       done
     fi
-    echo $includes $gcrypt_cflags
+    echo $includes $libgcrypt_cflags
 fi
 
 if test "$echo_libs" = "yes"; then
-    echo ${gcrypt_libs}
+    echo ${libgcrypt_libs}
 fi
 
 
diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4
new file mode 100644
index 00000000..d6806f5e
--- /dev/null
+++ b/src/libgcrypt.m4
@@ -0,0 +1,163 @@
+dnl Autoconf macros for libgcrypt
+dnl $id$
+
+# Configure paths for LIBGCRYPT
+# Shamelessly stolen from the one of XDELTA by Owen Taylor
+# Werner Koch   99-12-09
+
+dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libgcrypt, and define GCRYPT_CFLAGS and GCRYPT_LIBS
+dnl
+AC_DEFUN(AM_PATH_LIBGCRYPT,
+[dnl
+dnl Get the cflags and libraries from the libgcrypt-config script
+dnl
+AC_ARG_WITH(libgcrypt-prefix,
+          [  --with-libgcrypt-prefix=PFX   Prefix where libgcrypt is installed (optional)],
+          libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
+AC_ARG_ENABLE(libgcrypttest,
+          [  --disable-libgcrypttest    Do not try to compile and run a test libgcrypt program],
+          , enable_libgcrypttest=yes)
+
+  if test x$libgcrypt_config_prefix != x ; then
+     libgcrypt_config_args="$libgcrypt_config_args --prefix=$libgcrypt_config_prefix"
+     if test x${LIBGCRYPT_CONFIG+set} != xset ; then
+        LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
+     fi
+  fi
+
+  AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+  min_libgcrypt_version=ifelse([$1], ,1.1.0,$1)
+  AC_MSG_CHECKING(for libgcrypt - version >= $min_libgcrypt_version)
+  no_libgcrypt=""
+  if test "$LIBGCRYPT_CONFIG" = "no" ; then
+    no_libgcrypt=yes
+  else
+    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --cflags`
+    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --libs`
+    libgcrypt_config_version=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --version`
+    if test "x$enable_libgcrypttest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
+      LIBS="$LIBS $LIBGCRYPT_LIBS"
+dnl
+dnl Now check if the installed libgcrypt is sufficiently new. Also sanity
+dnl checks the results of libgcrypt-config to some extent
+dnl
+      rm -f conf.libgcrypttest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gcrypt.h>
+
+int
+main ()
+{
+    system ("touch conf.libgcrypttest");
+
+    if( strcmp( gcry_check_version(NULL), "$libgcrypt_config_version" ) )
+    {
+      printf("\n*** 'libgcrypt-config --version' returned %s, but LIBGCRYPT (%s)\n",
+             "$libgcrypt_config_version", gcry_check_version(NULL) );
+      printf("*** was found! If libgcrypt-config was correct, then it is best\n");
+      printf("*** to remove the old version of LIBGCRYPT. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If libgcrypt-config was wrong, set the environment variable LIBGCRYPT_CONFIG\n");
+      printf("*** to point to the correct copy of libgcrypt-config, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    }
+    else if ( strcmp(gcry_check_version(NULL), LIBGCRYPT_VERSION ) )
+    {
+      printf("\n*** LIBGCRYPT header file (version %s) does not match\n", LIBGCRYPT_VERSION);
+      printf("*** library (version %s)\n", gcry_check_version(NULL) );
+    }
+    else
+    {
+      if ( gcry_check_version( "$min_libgcrypt_version" ) )
+      {
+        return 0;
+      }
+     else
+      {
+        printf("no\n*** An old version of LIBGCRYPT (%s) was found.\n",
+                gcry_check_version(NULL) );
+        printf("*** You need a version of LIBGCRYPT newer than %s. The latest version of\n",
+               "$min_libgcrypt_version" );
+        printf("*** LIBGCRYPT is always available from ftp://ftp.gnupg.org/pub/libgcrypt/gnupg.\n");
+        printf("*** (It is distributed along with GnuPG).\n");
+        printf("*** \n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the libgcrypt-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of LIBGCRYPT, but you can also set the LIBGCRYPT_CONFIG environment to point to the\n");
+        printf("*** correct copy of libgcrypt-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_libgcrypt=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_libgcrypt" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])
+  else
+     if test -f conf.libgcrypttest ; then
+        :
+     else
+        AC_MSG_RESULT(no)
+     fi
+     if test "$LIBGCRYPT_CONFIG" = "no" ; then
+       echo "*** The libgcrypt-config script installed by LIBGCRYPT could not be found"
+       echo "*** If LIBGCRYPT was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the LIBGCRYPT_CONFIG environment variable to the"
+       echo "*** full path to libgcrypt-config."
+     else
+       if test -f conf.libgcrypttest ; then
+        :
+       else
+          echo "*** Could not run libgcrypt test program, checking why..."
+          CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
+          LIBS="$LIBS $LIBGCRYPT_LIBS"
+          AC_TRY_LINK([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gcrypt.h>
+],      [ return !!gcry_check_version(NULL); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding LIBGCRYPT or finding the wrong"
+          echo "*** version of LIBGCRYPT. If it is not finding LIBGCRYPT, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+          echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+          echo "***" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means LIBGCRYPT was incorrectly installed"
+          echo "*** or that you have moved LIBGCRYPT since it was installed. In the latter case, you"
+          echo "*** may want to edit the libgcrypt-config script: $LIBGCRYPT_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     LIBGCRYPT_CFLAGS=""
+     LIBGCRYPT_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(LIBGCRYPT_CFLAGS)
+  AC_SUBST(LIBGCRYPT_LIBS)
+  rm -f conf.libgcrypttest
+])
+
+dnl *-*wedit:notab*-*  Please keep this as the last line.