From 6a2f58f1466e07eb02d4b8debdf6b76c2d8945f9 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Tue, 4 Nov 2008 11:10:32 +0100 Subject: Remove libtasn1-config and libtasn1.m4. --- NEWS | 2 + configure.in | 9 --- doc/README.autoconf | 14 ----- lib/Makefile.am | 5 -- lib/libtasn1-config.in | 104 -------------------------------- lib/libtasn1.m4 | 160 ------------------------------------------------- lib/libtasn1.pc.in | 1 - 7 files changed, 2 insertions(+), 293 deletions(-) delete mode 100644 doc/README.autoconf delete mode 100755 lib/libtasn1-config.in delete mode 100644 lib/libtasn1.m4 diff --git a/NEWS b/NEWS index ba1a5e4..0ec8c70 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,8 @@ Version 2.0 (unreleased) - doc: Sync gdoc script with GnuTLS, changes license on man-pages to GAP. - doc: Improve gtk-doc manual. - Assumes system has strdup and string.h. +- Remove libtasn1-config and libtasn1.m4, + use standard AC_CHECK_FUNCS autoconf tests or pkg-config instead. - API and ABI changes since last version: asn1_get_length_ber: New function struct node_asn_struct: New member, small_value. diff --git a/configure.in b/configure.in index e34335a..179bbbb 100644 --- a/configure.in +++ b/configure.in @@ -105,15 +105,6 @@ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") AC_MSG_NOTICE([Running gnulib checks]) gl_INIT -# For libtasn1-config. -LIBTASN1_LIBS="-L${libdir} -ltasn1 $LIBS" -LIBTASN1_CFLAGS="-I${includedir}" -AC_SUBST(LIBTASN1_LIBS) -AC_SUBST(LIBTASN1_CFLAGS) -AC_CONFIG_COMMANDS([chmod],[[ - chmod +x lib/libtasn1-config -]],[[]]) - # Check for gtk-doc. GTK_DOC_CHECK(1.2) diff --git a/doc/README.autoconf b/doc/README.autoconf deleted file mode 100644 index bba695c..0000000 --- a/doc/README.autoconf +++ /dev/null @@ -1,14 +0,0 @@ -If you want to use the gnutls library in other projects -using autoconf/aclocal, put in your - -aclocal.m4: - include(libtasn1.m4) - -configure.in: - AM_PATH_LIBTASN1( 0.2.10,, AC_MSG_ERROR([[ -*** -*** libtasn1 was not found. You may want to get it from -*** ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ -]])) - -these macros define LIBTASN1_LIBS and LIBTASN1_CFLAGS. diff --git a/lib/Makefile.am b/lib/Makefile.am index 7b6e9d7..f290764 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -20,11 +20,6 @@ AM_CFLAGS = $(WARN_CFLAGS) include_HEADERS = libtasn1.h -bin_SCRIPTS = libtasn1-config - -m4datadir = $(datadir)/aclocal -dist_m4data_DATA = libtasn1.m4 - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libtasn1.pc diff --git a/lib/libtasn1-config.in b/lib/libtasn1-config.in deleted file mode 100755 index 8caa25d..0000000 --- a/lib/libtasn1-config.in +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -exec_prefix_set=no - -tasn1_libs="@LIBTASN1_LIBS@" -tasn1_cflags="@LIBTASN1_CFLAGS@" -tasn1_la_file="@libdir@/libtasn1.la" - -usage() -{ - cat <&2 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - if test $exec_prefix_set = no ; then - exec_prefix=$optarg - fi - ;; - --prefix) - echo_prefix=yes - ;; - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=yes - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; - --version) - echo "@VERSION@" - exit 0 - ;; - --cflags) - echo_cflags=yes - ;; - --libs) - echo_libs=yes - ;; - --la-file) - echo_la_file=yes - ;; - --help) - usage 0 - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -if test "$echo_prefix" = "yes"; then - echo $prefix -fi - -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi - -if test "$echo_cflags" = "yes"; then - if test "@includedir@" != "/usr/include" ; then - includes="-I@includedir@" - for i in $tasn1_cflags ; do - if test "$i" = "-I@includedir@" ; then - includes="" - fi - done - fi - echo $includes $tasn1_cflags -fi - -if test "$echo_la_file" = "yes"; then - echo ${tasn1_la_file} -fi - -if test "$echo_libs" = "yes"; then - echo ${tasn1_libs} -fi - - - diff --git a/lib/libtasn1.m4 b/lib/libtasn1.m4 deleted file mode 100644 index ea2e10f..0000000 --- a/lib/libtasn1.m4 +++ /dev/null @@ -1,160 +0,0 @@ -dnl Autoconf macros for libtasn1 -dnl $id$ - -# Modified for LIBTASN1 -- nmav -# Configure paths for LIBGCRYPT -# Shamelessly stolen from the one of XDELTA by Owen Taylor -# Werner Koch 99-12-09 - -dnl AM_PATH_LIBTASN1([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -dnl Test for libtasn1, and define LIBTASN1_CFLAGS and LIBTASN1_LIBS -dnl -AC_DEFUN([AM_PATH_LIBTASN1], -[dnl -dnl Get the cflags and libraries from the libtasn1-config script -dnl -AC_ARG_WITH(libtasn1-prefix, - [ --with-libtasn1-prefix=PFX Prefix where libtasn1 is installed (optional)], - libtasn1_config_prefix="$withval", libtasn1_config_prefix="") - - if test x$libtasn1_config_prefix != x ; then - if test x${LIBTASN1_CONFIG+set} != xset ; then - LIBTASN1_CONFIG=$libtasn1_config_prefix/bin/libtasn1-config - fi - fi - - AC_PATH_PROG(LIBTASN1_CONFIG, libtasn1-config, no) - min_libtasn1_version=ifelse([$1], ,0.1.0,$1) - AC_MSG_CHECKING(for libtasn1 - version >= $min_libtasn1_version) - no_libtasn1="" - if test "$LIBTASN1_CONFIG" = "no" ; then - no_libtasn1=yes - else - LIBTASN1_CFLAGS=`$LIBTASN1_CONFIG $libtasn1_config_args --cflags` - LIBTASN1_LIBS=`$LIBTASN1_CONFIG $libtasn1_config_args --libs` - libtasn1_config_version=`$LIBTASN1_CONFIG $libtasn1_config_args --version` - - - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $LIBTASN1_CFLAGS" - LIBS="$LIBS $LIBTASN1_LIBS" -dnl -dnl Now check if the installed libtasn1 is sufficiently new. Also sanity -dnl checks the results of libtasn1-config to some extent -dnl - rm -f conf.libtasn1test - AC_TRY_RUN([ -#include -#include -#include -#include - -int -main () -{ - system ("touch conf.libtasn1test"); - - if( strcmp( asn1_check_version(NULL), "$libtasn1_config_version" ) ) - { - printf("\n*** 'libtasn1-config --version' returned %s, but LIBTASN1 (%s)\n", - "$libtasn1_config_version", asn1_check_version(NULL) ); - printf("*** was found! If libtasn1-config was correct, then it is best\n"); - printf("*** to remove the old version of LIBTASN1. 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 libtasn1-config was wrong, set the environment variable LIBTASN1_CONFIG\n"); - printf("*** to point to the correct copy of libtasn1-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } - else if ( strcmp(asn1_check_version(NULL), LIBTASN1_VERSION ) ) - { - printf("\n*** LIBTASN1 header file (version %s) does not match\n", LIBTASN1_VERSION); - printf("*** library (version %s)\n", asn1_check_version(NULL) ); - } - else - { - if ( asn1_check_version( "$min_libtasn1_version" ) ) - { - return 0; - } - else - { - printf("no\n*** An old version of LIBTASN1 (%s) was found.\n", - asn1_check_version(NULL) ); - printf("*** You need a version of LIBTASN1 newer than %s. The latest version of\n", - "$min_libtasn1_version" ); - printf("*** LIBTASN1 is always available from ftp://gnutls.hellug.gr/pub/gnutls/libtasn1.\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 libtasn1-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of LIBTASN1, but you can also set the LIBTASN1_CONFIG environment to point to the\n"); - printf("*** correct copy of libtasn1-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_libtasn1=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - - if test "x$no_libtasn1" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - if test -f conf.libtasn1test ; then - : - else - AC_MSG_RESULT(no) - fi - if test "$LIBTASN1_CONFIG" = "no" ; then - echo "*** The libtasn1-config script installed by LIBTASN1 could not be found" - echo "*** If LIBTASN1 was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the LIBTASN1_CONFIG environment variable to the" - echo "*** full path to libtasn1-config." - else - if test -f conf.libtasn1test ; then - : - else - echo "*** Could not run libtasn1 test program, checking why..." - CFLAGS="$CFLAGS $LIBTASN1_CFLAGS" - LIBS="$LIBS $LIBTASN1_LIBS" - AC_TRY_LINK([ -#include -#include -#include -#include -], [ return !!asn1_check_version(NULL); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding LIBTASN1 or finding the wrong" - echo "*** version of LIBTASN1. If it is not finding LIBTASN1, 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 LIBTASN1 was incorrectly installed" - echo "*** or that you have moved LIBTASN1 since it was installed. In the latter case, you" - echo "*** may want to edit the libtasn1-config script: $LIBTASN1_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - LIBTASN1_CFLAGS="" - LIBTASN1_LIBS="" - ifelse([$3], , :, [$3]) - fi - rm -f conf.libtasn1test - AC_SUBST(LIBTASN1_CFLAGS) - AC_SUBST(LIBTASN1_LIBS) -]) - -dnl *-*wedit:notab*-* Please keep this as the last line. diff --git a/lib/libtasn1.pc.in b/lib/libtasn1.pc.in index 5bf15c4..2cc0ba3 100644 --- a/lib/libtasn1.pc.in +++ b/lib/libtasn1.pc.in @@ -7,5 +7,4 @@ Name: libtasn1 Description: Library for ASN.1 and DER manipulation Version: @VERSION@ Libs: -L${libdir} -ltasn1 -Libs.private: @LIBTASN1_LIBS@ Cflags: -I${includedir} -- cgit v1.2.3