diff options
| -rw-r--r-- | Makefile.in | 21 | ||||
| -rwxr-xr-x | configure | 95 |
2 files changed, 114 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index f8d3058..919e17d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -69,7 +69,7 @@ am_radsecproxy_OBJECTS = radsecproxy-radsecproxy.$(OBJEXT) \ radsecproxy-tlv11.$(OBJEXT) radsecproxy-hostport.$(OBJEXT) \ radsecproxy-radmsg.$(OBJEXT) radsecproxy-udp.$(OBJEXT) \ radsecproxy-tcp.$(OBJEXT) radsecproxy-tls.$(OBJEXT) \ - radsecproxy-dtls.$(OBJEXT) + radsecproxy-dtls.$(OBJEXT) radsecproxy-fticks.$(OBJEXT) radsecproxy_OBJECTS = $(am_radsecproxy_OBJECTS) radsecproxy_DEPENDENCIES = radsecproxy_LINK = $(CCLD) $(radsecproxy_CFLAGS) $(CFLAGS) \ @@ -238,6 +238,7 @@ radsecproxy_SOURCES = radsecproxy.c \ tcp.c \ tls.c \ dtls.c \ + fticks.c \ radsecproxy.h \ tlscommon.h \ gconfig.h \ @@ -251,7 +252,8 @@ radsecproxy_SOURCES = radsecproxy.c \ udp.h \ tcp.h \ tls.h \ - dtls.h + dtls.h \ + fticks.h catgconf_SOURCES = debug.c \ util.c \ @@ -399,6 +401,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/catgconf-util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radsecproxy-debug.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radsecproxy-dtls.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radsecproxy-fticks.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radsecproxy-gconfig.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radsecproxy-hash.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radsecproxy-hostport.Po@am__quote@ @@ -677,6 +680,20 @@ radsecproxy-dtls.obj: dtls.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dtls.c' object='radsecproxy-dtls.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(radsecproxy_CFLAGS) $(CFLAGS) -c -o radsecproxy-dtls.obj `if test -f 'dtls.c'; then $(CYGPATH_W) 'dtls.c'; else $(CYGPATH_W) '$(srcdir)/dtls.c'; fi` + +radsecproxy-fticks.o: fticks.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(radsecproxy_CFLAGS) $(CFLAGS) -MT radsecproxy-fticks.o -MD -MP -MF $(DEPDIR)/radsecproxy-fticks.Tpo -c -o radsecproxy-fticks.o `test -f 'fticks.c' || echo '$(srcdir)/'`fticks.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/radsecproxy-fticks.Tpo $(DEPDIR)/radsecproxy-fticks.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fticks.c' object='radsecproxy-fticks.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(radsecproxy_CFLAGS) $(CFLAGS) -c -o radsecproxy-fticks.o `test -f 'fticks.c' || echo '$(srcdir)/'`fticks.c + +radsecproxy-fticks.obj: fticks.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(radsecproxy_CFLAGS) $(CFLAGS) -MT radsecproxy-fticks.obj -MD -MP -MF $(DEPDIR)/radsecproxy-fticks.Tpo -c -o radsecproxy-fticks.obj `if test -f 'fticks.c'; then $(CYGPATH_W) 'fticks.c'; else $(CYGPATH_W) '$(srcdir)/fticks.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/radsecproxy-fticks.Tpo $(DEPDIR)/radsecproxy-fticks.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fticks.c' object='radsecproxy-fticks.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(radsecproxy_CFLAGS) $(CFLAGS) -c -o radsecproxy-fticks.obj `if test -f 'fticks.c'; then $(CYGPATH_W) 'fticks.c'; else $(CYGPATH_W) '$(srcdir)/fticks.c'; fi` install-man1: $(dist_man_MANS) @$(NORMAL_INSTALL) test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @@ -1437,6 +1437,52 @@ fi as_fn_set_status $ac_retval } # ac_fn_c_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -3564,6 +3610,55 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nettle_sha256_init in -lnettle" >&5 +$as_echo_n "checking for nettle_sha256_init in -lnettle... " >&6; } +if test "${ac_cv_lib_nettle_nettle_sha256_init+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnettle $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char nettle_sha256_init (); +int +main () +{ +return nettle_sha256_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nettle_nettle_sha256_init=yes +else + ac_cv_lib_nettle_nettle_sha256_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nettle_nettle_sha256_init" >&5 +$as_echo "$ac_cv_lib_nettle_nettle_sha256_init" >&6; } +if test "x$ac_cv_lib_nettle_nettle_sha256_init" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBNETTLE 1 +_ACEOF + + LIBS="-lnettle $LIBS" + +else + as_fn_error $? "required library nettle not found" "$LINENO" 5 +fi + + + case "${target_os}" in solaris*) TARGET_CFLAGS="-DSYS_SOLARIS9 -D_POSIX_PTHREAD_SEMANTICS" |