Changeset f46e1f2 in mod_gnutls


Ignore:
Timestamp:
Jan 4, 2009, 11:14:30 AM (11 years ago)
Author:
Nokis Mavrogiannopoulos <nmav@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, msva, upstream
Children:
8663ace
Parents:
56f3628
git-author:
Nikos Mavrogiannopoulos <nmav@…> (01/04/09 11:14:30)
git-committer:
Nokis Mavrogiannopoulos <nmav@…> (01/04/09 11:14:30)
Message:

bumped version and updated the detection script to work with pkg-config.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • NEWS

    r56f3628 rf46e1f2  
    1 ** Verison 0.5.4 (unreleased)
     1** Verison 0.5.4 (2009-01-04)
    22
    33- mod_gnutls.h: modified definition to extern to avoid compilation
    44  errors in darwin.
     5
     6- Added patch to fix issue with mod_proxy. Investigation and patch by Alain
     7  Knaff.
     8
     9- libgnutls detection uses pkg-config.
    510
    611** Version 0.5.3 (2008-10-16)
  • configure.ac

    r56f3628 rf46e1f2  
    11dnl
    2 AC_INIT(mod_gnutls, 0.5.3)
     2AC_INIT(mod_gnutls, 0.5.4)
    33OOO_CONFIG_NICE(config.nice)
    44MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
  • m4/libgnutls.m4

    r56f3628 rf46e1f2  
    1212AC_DEFUN([AM_PATH_LIBGNUTLS],
    1313[dnl
    14 dnl Get the cflags and libraries from the libgnutls-config script
     14dnl Get the cflags and libraries from the pkg-config script
    1515dnl
    1616AC_ARG_WITH(libgnutls-prefix,
    1717          [  --with-libgnutls-prefix=PFX   Prefix where libgnutls is installed (optional)],
    18           libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
     18          pkg_config_prefix="$withval", pkg_config_prefix="")
    1919
    20   if test x$libgnutls_config_prefix != x ; then
    21      if test x${LIBGNUTLS_CONFIG+set} != xset ; then
    22         LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
     20  if test x$pkg_config_prefix != x ; then
     21     if test x${PKG_CONFIG+set} != xset ; then
     22        PKG_CONFIG=$pkg_config_prefix/bin/pkg-config
    2323     fi
    2424  fi
    2525
    26   AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
     26  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
    2727  min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
    2828  AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
    2929  no_libgnutls=""
    30   if test "$LIBGNUTLS_CONFIG" = "no" ; then
     30  if test "$PKG_CONFIG" = "no" ; then
    3131    no_libgnutls=yes
    3232  else
    33     LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
    34     LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
    35     libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
     33    LIBGNUTLS_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags gnutls`
     34    LIBGNUTLS_LIBS=`$PKG_CONFIG $pkg_config_args --libs gnutls`
     35    pkg_config_version=`$PKG_CONFIG $pkg_config_args --modversion gnutls`
    3636
    3737
     
    4242dnl
    4343dnl Now check if the installed libgnutls is sufficiently new. Also sanity
    44 dnl checks the results of libgnutls-config to some extent
     44dnl checks the results of pkg-config to some extent
    4545dnl
    4646      rm -f conf.libgnutlstest
     
    5656    system ("touch conf.libgnutlstest");
    5757
    58     if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
     58    if( strcmp( gnutls_check_version(NULL), "$pkg_config_version" ) )
    5959    {
    60       printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
    61              "$libgnutls_config_version", gnutls_check_version(NULL) );
    62       printf("*** was found! If libgnutls-config was correct, then it is best\n");
     60      printf("\n*** 'pkg-config --version' returned %s, but LIBGNUTLS (%s)\n",
     61             "$pkg_config_version", gnutls_check_version(NULL) );
     62      printf("*** was found! If pkg-config was correct, then it is best\n");
    6363      printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
    6464      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
    6565      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
    6666      printf("*** required on your system.\n");
    67       printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
    68       printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
     67      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG\n");
     68      printf("*** to point to the correct copy of pkg-config, and remove the file config.cache\n");
    6969      printf("*** before re-running configure\n");
    7070    }
     
    8989        printf("*** \n");
    9090        printf("*** If you have already installed a sufficiently new version, this error\n");
    91         printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
     91        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
    9292        printf("*** being found. The easiest way to fix this is to remove the old version\n");
    93         printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
    94         printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
     93        printf("*** of LIBGNUTLS, but you can also set the PKG_CONFIG environment to point to the\n");
     94        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
    9595        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
    9696        printf("*** so that the correct libraries are found at run-time))\n");
     
    113113        AC_MSG_RESULT(no)
    114114     fi
    115      if test "$LIBGNUTLS_CONFIG" = "no" ; then
    116        echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
     115     if test "$PKG_CONFIG" = "no" ; then
     116       echo "*** The pkg-config script installed by LIBGNUTLS could not be found"
    117117       echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
    118        echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
    119        echo "*** full path to libgnutls-config."
     118       echo "*** your path, or set the PKG_CONFIG environment variable to the"
     119       echo "*** full path to pkg-config."
    120120     else
    121121       if test -f conf.libgnutlstest ; then
     
    144144          echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
    145145          echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
    146           echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ])
     146          echo "*** may want to edit the pkg-config script: $PKG_CONFIG" ])
    147147          CFLAGS="$ac_save_CFLAGS"
    148148          LIBS="$ac_save_LIBS"
     
    155155  rm -f conf.libgnutlstest
    156156
    157   LIBGNUTLS_VERSION=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
    158   LIBGNUTLS_PREFIX="`$LIBGNUTLS_CONFIG $libgnutls_config_args --prefix`"
    159   GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool"
     157  LIBGNUTLS_VERSION="$pkg_config_version"
     158  AC_PATH_PROG(GNUTLS_CERTTOOL, certtool, no)
    160159
    161160  AC_SUBST(LIBGNUTLS_CFLAGS)
Note: See TracChangeset for help on using the changeset viewer.