[Pkg-wmaker-commits] [wmbiff] 61/77: add m4 macros for libgcrypt and libgnutls to the repository, so that FromCVS can be run to regenerate configure.in, even on systems without gnutls.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 03:01:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to tag wmbiff_0_4_0
in repository wmbiff.
commit 23207914ff9cd197f2f0aa5e021a4dcd0ad54a38
Author: bluehal <bluehal>
Date: Thu Apr 25 17:31:36 2002 +0000
add m4 macros for libgcrypt and libgnutls to the repository, so that FromCVS can be run to regenerate configure.in, even on systems without gnutls.
---
ChangeLog | 40 ++++++++++++-
FromCVS.sh | 2 +-
autoconf/libgcrypt.m4 | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++
autoconf/libgnutls.m4 | 161 +++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 363 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 417c441..231a3e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,14 +6,50 @@ The latest changelog entry is in a different format, because it's inserted by
CVS on commit.
$Log: ChangeLog,v $
- Revision 1.28 2002/04/20 08:53:20 bluehal
- update meta-information for prerelease 5
+ Revision 1.29 2002/04/25 17:31:36 bluehal
+ add m4 macros for libgcrypt and libgnutls to the repository, so that FromCVS can be run to regenerate configure.in, even on systems without gnutls.
Revision 1.1 2002/04/07 05:08:23 bluehal
use automake / autoconf; after checkout run ./FromCVS.sh
+2002-04-20 Saturday 18:15 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * TODO: mention MH patch / shell workaround
+
+2002-04-20 Saturday 10:15 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/.cvsignore: add ignorance of test binary
+
+2002-04-20 Saturday 09:55 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/Makefile.am: correct a problem uncovered by sourceforge's
+ compile farm
+
+2002-04-20 Saturday 09:27 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/ShellClient.c: BSD fix (no strndup, no sighandler_t)
+
+2002-04-20 Saturday 09:12 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/: LicqClient.c, mboxClient.c: move msgs=-1 assignment on
+ failure to the common openMailbox()
+
+2002-04-20 Saturday 08:53 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * ChangeLog, NEWS, TODO, configure.in, wmbiff/Client.h: update
+ meta-information for prerelease 5
+
+2002-04-20 Saturday 08:51 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/Makefile.am: correct syntax for making a test program
+
+2002-04-20 Saturday 08:41 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * autoconf/.cvsignore, wmbiff/.cvsignore, wmgeneral/.cvsignore,
+ .cvsignore: ignorance
+
2002-04-20 Saturday 08:13 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/sample.wmbiffrc: finish deprecating
diff --git a/FromCVS.sh b/FromCVS.sh
index eb8b050..6592c2a 100755
--- a/FromCVS.sh
+++ b/FromCVS.sh
@@ -2,7 +2,7 @@
# runs all the things necessary to rebuild files from CVS.
autoheader -l autoconf && \
- aclocal && \
+ aclocal -I autoconf && \
automake -a && \
autoconf && \
./configure && \
diff --git a/autoconf/libgcrypt.m4 b/autoconf/libgcrypt.m4
new file mode 100644
index 0000000..6bd1784
--- /dev/null
+++ b/autoconf/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), GCRYPT_VERSION ) )
+ {
+ printf("\n*** LIBGCRYPT 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_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.
diff --git a/autoconf/libgnutls.m4 b/autoconf/libgnutls.m4
new file mode 100644
index 0000000..4ce8af1
--- /dev/null
+++ b/autoconf/libgnutls.m4
@@ -0,0 +1,161 @@
+dnl Autoconf macros for libgnutls
+dnl $id$
+
+# Modified for LIBGNUTLS -- nmav
+# Configure paths for LIBGCRYPT
+# Shamelessly stolen from the one of XDELTA by Owen Taylor
+# Werner Koch 99-12-09
+
+dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS
+dnl
+AC_DEFUN(AM_PATH_LIBGNUTLS,
+[dnl
+dnl Get the cflags and libraries from the libgnutls-config script
+dnl
+AC_ARG_WITH(libgnutls-prefix,
+ [ --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)],
+ libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
+
+ if test x$libgnutls_config_prefix != x ; then
+ libgnutls_config_args="$libgnutls_config_args --prefix=$libgnutls_config_prefix"
+ if test x${LIBGNUTLS_CONFIG+set} != xset ; then
+ LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
+ fi
+ fi
+
+ AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
+ min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
+ AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
+ no_libgnutls=""
+ if test "$LIBGNUTLS_CONFIG" = "no" ; then
+ no_libgnutls=yes
+ else
+ LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
+ LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
+ libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
+
+
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+ LIBS="$LIBS $LIBGNUTLS_LIBS"
+dnl
+dnl Now check if the installed libgnutls is sufficiently new. Also sanity
+dnl checks the results of libgnutls-config to some extent
+dnl
+ rm -f conf.libgnutlstest
+ AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gnutls.h>
+
+int
+main ()
+{
+ system ("touch conf.libgnutlstest");
+
+ if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
+ {
+ printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
+ "$libgnutls_config_version", gnutls_check_version(NULL) );
+ printf("*** was found! If libgnutls-config was correct, then it is best\n");
+ printf("*** to remove the old version of LIBGNUTLS. 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 libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
+ printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
+ printf("*** before re-running configure\n");
+ }
+ else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
+ {
+ printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
+ printf("*** library (version %s)\n", gnutls_check_version(NULL) );
+ }
+ else
+ {
+ if ( gnutls_check_version( "$min_libgnutls_version" ) )
+ {
+ return 0;
+ }
+ else
+ {
+ printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
+ gnutls_check_version(NULL) );
+ printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
+ "$min_libgnutls_version" );
+ printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\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 libgnutls-config shell script is\n");
+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
+ printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
+ printf("*** correct copy of libgnutls-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_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+
+ if test "x$no_libgnutls" = x ; then
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
+ else
+ if test -f conf.libgnutlstest ; then
+ :
+ else
+ AC_MSG_RESULT(no)
+ fi
+ if test "$LIBGNUTLS_CONFIG" = "no" ; then
+ echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
+ echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
+ echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
+ echo "*** full path to libgnutls-config."
+ else
+ if test -f conf.libgnutlstest ; then
+ :
+ else
+ echo "*** Could not run libgnutls test program, checking why..."
+ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+ LIBS="$LIBS $LIBGNUTLS_LIBS"
+ AC_TRY_LINK([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gnutls.h>
+], [ return !!gnutls_check_version(NULL); ],
+ [ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
+ echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, 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 LIBGNUTLS was incorrectly installed"
+ echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
+ echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ LIBGNUTLS_CFLAGS=""
+ LIBGNUTLS_LIBS=""
+ ifelse([$3], , :, [$3])
+ fi
+ rm -f conf.libngnutlstest
+ AC_SUBST(LIBGNUTLS_CFLAGS)
+ AC_SUBST(LIBGNUTLS_LIBS)
+])
+
+dnl *-*wedit:notab*-* Please keep this as the last line.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git
More information about the Pkg-wmaker-commits
mailing list