Browse Source

* cln.m4: New file.

* doc/cln.tex: Document package tools cln-config and cln.m4.
        * Makefile.in: Care about cln.m4.
master
Richard Kreckel 24 years ago
parent
commit
4a9e4c0c58
  1. 6
      ChangeLog
  2. 3
      Makefile.in
  3. 6
      NEWS
  4. 155
      cln.m4
  5. 36
      doc/cln.tex

6
ChangeLog

@ -1,3 +1,9 @@
2000-11-18 Richard Kreckel <kreckel@ginac.de>
* cln.m4: New file.
* doc/cln.tex: Document package tools cln-config and cln.m4.
* Makefile.in: Care about cln.m4.
2000-11-17 Richard Kreckel <kreckel@ginac.de> 2000-11-17 Richard Kreckel <kreckel@ginac.de>
* cln-config.1: added manpage, as required by a couple of distros. * cln-config.1: added manpage, as required by a couple of distros.

3
Makefile.in

@ -33,17 +33,20 @@ install : installdirs force
cd @subdir@; $(MAKE) install cd @subdir@; $(MAKE) install
$(INSTALL_PROGRAM) cln-config $(bindir)/cln-config $(INSTALL_PROGRAM) cln-config $(bindir)/cln-config
$(INSTALL_DATA) cln-config.1 $(mandir)/man1/cln-config.1 $(INSTALL_DATA) cln-config.1 $(mandir)/man1/cln-config.1
$(INSTALL_DATA) cln.m4 $(datadir)/aclocal/cln.m4
installdirs : force installdirs : force
cd @subdir@; $(MAKE) installdirs cd @subdir@; $(MAKE) installdirs
if [ ! -d $(mandir) ] ; then mkdir $(mandir) ; fi if [ ! -d $(mandir) ] ; then mkdir $(mandir) ; fi
if [ ! -d $(mandir)/man1 ] ; then mkdir $(mandir)/man1 ; fi if [ ! -d $(mandir)/man1 ] ; then mkdir $(mandir)/man1 ; fi
if [ ! -d $(datadir)/aclocal ] ; then mkdir $(datadir)/aclocal ; fi
if [ ! -d $(bindir) ] ; then mkdir $(bindir) ; fi if [ ! -d $(bindir) ] ; then mkdir $(bindir) ; fi
uninstall : force uninstall : force
cd @subdir@; $(MAKE) uninstall cd @subdir@; $(MAKE) uninstall
$(RM) $(bindir)/cln-config $(RM) $(bindir)/cln-config
$(RM) $(mandir)/man1/cln-config.1 $(RM) $(mandir)/man1/cln-config.1
$(RM) $(datadir)/aclocal/cln.m4
check : force check : force
cd @subdir@; $(MAKE) check cd @subdir@; $(MAKE) check

6
NEWS

@ -27,6 +27,12 @@ Implementation changes
* Fix compilation errors with current GCC3.0 snapshots. * Fix compilation errors with current GCC3.0 snapshots.
Other changes
-------------
* Added package tools: script cln-config and autoconf macro AC_PATH_LIBCLN
(in file cln.m4).
2000-01-13, version 1.0.3 2000-01-13, version 1.0.3
========================= =========================

155
cln.m4

