discontinued / token · Commits

Commit 365cfb81aa2346adfb00a74fbc2edd99f75dee48

Authored by Georg Hopp
2 parents a6430054 e056881f

merge changes from origin

Inline Side-by-side
Showing 7 changed files with 23 additions and 4 deletions
@@ -42,7 +42,10 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ @@ -42,7 +42,10 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
42 compile config.guess config.sub depcomp install-sh ltmain.sh \ 42 compile config.guess config.sub depcomp install-sh ltmain.sh \
43 missing 43 missing
44 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 44 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
45 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac 45 +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
  46 + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
  47 + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
  48 + $(top_srcdir)/configure.ac
46 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 49 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
47 $(ACLOCAL_M4) 50 $(ACLOCAL_M4)
48 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ 51 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
This diff could not be displayed because it is too large.
@@ -7895,6 +7895,10 @@ _lt_linker_boilerplate=`cat conftest.err` @@ -7895,6 +7895,10 @@ _lt_linker_boilerplate=`cat conftest.err`
7895 $RM -r conftest* 7895 $RM -r conftest*
7896 7896
7897 7897
  7898 +## CAVEAT EMPTOR:
  7899 +## There is no encapsulation within the following macros, do not change
  7900 +## the running order or otherwise move them around unless you know exactly
  7901 +## what you are doing...
7898 if test -n "$compiler"; then 7902 if test -n "$compiler"; then
7899 7903
7900 lt_prog_compiler_no_builtin_flag= 7904 lt_prog_compiler_no_builtin_flag=
@@ -38,7 +38,10 @@ subdir = include @@ -38,7 +38,10 @@ subdir = include
38 DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \ 38 DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
39 $(srcdir)/Makefile.in 39 $(srcdir)/Makefile.in
40 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 40 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac 41 +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
  42 + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
  43 + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
  44 + $(top_srcdir)/configure.ac
42 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 45 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
43 $(ACLOCAL_M4) 46 $(ACLOCAL_M4)
44 mkinstalldirs = $(install_sh) -d 47 mkinstalldirs = $(install_sh) -d
@@ -37,7 +37,10 @@ host_triplet = @host@ @@ -37,7 +37,10 @@ host_triplet = @host@
37 subdir = src 37 subdir = src
38 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 38 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
39 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 39 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
40 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac 40 +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
  41 + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
  42 + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
  43 + $(top_srcdir)/configure.ac
41 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 44 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
42 $(ACLOCAL_M4) 45 $(ACLOCAL_M4)
43 mkinstalldirs = $(install_sh) -d 46 mkinstalldirs = $(install_sh) -d
  1 +ACLOCAL_AMFLAGS = -I m4
  2 +
1 TESTS = crypt decrypt dyntype hash packet 3 TESTS = crypt decrypt dyntype hash packet
2 check_PROGRAMS = crypt decrypt dyntype hash packet 4 check_PROGRAMS = crypt decrypt dyntype hash packet
3 5
@@ -40,7 +40,10 @@ check_PROGRAMS = crypt$(EXEEXT) decrypt$(EXEEXT) dyntype$(EXEEXT) \ @@ -40,7 +40,10 @@ check_PROGRAMS = crypt$(EXEEXT) decrypt$(EXEEXT) dyntype$(EXEEXT) \
40 subdir = tests 40 subdir = tests
41 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 41 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
42 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 42 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
43 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac 43 +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
  44 + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
  45 + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
  46 + $(top_srcdir)/configure.ac
44 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 47 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
45 $(ACLOCAL_M4) 48 $(ACLOCAL_M4)
46 mkinstalldirs = $(install_sh) -d 49 mkinstalldirs = $(install_sh) -d
@@ -213,6 +216,7 @@ target_alias = @target_alias@ @@ -213,6 +216,7 @@ target_alias = @target_alias@
213 top_build_prefix = @top_build_prefix@ 216 top_build_prefix = @top_build_prefix@
214 top_builddir = @top_builddir@ 217 top_builddir = @top_builddir@
215 top_srcdir = @top_srcdir@ 218 top_srcdir = @top_srcdir@
  219 +ACLOCAL_AMFLAGS = -I m4
216 crypt_SOURCES = crypt.c ../base64.c 220 crypt_SOURCES = crypt.c ../base64.c
217 crypt_LDADD = ../src/libtoken.la $(LIBOBJS) 221 crypt_LDADD = ../src/libtoken.la $(LIBOBJS)
218 crypt_CFLAGS = -I ../include -I .. 222 crypt_CFLAGS = -I ../include -I ..
Please register or login to post a comment