]>
Commit | Line | Data |
---|---|---|
a41fbca7 | 1 | --- samba-3.0.23b.org/source/torture/nsstest.c 2006-04-20 04:29:44.000000000 +0200 |
2 | +++ samba-3.0.23b/source/torture/nsstest.c 2006-08-09 21:19:38.922291250 +0200 | |
3 | @@ -21,7 +21,7 @@ | |
97e7df4f | 4 | |
a41fbca7 | 5 | #include "includes.h" |
6 | ||
7 | -static const char *so_path = "/lib/libnss_winbind.so"; | |
8 | +static const char *so_path = "/lib64/libnss_winbind.so"; | |
9 | static const char *nss_name = "winbind"; | |
10 | static int nss_errno; | |
11 | static NSS_STATUS last_error; | |
12 | --- samba-3.0.25a/source/aclocal.m4.orig 2007-03-01 05:55:17.000000000 +0100 | |
13 | +++ samba-3.0.25a/source/aclocal.m4 2007-06-14 18:45:50.703496205 +0200 | |
14 | @@ -268,20 +268,20 @@ | |
3162298d JK |
15 | $1=[$]ac_new_flags |
16 | ]) | |
a41fbca7 | 17 | |
18 | -dnl Removes '-L/usr/lib[/]', '-Wl,-rpath,/usr/lib[/]' | |
19 | -dnl and '-Wl,-rpath -Wl,/usr/lib[/]' from given variable | |
20 | +dnl Removes '-L/usr/lib64[/]', '-Wl,-rpath,/usr/lib64[/]' | |
21 | +dnl and '-Wl,-rpath -Wl,/usr/lib64[/]' from given variable | |
3162298d JK |
22 | AC_DEFUN(LIB_REMOVE_USR_LIB,[ |
23 | ac_new_flags="" | |
a41fbca7 | 24 | l="" |
3162298d | 25 | for i in [$]$1; do |
a41fbca7 | 26 | case [$]l[$]i in |
27 | - -L/usr/lib) ;; | |
28 | - -L/usr/lib/) ;; | |
29 | - -Wl,-rpath,/usr/lib) ;; | |
30 | - -Wl,-rpath,/usr/lib/) ;; | |
31 | + -L/usr/lib64) ;; | |
32 | + -L/usr/lib64/) ;; | |
33 | + -Wl,-rpath,/usr/lib64) ;; | |
34 | + -Wl,-rpath,/usr/lib64/) ;; | |
35 | -Wl,-rpath) l=[$]i;; | |
36 | - -Wl,-rpath-Wl,/usr/lib) l="";; | |
37 | - -Wl,-rpath-Wl,/usr/lib/) l="";; | |
38 | + -Wl,-rpath-Wl,/usr/lib64) l="";; | |
39 | + -Wl,-rpath-Wl,/usr/lib64/) l="";; | |
40 | *) | |
41 | s=" " | |
42 | if test x"[$]ac_new_flags" = x""; then | |
43 | @@ -429,9 +429,9 @@ | |
3162298d JK |
44 | ]) |
45 | ||
46 | dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR) | |
47 | -dnl This function doesn't add -L/usr/lib into LDFLAGS | |
48 | +dnl This function doesn't add -L/usr/lib64 into LDFLAGS | |
49 | AC_DEFUN(LIB_ADD_DIR,[ | |
50 | -if test "$2" != "/usr/lib" ; then | |
51 | +if test "$2" != "/usr/lib64" ; then | |
52 | $1="$$1 -L$2" | |
53 | fi | |
54 | ]) | |
a41fbca7 | 55 | --- samba-3.0.25a/source/configure.in.orig 2007-05-23 17:29:20.000000000 +0200 |
56 | +++ samba-3.0.25a/source/configure.in 2007-06-14 18:49:28.307646759 +0200 | |
57 | @@ -31,7 +31,7 @@ | |
168aa782 | 58 | test "${mandir}" || mandir="\${prefix}/man" |
12585bdc AM |
59 | logfilebase="\${VARDIR}" |
60 | privatedir="\${prefix}/private" | |
168aa782 AM |
61 | -test "${libdir}" || libdir="\${prefix}/lib" |
62 | +test "${libdir}" || libdir="\${prefix}/lib64" | |
63 | pammodulesdir="\${LIBDIR}/security" | |
12585bdc AM |
64 | configdir="\${LIBDIR}" |
65 | swatdir="\${prefix}/swat" | |
a41fbca7 | 66 | @@ -40,12 +40,12 @@ |
67 | [ --with-fhs Use FHS-compliant paths (default=no)], | |
68 | [ case "$withval" in | |
69 | yes) | |
70 | - lockdir="\${VARDIR}/lib/samba" | |
71 | + lockdir="\${VARDIR}/lib64/samba" | |
72 | piddir="\${VARDIR}/run" | |
3162298d JK |
73 | mandir="\${prefix}/share/man" |
74 | logfilebase="\${VARDIR}/log/samba" | |
75 | privatedir="\${CONFIGDIR}/private" | |
76 | - libdir="\${prefix}/lib/samba" | |
77 | + libdir="\${prefix}/lib64/samba" | |
a41fbca7 | 78 | configdir="\${sysconfdir}/samba" |
12585bdc AM |
79 | swatdir="\${DATADIR}/samba/swat" |
80 | ;; | |
a41fbca7 | 81 | @@ -231,8 +231,8 @@ |
82 | ]) | |
12585bdc | 83 | |
a41fbca7 | 84 | SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}" |
85 | -SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/replace" | |
86 | -SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/talloc" | |
87 | +SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib64/replace" | |
88 | +SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib64/talloc" | |
89 | SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/tdb/include" | |
90 | SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns" | |
91 | SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc" | |
92 | @@ -1132,7 +1132,7 @@ | |
3162298d JK |
93 | _cppflags=${CPPFLAGS} |
94 | ||
95 | # Add additional search path | |
96 | - LDFLAGS="-L$with_readline/lib $LDFLAGS" | |
97 | + LDFLAGS="-L$with_readline/lib64 $LDFLAGS" | |
98 | CPPFLAGS="-I$with_readline/include $CPPFLAGS" | |
99 | ||
100 | AC_CHECK_HEADERS(readline.h history.h readline/readline.h) | |
a41fbca7 | 101 | @@ -1143,7 +1143,7 @@ |
3162298d JK |
102 | AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break]) |
103 | done | |
104 | AC_CHECK_LIB(readline, rl_callback_handler_install, | |
105 | - [TERMLDFLAGS="-L$with_readline/lib" | |
106 | + [TERMLDFLAGS="-L$with_readline/lib64" | |
107 | TERMCPPFLAGS="-I$with_readline/include" | |
108 | CPPFLAGS="-I$with_readline/include $CPPFLAGS" | |
109 | TERMLIBS="-lreadline $TERMLIBS" | |
a41fbca7 | 110 | @@ -2337,7 +2337,7 @@ |
3162298d | 111 | ICONV_LOCATION=standard |
12585bdc | 112 | LOOK_DIRS="/usr /usr/local /sw /opt" |
3162298d JK |
113 | AC_ARG_WITH(libiconv, |
114 | -[ --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib and BASEDIR/include (default=auto) ], | |
115 | +[ --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib64 and BASEDIR/include (default=auto) ], | |
116 | [ | |
117 | if test "$withval" = "no" ; then | |
118 | AC_MSG_ERROR([argument to --with-libiconv must be a directory]) | |
a41fbca7 | 119 | @@ -3370,7 +3370,7 @@ |
3162298d JK |
120 | AC_MSG_RESULT($withval) |
121 | KRB5_CFLAGS="-I$withval/include" | |
122 | KRB5_CPPFLAGS="-I$withval/include" | |
123 | - KRB5_LDFLAGS="-L$withval/lib" | |
124 | + KRB5_LDFLAGS="-L$withval/lib64" | |
125 | FOUND_KRB5=yes | |
e8bb5c51 | 126 | if test -x "$withval/bin/krb5-config"; then |
127 | KRB5CONFIG=$withval/bin/krb5-config | |
a41fbca7 | 128 | @@ -3407,10 +3407,10 @@ |
3162298d JK |
129 | # see if this box has the SuSE location for the heimdal krb implementation |
130 | AC_MSG_CHECKING(for /usr/include/heimdal) | |
131 | if test -d /usr/include/heimdal; then | |
132 | - if test -f /usr/lib/heimdal/lib/libkrb5.a; then | |
133 | + if test -f /usr/lib64/heimdal/lib/libkrb5.a; then | |
134 | KRB5_CFLAGS="-I/usr/include/heimdal" | |
135 | KRB5_CPPFLAGS="-I/usr/include/heimdal" | |
136 | - KRB5_LDFLAGS="-L/usr/lib/heimdal/lib" | |
137 | + KRB5_LDFLAGS="-L/usr/lib64/heimdal/lib" | |
138 | AC_MSG_RESULT(yes) | |
139 | else | |
140 | KRB5_CFLAGS="-I/usr/include/heimdal" | |
a41fbca7 | 141 | @@ -6175,7 +6175,7 @@ |
142 | ||
143 | fi | |
3162298d JK |
144 | |
145 | -dnl Remove -L/usr/lib/? from LDFLAGS and LIBS | |
146 | +dnl Remove -L/usr/lib64/? from LDFLAGS and LIBS | |
147 | LIB_REMOVE_USR_LIB(LDFLAGS) | |
148 | LIB_REMOVE_USR_LIB(LIBS) | |
a41fbca7 | 149 | LIB_REMOVE_USR_LIB(KRB5_LIBS) |