Skip to content

Commit 47df661

Browse files
committed
configure file needed unix style LF format
configure file had Windows DOS style CRLF, but needs to have LF format
1 parent f384477 commit 47df661

File tree

3 files changed

+43
-76
lines changed

3 files changed

+43
-76
lines changed

config.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
/* #undef BSD_AUTH */
8484

8585
/* Define if you want to specify the path to your lastlog file */
86-
#define CONF_LASTLOG_FILE "/var/log/lastlog"
86+
/* #undef CONF_LASTLOG_FILE */
8787

8888
/* Define if you want to specify the path to your utmp file */
8989
#define CONF_UTMP_FILE "/var/run/utmp"
@@ -1640,5 +1640,7 @@
16401640
#define HAVE_DECL_NFDBITS 0
16411641
#define HAVE_DECL_HOWMANY 0
16421642

1643+
#define WIN32_ZLIB_NO 1
1644+
16431645
//#define HAVE_ARC4RANDOM_UNIFORM 1
16441646

configure

Lines changed: 36 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -5847,79 +5847,42 @@ rm -f core conftest.err conftest.$ac_objext \
58475847
# -fstack-protector-all doesn't always work for some GCC versions
58485848
# and/or platforms, so we test if we can. If it's not supported
58495849
# on a given platform gcc will emit a warning so we use -Werror.
5850-
if test "x$use_stack_protector" = "x1"; then
5851-
for t in -fstack-protector-all -fstack-protector; do
5852-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $t" >&5
5853-
$as_echo_n "checking if $CC supports $t... " >&6; }
5854-
saved_CFLAGS="$CFLAGS"
5855-
saved_LDFLAGS="$LDFLAGS"
5856-
CFLAGS="$CFLAGS $t -Werror"
5857-
LDFLAGS="$LDFLAGS $t -Werror"
5858-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5859-
/* end confdefs.h. */
5860-
#include <stdio.h>
5861-
int
5862-
main ()
5863-
{
5864-
5865-
char x[256];
5866-
snprintf(x, sizeof(x), "XXX");
5867-
5868-
;
5869-
return 0;
5870-
}
5871-
_ACEOF
5872-
if ac_fn_c_try_link "$LINENO"; then :
5873-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5874-
$as_echo "yes" >&6; }
5875-
CFLAGS="$saved_CFLAGS $t"
5876-
LDFLAGS="$saved_LDFLAGS $t"
5877-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $t works" >&5
5878-
$as_echo_n "checking if $t works... " >&6; }
5879-
if test "$cross_compiling" = yes; then :
5880-
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: cannot test" >&5
5881-
$as_echo "$as_me: WARNING: cross compiling: cannot test" >&2;}
5882-
break
5883-
5884-
else
5885-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5886-
/* end confdefs.h. */
5887-
#include <stdio.h>
5888-
int
5889-
main ()
5890-
{
5891-
5892-
char x[256];
5893-
snprintf(x, sizeof(x), "XXX");
5894-
5895-
;
5896-
return 0;
5897-
}
5898-
_ACEOF
5899-
if ac_fn_c_try_run "$LINENO"; then :
5900-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5901-
$as_echo "yes" >&6; }
5902-
break
5903-
else
5904-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5905-
$as_echo "no" >&6; }
5906-
fi
5907-
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
5908-
conftest.$ac_objext conftest.beam conftest.$ac_ext
5909-
fi
5910-
5911-
5912-
else
5913-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5914-
$as_echo "no" >&6; }
5915-
5916-
fi
5917-
rm -f core conftest.err conftest.$ac_objext \
5918-
conftest$ac_exeext conftest.$ac_ext
5919-
CFLAGS="$saved_CFLAGS"
5920-
LDFLAGS="$saved_LDFLAGS"
5921-
done
5922-
fi
5850+
# if test "x$use_stack_protector" = "x1"; then
5851+
# for t in -fstack-protector-all -fstack-protector; do
5852+
# AC_MSG_CHECKING([if $CC supports $t])
5853+
# saved_CFLAGS="$CFLAGS"
5854+
# saved_LDFLAGS="$LDFLAGS"
5855+
# CFLAGS="$CFLAGS $t -Werror"
5856+
# LDFLAGS="$LDFLAGS $t -Werror"
5857+
# AC_LINK_IFELSE(
5858+
# [AC_LANG_PROGRAM([[ #include <stdio.h> ]],
5859+
# [[
5860+
# char x[256];
5861+
# snprintf(x, sizeof(x), "XXX");
5862+
# ]])],
5863+
# [ AC_MSG_RESULT([yes])
5864+
# CFLAGS="$saved_CFLAGS $t"
5865+
# LDFLAGS="$saved_LDFLAGS $t"
5866+
# AC_MSG_CHECKING([if $t works])
5867+
# AC_RUN_IFELSE(
5868+
# [AC_LANG_PROGRAM([[ #include <stdio.h> ]],
5869+
# [[
5870+
# char x[256];
5871+
# snprintf(x, sizeof(x), "XXX");
5872+
# ]])],
5873+
# [ AC_MSG_RESULT([yes])
5874+
# break ],
5875+
# [ AC_MSG_RESULT([no]) ],
5876+
# [ AC_MSG_WARN([cross compiling: cannot test])
5877+
# break ]
5878+
# )
5879+
# ],
5880+
# [ AC_MSG_RESULT([no]) ]
5881+
# )
5882+
# CFLAGS="$saved_CFLAGS"
5883+
# LDFLAGS="$saved_LDFLAGS"
5884+
# done
5885+
# fi
59235886
59245887
if test -z "$have_llong_max"; then
59255888
# retry LLONG_MAX with -std=gnu99, needed on some Linuxes

runconfigure

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
@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
2-
./configure --build=i686-pc-mingw32 --host=i686-pc-mingw32 --with-ssl-dir=../openssl-1.0.2d --with-kerberos5
1+
autoreconf
2+
##./configure --build=i686-pc-mingw32 --host=i686-pc-mingw32 --with-ssl-dir=../openssl-1.0.2d --with-kerberos5 --with-zlib=../zlib-1.2.8
3+
./configure --build=i686-pc-mingw32 --host=i686-pc-mingw32 --with-ssl-dir=../openssl-1.0.2d --with-kerberos5
4+
cat config.h.tail >> config.h

0 commit comments

Comments
 (0)