5ce3c357c0d5323502a2f8b1835c9a690d6da09c
[openwrt/svn-archive/packages.git] / net / stunnel / patches / 100-cross-compile.patch
1 --- a/configure
2 +++ b/configure
3 @@ -21552,56 +21552,56 @@ _ACEOF
4 fi
5 rm -f conftest*
6
7 -
8 -{ echo "$as_me:$LINENO: **************************************** PTY device files" >&5
9 -echo "$as_me: **************************************** PTY device files" >&6;}
10 -{ echo "$as_me:$LINENO: checking for \"/dev/ptmx\"" >&5
11 -echo $ECHO_N "checking for \"/dev/ptmx\"... $ECHO_C" >&6; }
12 -if test "${ac_cv_file___dev_ptmx_+set}" = set; then
13 - echo $ECHO_N "(cached) $ECHO_C" >&6
14 -else
15 - test "$cross_compiling" = yes &&
16 - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
17 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
18 - { (exit 1); exit 1; }; }
19 -if test -r ""/dev/ptmx""; then
20 - ac_cv_file___dev_ptmx_=yes
21 -else
22 - ac_cv_file___dev_ptmx_=no
23 -fi
24 -fi
25 -{ echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptmx_" >&5
26 -echo "${ECHO_T}$ac_cv_file___dev_ptmx_" >&6; }
27 -if test $ac_cv_file___dev_ptmx_ = yes; then
28 +#
29 +#{ echo "$as_me:$LINENO: **************************************** PTY device files" >&5
30 +#echo "$as_me: **************************************** PTY device files" >&6;}
31 +#{ echo "$as_me:$LINENO: checking for \"/dev/ptmx\"" >&5
32 +#echo $ECHO_N "checking for \"/dev/ptmx\"... $ECHO_C" >&6; }
33 +#if test "${ac_cv_file___dev_ptmx_+set}" = set; then
34 +# echo $ECHO_N "(cached) $ECHO_C" >&6
35 +#else
36 +# test "$cross_compiling" = yes &&
37 +# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
38 +#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
39 +# { (exit 1); exit 1; }; }
40 +#if test -r ""/dev/ptmx""; then
41 +# ac_cv_file___dev_ptmx_=yes
42 +#else
43 +# ac_cv_file___dev_ptmx_=no
44 +#fi
45 +#fi
46 +#{ echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptmx_" >&5
47 +#echo "${ECHO_T}$ac_cv_file___dev_ptmx_" >&6; }
48 +#if test $ac_cv_file___dev_ptmx_ = yes; then
49 cat >>confdefs.h <<\_ACEOF
50 -#define HAVE_DEV_PTMX 1
51 +#define HAVE_DEV_PTMX 0
52 _ACEOF
53
54 -fi
55 +#fi
56
57 -{ echo "$as_me:$LINENO: checking for \"/dev/ptc\"" >&5
58 -echo $ECHO_N "checking for \"/dev/ptc\"... $ECHO_C" >&6; }
59 -if test "${ac_cv_file___dev_ptc_+set}" = set; then
60 - echo $ECHO_N "(cached) $ECHO_C" >&6
61 -else
62 - test "$cross_compiling" = yes &&
63 - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
64 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
65 - { (exit 1); exit 1; }; }
66 -if test -r ""/dev/ptc""; then
67 - ac_cv_file___dev_ptc_=yes
68 -else
69 - ac_cv_file___dev_ptc_=no
70 -fi
71 -fi
72 -{ echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptc_" >&5
73 -echo "${ECHO_T}$ac_cv_file___dev_ptc_" >&6; }
74 -if test $ac_cv_file___dev_ptc_ = yes; then
75 +#{ echo "$as_me:$LINENO: checking for \"/dev/ptc\"" >&5
76 +#echo $ECHO_N "checking for \"/dev/ptc\"... $ECHO_C" >&6; }
77 +#if test "${ac_cv_file___dev_ptc_+set}" = set; then
78 +# echo $ECHO_N "(cached) $ECHO_C" >&6
79 +#else
80 +# test "$cross_compiling" = yes &&
81 +# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
82 +#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
83 +# { (exit 1); exit 1; }; }
84 +#if test -r ""/dev/ptc""; then
85 +# ac_cv_file___dev_ptc_=yes
86 +#else
87 +# ac_cv_file___dev_ptc_=no
88 +#fi
89 +#fi
90 +#{ echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptc_" >&5
91 +#echo "${ECHO_T}$ac_cv_file___dev_ptc_" >&6; }
92 +#if test $ac_cv_file___dev_ptc_ = yes; then
93 cat >>confdefs.h <<\_ACEOF
94 -#define HAVE_DEV_PTS_AND_PTC 1
95 +#define HAVE_DEV_PTS_AND_PTC 0
96 _ACEOF
97
98 -fi
99 +#fi
100
101
102 { echo "$as_me:$LINENO: **************************************** entropy" >&5
103 @@ -24049,8 +24049,8 @@ _ACEOF
104
105
106 # Add SSL includes and libraries
107 -CFLAGS="$CFLAGS -I$ssldir/include"
108 -LIBS="$LIBS -L$ssldir/lib -lssl -lcrypto"
109 +CFLAGS="$CFLAGS"
110 +LIBS="$LIBS -lssl -lcrypto"
111
112 # Check for obsolete RSAref library
113 { echo "$as_me:$LINENO: checking for obsolete RSAref library" >&5
114 --- a/configure.ac
115 +++ b/configure.ac
116 @@ -44,10 +44,6 @@ AC_EGREP_HEADER(socklen_t, sys/socket.h,
117 AC_MSG_RESULT([no (defined as int)])
118 AC_DEFINE(socklen_t, int))
119
120 -AC_MSG_NOTICE([**************************************** PTY device files])
121 -AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX))
122 -AC_CHECK_FILE("/dev/ptc", AC_DEFINE(HAVE_DEV_PTS_AND_PTC))
123 -
124 AC_MSG_NOTICE([**************************************** entropy])
125
126 AC_ARG_WITH(egd-socket,