@ -0,0 +1,155 @@
# Configure paths for CLN
# Richard Kreckel 11/17/2000
# stolen from Christian Bauer
# stolen from Sam Lantinga
# stolen from Manish Singh
# stolen back from Frank Belew
# stolen from Manish Singh
# Shamelessly stolen from Owen Taylor
dnl AC_PATH_LIBCLN([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for installed CLN library, and define LIBCLN_CPPFLAGS and LIBCLN_LIBS
dnl
AC_DEFUN(AC_PATH_LIBCLN,
[dnl
dnl Get the cppflags and libraries from the cln-config script
dnl
AC_ARG_WITH(cln-prefix,[ --with-cln-prefix=PFX Prefix where CLN is installed (optional)],
cln_prefix="$withval", cln_prefix="")
AC_ARG_WITH(cln-exec-prefix,[ --with-cln-exec-prefix=PFX Exec prefix where CLN is installed (optional)],
cln_exec_prefix="$withval", cln_exec_prefix="")
AC_ARG_ENABLE(clntest, [ --disable-clntest Do not try to compile and run a test CLN program],
, enable_clntest=yes)
if test x$cln_exec_prefix != x ; then
cln_args="$cln_args --exec-prefix=$cln_exec_prefix"
if test x${CLN_CONFIG+set} != xset ; then
CLN_CONFIG=$cln_exec_prefix/bin/cln-config
fi
fi
if test x$cln_prefix != x ; then
cln_args="$cln_args --prefix=$cln_prefix"
if test x${CLN_CONFIG+set} != xset ; then
CLN_CONFIG=$cln_prefix/bin/cln-config
fi
fi
AC_PATH_PROG(CLN_CONFIG, cln-config, no)
min_cln_version=ifelse([$1], ,1.1.0,$1)
AC_MSG_CHECKING(for CLN - version >= $min_cln_version)
no_cln=""
if test "$CLN_CONFIG" = "no" ; then
no_cln=yes
else
LIBCLN_CPPFLAGS=`$CLN_CONFIG $clnconf_args --cppflags`
LIBCLN_LIBS=`$CLN_CONFIG $clnconf_args --libs`
cln_major_version=`$CLN_CONFIG $cln_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
cln_minor_version=`$CLN_CONFIG $cln_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
cln_micro_version=`$CLN_CONFIG $cln_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_clntest" = "xyes" ; then
ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_LIBS="$LIBS"
CPPFLAGS="$CPPFLAGS $LIBCLN_CPPFLAGS"
LIBS="$LIBS $LIBCLN_LIBS"
dnl
dnl Now check if the installed CLN is sufficiently new. (Also sanity
dnl checks the results of cln-config to some extent
dnl
rm -f conf.clntest
AC_TRY_RUN([
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <cln/config.h>
int main ()
{
int major, minor, micro;
char *tmp_version;
system("touch conf.clntest");
tmp_version = strdup("$min_cln_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_cln_version");
exit(1);
}
if (($cln_major_version > major) ||
(($cln_major_version == major) && ($cln_minor_version > minor)) ||
(($cln_major_version == major) && ($cln_minor_version == minor) && ($cln_micro_version >= micro))) {
if ((CL_VERSION_MAJOR == $cln_major_version) &&
(CL_VERSION_MINOR == $cln_minor_version) &&
(CL_VERSION_PATCHLEVEL == $cln_micro_version)) {
return 0;
} else {
printf("\n*** 'cln-config --version' returned %d.%d.%d, but the header file I found\n", $cln_major_version, $cln_minor_version, $cln_micro_version);
printf("*** corresponds to %d.%d.%d. This mismatch suggests your installation of CLN\n", CL_VERSION_MAJOR, CL_VERSION_MINOR, CL_VERSION_PATCHLEVEL);
printf("*** is corrupted. Please inquire and consider reinstalling CLN.\n");
return 1;
}
} else {
printf("\n*** 'cln-config --version' returned %d.%d.%d, but the minimum version\n", $cln_major_version, $cln_minor_version, $cln_micro_version);
printf("*** of CLN required is %d.%d.%d. If cln-config is correct, then it is\n", major, minor, micro);
printf("*** best to upgrade to the required version.\n");
printf("*** If cln-config was wrong, set the environment variable CLN_CONFIG\n");
printf("*** to point to the correct copy of cln-config, and remove the file\n");
printf("*** config.cache before re-running configure\n");
return 1;
}
}
],, no_cln=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CPPFLAGS="$ac_save_CPPFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_cln" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$CLN_CONFIG" = "no" ; then
echo "*** The cln-config script installed by CLN could not be found"
echo "*** If CLN was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the CLN_CONFIG environment variable to the"
echo "*** full path to cln-config."
else
if test -f conf.clntest ; then
:
else
echo "*** Could not run CLN test program, checking why..."
CPPFLAGS="$CFLAGS $LIBCLN_CPPFLAGS"
LIBS="$LIBS $LIBCLN_LIBS"
AC_TRY_LINK([
#include <stdio.h>
#include <cln/cln.h>
], [ return 0; ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding CLN or finding the wrong"
echo "*** version of CLN. If it is not finding CLN, 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 "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means CLN was incorrectly installed"
echo "*** or that you have moved CLN since it was installed. In the latter case, you"
echo "*** may want to edit the cln-config script: $CLN_CONFIG" ])
CPPFLAGS="$ac_save_CPPFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
LIBCLN_CPPFLAGS=""
LIBCLN_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(LIBCLN_CPPFLAGS)
AC_SUBST(LIBCLN_LIBS)
rm -f conf.clntest
])

36
doc/cln.tex

@ -3386,6 +3386,42 @@ need special flags for compiling. The library has been installed to a
public directory as well (normally @code{/usr/local/lib}), hence when public directory as well (normally @code{/usr/local/lib}), hence when
linking a CLN application it is sufficient to give the flag @code{-lcln}. linking a CLN application it is sufficient to give the flag @code{-lcln}.
Since CLN version 1.1, there are two tools to make the creation of
software packages that use CLN easier:
@itemize @bullet
@item
@cindex @code{cln-config}
@code{cln-config} is a shell script that you can use to determine the
compiler and linker command line options required to compile and link a
program with CLN. Start it with @code{--help} to learn about its options
or consult the manpage that comes with it.
@item
@cindex @code{AC_PATH_LIBCLN}
@code{AC_PATH_LIBCLN} is for packages configured using GNU automake.
The synopsis is:
@example
@code{AC_PATH_LIBCLN([@var{MINIMUM-VERSION}, [@var{ACTION-IF-FOUND} [, @var{ACTION-IF-NOT-FOUND}]]])}
@end example
This macro determines the location of CLN using @code{cln-config}, which
is either found in the user's path, or from the environment variable
@code{CLN_CONFIG}. It tests the installed libraries to make sure that
their version is later than @var{MINIMUM-VERSION} (a default version
will be used if not specified). If the required version was found, sets
the @env{CLNLIB_CPPFLAGS} and the @env{CLNLIB_LIBS} variables. This
macro is in the file @file{cln.m4} which is installed in
@file{$datadir/aclocal}. Note that if automake was installed with a
different @samp{--prefix} than CLN, you will either have to manually
move @file{cln.m4} to automake's @file{$datadir/aclocal}, or give
aclocal the @samp{-I} option when running it. Here is a possible example
to be included in your package's @file{configure.in}:
@example
AC_PATH_LIBCLN(1.1.0, [
LIBS="$LIBS $LIBCLN_LIBS"
CPPFLAGS="$CPPFLAGS $LIBCLN_CPPFLAGS"
], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
@end example
@end itemize
@section Compatibility to old CLN versions @section Compatibility to old CLN versions
@cindex namespace @cindex namespace

Loading…
Cancel
Save