Browse Source

* Makefile.in, src/Makefile.in, doc/Makefile.in: Use mkdir -p.

* include/cln/version.h.in, src/base/verion.cc: New files.
        * configure.in: Generate include/cln/version.h.
        * cln.m4: Rewrote it. Check result of cln-config without compiling.
          Do cross-check library version and header version information.
master
Richard Kreckel 24 years ago
parent
commit
b172f24992
  1. 16
      ChangeLog
  2. 8
      Makefile.in
  3. 256
      cln.m4
  4. 2
      configure.in
  5. 9
      doc/Makefile.in
  6. 16
      doc/cln.tex
  7. 19
      src/Makefile.in

16
ChangeLog

@ -1,3 +1,17 @@
2000-12-05 Richard Kreckel <kreckel@ginac.de>
* Makefile.in, src/Makefile.in, doc/Makefile.in: Use mkdir -p.
* include/cln/version.h.in, src/base/verion.cc: New files.
* configure.in: Generate include/cln/version.h.
* cln.m4: Rewrote it. Check result of cln-config without compiling.
Do cross-check library version and header version information.
2000-12-02 Christian Bauer <cbauer@ginac.de>
* Makefile.in, src/Makefile.in, doc/Makefile.in: Added $DESTDIR.
* cln.m4, cln.spec.in: some minor fixes with respect to RPM package
building.
2000-11-24 Richard Kreckel <kreckel@ginac.de> 2000-11-24 Richard Kreckel <kreckel@ginac.de>
* */*: Removed problematic stdin, stdout and stderr definitions. * */*: Removed problematic stdin, stdout and stderr definitions.
@ -65,7 +79,7 @@
* src/base/cl_low.h: include "cln/types.h", since we need HAVE_DD... * src/base/cl_low.h: include "cln/types.h", since we need HAVE_DD...
* src/base/cl_low.h (logcount_64): ...for this macro. * src/base/cl_low.h (logcount_64): ...for this macro.
* src/base/random/cl_UL_random.cc (random32): if HAVE_DD a is an ULL. * src/base/random/cl_UL_random.cc (random32): if HAVE_DD a is an ULL.
* src/integer/gcd/cl_I_gcd_aux2.cc (floorDD): fixed algorithmic bug
* src/integer/gcd/cl_I_gcd_aux2.cc (floorDD): fixed algorithmic bug.
that turned up when intDsize==32 and cl_word_size==64. that turned up when intDsize==32 and cl_word_size==64.
* src/float/dfloat/elem/cl_DF_div.cc (operator/): fixed a missing cast * src/float/dfloat/elem/cl_DF_div.cc (operator/): fixed a missing cast
to uint64 that turned up when intDsize==32 and cl_word_size==64. to uint64 that turned up when intDsize==32 and cl_word_size==64.

8
Makefile.in

@ -17,6 +17,7 @@ DESTDIR =
CC = @CC@ CC = @CC@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
RM = rm -f RM = rm -f
MKDIR = mkdir -p
@SET_MAKE@ @SET_MAKE@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -38,10 +39,9 @@ install : installdirs force
installdirs : force installdirs : force
cd @subdir@; $(MAKE) installdirs cd @subdir@; $(MAKE) installdirs
if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi
if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then mkdir $(DESTDIR)$(mandir)/man1 ; fi
if [ ! -d $(DESTDIR)$(datadir)/aclocal ] ; then mkdir $(DESTDIR)$(datadir)/aclocal ; fi
if [ ! -d $(DESTDIR)$(bindir) ] ; then mkdir $(DESTDIR)$(bindir) ; fi
$(MKDIR) $(DESTDIR)$(mandir)/man1
$(MKDIR) $(DESTDIR)$(datadir)/aclocal
$(MKDIR) $(DESTDIR)$(bindir)
uninstall : force uninstall : force
cd @subdir@; $(MAKE) uninstall cd @subdir@; $(MAKE) uninstall

256
cln.m4

