From 47df66126a55daf271af32e86aeebebd49a87be5 Mon Sep 17 00:00:00 2001 From: quamrulmina Date: Fri, 9 Oct 2015 12:11:58 -0500 Subject: [PATCH] configure file needed unix style LF format configure file had Windows DOS style CRLF, but needs to have LF format --- config.h | 4 +- configure | 109 +++++++++++++++++---------------------------------- runconfigure | 6 ++- 3 files changed, 43 insertions(+), 76 deletions(-) diff --git a/config.h b/config.h index af0e1ad..06ac8a3 100644 --- a/config.h +++ b/config.h @@ -83,7 +83,7 @@ /* #undef BSD_AUTH */ /* Define if you want to specify the path to your lastlog file */ -#define CONF_LASTLOG_FILE "/var/log/lastlog" +/* #undef CONF_LASTLOG_FILE */ /* Define if you want to specify the path to your utmp file */ #define CONF_UTMP_FILE "/var/run/utmp" @@ -1640,5 +1640,7 @@ #define HAVE_DECL_NFDBITS 0 #define HAVE_DECL_HOWMANY 0 +#define WIN32_ZLIB_NO 1 + //#define HAVE_ARC4RANDOM_UNIFORM 1 diff --git a/configure b/configure index f60a830..f6b5e23 100644 --- a/configure +++ b/configure @@ -5847,79 +5847,42 @@ rm -f core conftest.err conftest.$ac_objext \ # -fstack-protector-all doesn't always work for some GCC versions # and/or platforms, so we test if we can. If it's not supported # on a given platform gcc will emit a warning so we use -Werror. - if test "x$use_stack_protector" = "x1"; then - for t in -fstack-protector-all -fstack-protector; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $t" >&5 -$as_echo_n "checking if $CC supports $t... " >&6; } - saved_CFLAGS="$CFLAGS" - saved_LDFLAGS="$LDFLAGS" - CFLAGS="$CFLAGS $t -Werror" - LDFLAGS="$LDFLAGS $t -Werror" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - #include -int -main () -{ - - char x[256]; - snprintf(x, sizeof(x), "XXX"); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - CFLAGS="$saved_CFLAGS $t" - LDFLAGS="$saved_LDFLAGS $t" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $t works" >&5 -$as_echo_n "checking if $t works... " >&6; } - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: cannot test" >&5 -$as_echo "$as_me: WARNING: cross compiling: cannot test" >&2;} - break - -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - #include -int -main () -{ - - char x[256]; - snprintf(x, sizeof(x), "XXX"); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - break -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$saved_CFLAGS" - LDFLAGS="$saved_LDFLAGS" - done - fi +# if test "x$use_stack_protector" = "x1"; then +# for t in -fstack-protector-all -fstack-protector; do +# AC_MSG_CHECKING([if $CC supports $t]) +# saved_CFLAGS="$CFLAGS" +# saved_LDFLAGS="$LDFLAGS" +# CFLAGS="$CFLAGS $t -Werror" +# LDFLAGS="$LDFLAGS $t -Werror" +# AC_LINK_IFELSE( +# [AC_LANG_PROGRAM([[ #include ]], +# [[ +# char x[256]; +# snprintf(x, sizeof(x), "XXX"); +# ]])], +# [ AC_MSG_RESULT([yes]) +# CFLAGS="$saved_CFLAGS $t" +# LDFLAGS="$saved_LDFLAGS $t" +# AC_MSG_CHECKING([if $t works]) +# AC_RUN_IFELSE( +# [AC_LANG_PROGRAM([[ #include ]], +# [[ +# char x[256]; +# snprintf(x, sizeof(x), "XXX"); +# ]])], +# [ AC_MSG_RESULT([yes]) +# break ], +# [ AC_MSG_RESULT([no]) ], +# [ AC_MSG_WARN([cross compiling: cannot test]) +# break ] +# ) +# ], +# [ AC_MSG_RESULT([no]) ] +# ) +# CFLAGS="$saved_CFLAGS" +# LDFLAGS="$saved_LDFLAGS" +# done +# fi if test -z "$have_llong_max"; then # retry LLONG_MAX with -std=gnu99, needed on some Linuxes diff --git a/runconfigure b/runconfigure index 9cd8982..2a5a15e 100644 --- a/runconfigure +++ b/runconfigure @@ -1,2 +1,4 @@ -@REM ./configure --build=i686-pc-mingw32 --host=i686-pc-mingw32 --with-ssl-dir=../openssl-1.0.2d --with-zlib=../zlib-1.2.8 --with-kerberos5 -./configure --build=i686-pc-mingw32 --host=i686-pc-mingw32 --with-ssl-dir=../openssl-1.0.2d --with-kerberos5 \ No newline at end of file +autoreconf +##./configure --build=i686-pc-mingw32 --host=i686-pc-mingw32 --with-ssl-dir=../openssl-1.0.2d --with-kerberos5 --with-zlib=../zlib-1.2.8 +./configure --build=i686-pc-mingw32 --host=i686-pc-mingw32 --with-ssl-dir=../openssl-1.0.2d --with-kerberos5 +cat config.h.tail >> config.h