@ -1,16 +1,16 @@
# Configure paths for CLN
# Richard Kreckel 11/17/2000
# stolen from Christian Bauer
# Configure paths for the CLN library
# Richard Kreckel 12/4/2000
# borrowed from Christian Bauer
# stolen from Sam Lantinga # stolen from Sam Lantinga
# stolen from Manish Singh # stolen from Manish Singh
# stolen back from Frank Belew # stolen back from Frank Belew
# stolen from Manish Singh # stolen from Manish Singh
# Shamelessly stolen from Owen Taylor # 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_PATH_CLN([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for installed CLN library, and define CLN_CPPFLAGS and CLN_LIBS
dnl dnl
AC_DEFUN(AC_PATH_LIBCLN,
AC_DEFUN(AC_PATH_CLN,
[dnl [dnl
dnl Get the cppflags and libraries from the cln-config script dnl Get the cppflags and libraries from the cln-config script
dnl dnl
@ -19,153 +19,141 @@ AC_ARG_WITH(cln-prefix,[ --with-cln-prefix=PFX Prefix where CLN is installed
AC_ARG_WITH(cln-exec-prefix,[ --with-cln-exec-prefix=PFX Exec prefix where CLN is installed (optional)], AC_ARG_WITH(cln-exec-prefix,[ --with-cln-exec-prefix=PFX Exec prefix where CLN is installed (optional)],
cln_config_exec_prefix="$withval", cln_config_exec_prefix="") cln_config_exec_prefix="$withval", cln_config_exec_prefix="")
AC_ARG_ENABLE(clntest, [ --disable-clntest Do not try to compile and run a test CLN program], AC_ARG_ENABLE(clntest, [ --disable-clntest Do not try to compile and run a test CLN program],
, enable_clntest=yes)
, enable_clntest=yes)
if test x$cln_config_exec_prefix != x ; then
cln_config_args="$cln_config_args --exec-prefix=$cln_config_exec_prefix"
if test x${CLN_CONFIG+set} != xset ; then
if test x$cln_config_exec_prefix != x ; then
cln_config_args="$cln_config_args --exec-prefix=$cln_config_exec_prefix"
if test x${CLN_CONFIG+set} != xset ; then
CLN_CONFIG=$cln_config_exec_prefix/bin/cln-config CLN_CONFIG=$cln_config_exec_prefix/bin/cln-config
fi
fi
if test x$cln_config_prefix != x ; then
cln_config_args="$cln_config_args --prefix=$cln_config_prefix"
if test x${CLN_CONFIG+set} != xset ; then
fi
fi
if test x$cln_config_prefix != x ; then
cln_config_args="$cln_config_args --prefix=$cln_config_prefix"
if test x${CLN_CONFIG+set} != xset ; then
CLN_CONFIG=$cln_config_prefix/bin/cln-config CLN_CONFIG=$cln_config_prefix/bin/cln-config
fi
fi
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 $cln_config_args --cppflags`
LIBCLN_LIBS=`$CLN_CONFIG $cln_config_args --libs`
AC_PATH_PROG(CLN_CONFIG, cln-config, no)
cln_min_version=ifelse([$1], ,1.1.0,$1)
AC_MSG_CHECKING(for CLN - version >= $cln_min_version)
if test "$CLN_CONFIG" = "no" ; then
AC_MSG_RESULT(no)
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."
ifelse([$3], , :, [$3])
else
dnl Parse required version and the result of cln-config.
cln_min_major_version=`echo $cln_min_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
cln_min_minor_version=`echo $cln_min_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
cln_min_micro_version=`echo $cln_min_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
CLN_CPPFLAGS=`$CLN_CONFIG $cln_config_args --cppflags`
CLN_LIBS=`$CLN_CONFIG $cln_config_args --libs`
cln_config_major_version=`$CLN_CONFIG $cln_config_args --version | \ cln_config_major_version=`$CLN_CONFIG $cln_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
cln_config_minor_version=`$CLN_CONFIG $cln_config_args --version | \ cln_config_minor_version=`$CLN_CONFIG $cln_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
cln_config_micro_version=`$CLN_CONFIG $cln_config_args --version | \ cln_config_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([
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
dnl Check if the installed CLN is sufficiently new according to cln-config.
if test \( $cln_config_major_version -lt $cln_min_major_version \) -o \
\( $cln_config_major_version -eq $cln_min_major_version -a $cln_config_minor_version -lt $cln_min_minor_version \) -o \
\( $cln_config_major_version -eq $cln_min_major_version -a $cln_config_minor_version -eq $cln_min_minor_version -a $cln_config_micro_version -lt $cln_min_micro_version \); then
echo -e "\n*** 'cln-config --version' returned $cln_config_major_version.$cln_config_minor_version.$cln_config_micro_version, but the minimum version"
echo "*** of CLN required is $cln_min_major_version.$cln_min_minor_version.$cln_min_micro_version. If cln-config is correct, then it is"
echo "*** best to upgrade to the required version."
echo "*** If cln-config was wrong, set the environment variable CLN_CONFIG"
echo "*** to point to the correct copy of cln-config, and remove the file"
echo "*** config.cache before re-running configure."
ifelse([$3], , :, [$3])
else
dnl The versions match so far. Now do a sanity check: Does the result of cln-config
dnl match the version of the headers and the version built into the library, too?
no_cln=""
if test "x$enable_clntest" = "xyes" ; then
ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_LIBS="$LIBS"
CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
LIBS="$LIBS $CLN_LIBS"
rm -f conf.clntest
AC_TRY_RUN([
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <cln/config.h>
#include <cln/version.h>
/* we do not #include <stdlib.h> because autoconf in C++ mode inserts a /* we do not #include <stdlib.h> because autoconf in C++ mode inserts a
prototype for exit() that conflicts with the one in stdlib.h */ prototype for exit() that conflicts with the one in stdlib.h */
extern "C" int system(const char *); extern "C" int system(const char *);
char* my_strdup (char *str)
int main(void)
{ {
char *new_str;
int major, minor, micro;
char *tmp_version;
if (str) {
new_str = new char[(strlen (str) + 1) * sizeof(char)];
strcpy (new_str, str);
} else
new_str = NULL;
system("touch conf.clntest");
return new_str;
}
int main()
{
int major, minor, micro;
char *tmp_version;
system("touch conf.clntest");
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = my_strdup("$min_cln_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_cln_version");
return 1;
}
if (($cln_config_major_version > major) ||
(($cln_config_major_version == major) && ($cln_config_minor_version > minor)) ||
(($cln_config_major_version == major) && ($cln_config_minor_version == minor) && ($cln_config_micro_version >= micro))) {
if ((CL_VERSION_MAJOR == $cln_config_major_version) &&
(CL_VERSION_MINOR == $cln_config_minor_version) &&
(CL_VERSION_PATCHLEVEL == $cln_config_micro_version)) {
return 0;
} else {
printf("\n*** 'cln-config --version' returned %d.%d.%d, but the header file I found\n", $cln_config_major_version, $cln_config_minor_version, $cln_config_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;
if ((CL_VERSION_MAJOR != $cln_config_major_version) ||
(CL_VERSION_MINOR != $cln_config_minor_version) ||
(CL_VERSION_PATCHLEVEL != $cln_config_micro_version)) {
printf("\n*** 'cln-config --version' returned %d.%d.%d, but the header file I found\n", $cln_config_major_version, $cln_config_minor_version, $cln_config_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 or you have specified some wrong -I compiler flags.\n");
printf("*** Please inquire and consider reinstalling CLN.\n");
return 1;
}
if ((cln::version_major != $cln_config_major_version) ||
(cln::version_minor != $cln_config_minor_version) ||
(cln::version_patchlevel != $cln_config_micro_version)) {
printf("\n*** 'cln-config --version' returned %d.%d.%d, but the library I found\n", $cln_config_major_version, $cln_config_minor_version, $cln_config_micro_version);
printf("*** corresponds to %d.%d.%d. This mismatch suggests your installation of CLN\n", cln::version_major, cln::version_minor, cln::version_patchlevel);
printf("*** is corrupted or you have specified some wrong -L compiler flags.\n");
printf("*** 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_config_major_version, $cln_config_minor_version, $cln_config_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;
}
return 0;
} }
],, no_cln=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ],, 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, `$CLN_CONFIG --version`])
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([
CPPFLAGS="$ac_save_CPPFLAGS"
LIBS="$ac_save_LIBS"
fi
if test "x$no_cln" = x ; then
AC_MSG_RESULT([yes, `$CLN_CONFIG $cln_config_args --version`])
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test ! -f conf.clntest ; then
echo "*** Could not run CLN test program, checking why..."
CPPFLAGS="$CFLAGS $CLN_CPPFLAGS"
LIBS="$LIBS $CLN_LIBS"
AC_TRY_LINK([
#include <stdio.h> #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
#include <cln/version.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 "*** 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
CLN_CPPFLAGS=""
CLN_LIBS=""
ifelse([$3], , :, [$3])
fi
fi
fi
AC_SUBST(CLN_CPPFLAGS)
AC_SUBST(CLN_LIBS)
rm -f conf.clntest
]) ])

2
configure.in

@ -13,7 +13,7 @@ dnl Makefile ---<make>--->> libcln.a
dnl dnl
dnl dnl
AC_INIT(src/integer/gcd/cl_I_gcd.cc) AC_INIT(src/integer/gcd/cl_I_gcd.cc)
AC_CONFIG_HEADER(include/cln/config.h src/base/cl_base_config.h src/base/cl_gmpconfig.h src/float/cl_float_config.h src/timing/cl_t_config.h)
AC_CONFIG_HEADER(include/cln/config.h include/cln/version.h src/base/cl_base_config.h src/base/cl_gmpconfig.h src/float/cl_float_config.h src/timing/cl_t_config.h)
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
dnl This piece of sed script replaces every line containing '@subdir@' dnl This piece of sed script replaces every line containing '@subdir@'
dnl by several consecutive lines, each referencing one subdir. dnl by several consecutive lines, each referencing one subdir.

9
doc/Makefile.in

@ -18,6 +18,7 @@ DESTDIR =
# Programs used by "make": # Programs used by "make":
RM = rm -f RM = rm -f
MKDIR = mkdir -p
@SET_MAKE@ @SET_MAKE@
# Programs used by "make" if you have changed the documentation files: # Programs used by "make" if you have changed the documentation files:
@ -84,10 +85,10 @@ install : all installdirs force
$(INSTALL_DATA) $(srcdir)/$(PACKAGE).dvi $(DESTDIR)$(dvidir)/$(PACKAGE).dvi $(INSTALL_DATA) $(srcdir)/$(PACKAGE).dvi $(DESTDIR)$(dvidir)/$(PACKAGE).dvi
installdirs : force installdirs : force
if [ ! -d $(DESTDIR)$(datadir) ] ; then mkdir $(DESTDIR)$(datadir) ; fi
if [ ! -d $(DESTDIR)$(infodir) ] ; then mkdir $(DESTDIR)$(infodir) ; fi
if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi
if [ ! -d $(DESTDIR)$(dvidir) ] ; then mkdir $(DESTDIR)$(dvidir) ; fi
$(MKDIR) $(DESTDIR)$(datadir)
$(MKDIR) $(DESTDIR)$(infodir)
$(MKDIR) $(DESTDIR)$(htmldir)
$(MKDIR) $(DESTDIR)$(dvidir)
uninstall : force uninstall : force
$(RM) $(DESTDIR)$(infodir)/$(PACKAGE).info $(RM) $(DESTDIR)$(infodir)/$(PACKAGE).info

16
doc/cln.tex

@ -3377,18 +3377,18 @@ 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 program with CLN. Start it with @code{--help} to learn about its options
or consult the manpage that comes with it. or consult the manpage that comes with it.
@item @item
@cindex @code{AC_PATH_LIBCLN}
@code{AC_PATH_LIBCLN} is for packages configured using GNU automake.
@cindex @code{AC_PATH_CLN}
@code{AC_PATH_CLN} is for packages configured using GNU automake.
The synopsis is: The synopsis is:
@example @example
@code{AC_PATH_LIBCLN([@var{MINIMUM-VERSION}, [@var{ACTION-IF-FOUND} [, @var{ACTION-IF-NOT-FOUND}]]])}
@code{AC_PATH_CLN([@var{MIN-VERSION}, [@var{ACTION-IF-FOUND} [, @var{ACTION-IF-NOT-FOUND}]]])}
@end example @end example
This macro determines the location of CLN using @code{cln-config}, which 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 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 @code{CLN_CONFIG}. It tests the installed libraries to make sure that
their version is later than @var{MINIMUM-VERSION} (a default version
their version is not earlier than @var{MIN-VERSION} (a default version
will be used if not specified). If the required version was found, sets will be used if not specified). If the required version was found, sets
the @env{CLNLIB_CPPFLAGS} and the @env{CLNLIB_LIBS} variables. This
the @env{CLN_CPPFLAGS} and the @env{CLN_LIBS} variables. This
macro is in the file @file{cln.m4} which is installed in macro is in the file @file{cln.m4} which is installed in
@file{$datadir/aclocal}. Note that if automake was installed with a @file{$datadir/aclocal}. Note that if automake was installed with a
different @samp{--prefix} than CLN, you will either have to manually different @samp{--prefix} than CLN, you will either have to manually
@ -3396,9 +3396,9 @@ 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 aclocal the @samp{-I} option when running it. Here is a possible example
to be included in your package's @file{configure.in}: to be included in your package's @file{configure.in}:
@example @example
AC_PATH_LIBCLN(1.1.0, [
LIBS="$LIBS $LIBCLN_LIBS"
CPPFLAGS="$CPPFLAGS $LIBCLN_CPPFLAGS"
AC_PATH_CLN(1.1.0, [
LIBS="$LIBS $CLN_LIBS"
CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
], AC_MSG_ERROR([No suitable installed version of CLN could be found.])) ], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
@end example @end example
@end itemize @end itemize

19
src/Makefile.in

@ -39,6 +39,7 @@ RANLIB = @RANLIB@
MV = mv MV = mv
LN = ln LN = ln
RM = rm -f RM = rm -f
MKDIR = mkdir -p
@SET_MAKE@ @SET_MAKE@
# Libtool's library interface versions: # Libtool's library interface versions:
CL_CURRENT = @CL_CURRENT@ CL_CURRENT = @CL_CURRENT@
@ -200,25 +201,15 @@ libcln.la : $(LIBTOOL) $(ALLOBJECTS_LO)
$(LIBTOOL_LINK) $(CC) -o libcln.la -rpath $(libdir) -version-info $(CL_CURRENT):$(CL_REVISION):$(CL_AGE) $(LDFLAGS) $(LIBS) $(ALLOBJECTS_LO) $(LIBTOOL_LINK) $(CC) -o libcln.la -rpath $(libdir) -version-info $(CL_CURRENT):$(CL_REVISION):$(CL_AGE) $(LDFLAGS) $(LIBS) $(ALLOBJECTS_LO)
install : all force install : all force
if [ ! -d $(DESTDIR)$(libdir) ] ; then mkdir $(DESTDIR)$(libdir) ; fi
$(MKDIR) $(DESTDIR)$(libdir)
$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcln.la $(DESTDIR)$(libdir)/libcln.la $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcln.la $(DESTDIR)$(libdir)/libcln.la
if [ ! -d $(DESTDIR)$(includedir) ] ; then mkdir $(DESTDIR)$(includedir) ; fi
if [ ! -d $(DESTDIR)$(includedir)/cln ] ; then mkdir $(DESTDIR)$(includedir)/cln ; fi
$(MKDIR) $(DESTDIR)$(includedir)/cln
$(INSTALL_DATA) $(top_srcdir)/include/cln/*.h $(DESTDIR)$(includedir)/cln $(INSTALL_DATA) $(top_srcdir)/include/cln/*.h $(DESTDIR)$(includedir)/cln
$(INSTALL_DATA) ../include/cln/*.h $(DESTDIR)$(includedir)/cln $(INSTALL_DATA) ../include/cln/*.h $(DESTDIR)$(includedir)/cln
# if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi
# if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi
# if [ ! -d $(DESTDIR)$(datadir) ] ; then mkdir $(DESTDIR)$(datadir) ; fi
# if [ ! -d $(DESTDIR)$(datadir)/html ] ; then mkdir $(DESTDIR)$(datadir)/html ; fi
installdirs : force installdirs : force
if [ ! -d $(DESTDIR)$(libdir) ] ; then mkdir $(DESTDIR)$(libdir) ; fi
if [ ! -d $(DESTDIR)$(includedir) ] ; then mkdir $(DESTDIR)$(includedir) ; fi
if [ ! -d $(DESTDIR)$(includedir)/cln ] ; then mkdir $(DESTDIR)$(includedir)/cln ; fi
# if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi
# if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi
# if [ ! -d $(DESTDIR)$(datadir) ] ; then mkdir $(DESTDIR)$(datadir) ; fi
# if [ ! -d $(DESTDIR)$(datadir)/html ] ; then mkdir $(DESTDIR)$(datadir)/html ; fi
$(MKDIR) $(DESTDIR)$(libdir)
$(MKDIR) $(DESTDIR)$(includedir)/cln
uninstall : force uninstall : force
$(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libcln.la $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libcln.la

Loading…
Cancel
Save