]>
Commit | Line | Data |
---|---|---|
168aa782 AM |
1 | diff -urN samba-3.0.23b.org/source/aclocal.m4 samba-3.0.23b/source/aclocal.m4 |
2 | --- samba-3.0.23b.org/source/aclocal.m4 2006-06-23 15:16:53.000000000 +0200 | |
3 | +++ samba-3.0.23b/source/aclocal.m4 2006-08-09 21:19:38.914290750 +0200 | |
4 | @@ -564,7 +564,7 @@ | |
97e7df4f | 5 | fi |
6 | ||
7 | AC_REQUIRE([AC_CANONICAL_TARGET]) | |
8 | - AC_PATH_PROG(PGSQL_CONFIG, pg_config, no, [$PATH:/usr/lib/postgresql/bin]) | |
9 | + AC_PATH_PROG(PGSQL_CONFIG, pg_config, no, [$PATH:/usr/lib64/postgresql/bin]) | |
10 | AC_MSG_CHECKING(for PGSQL) | |
11 | no_pgsql="" | |
12 | if test "$PGSQL_CONFIG" = "no" ; then | |
168aa782 | 13 | @@ -594,12 +594,12 @@ |
3162298d JK |
14 | $1=[$]ac_new_flags |
15 | ]) | |
16 | ||
17 | -dnl Removes -L/usr/lib/? from given variable | |
18 | +dnl Removes -L/usr/lib64/? from given variable | |
19 | AC_DEFUN(LIB_REMOVE_USR_LIB,[ | |
20 | ac_new_flags="" | |
21 | for i in [$]$1; do | |
22 | case [$]i in | |
23 | - -L/usr/lib|-L/usr/lib/) ;; | |
24 | + -L/usr/lib64|-L/usr/lib64/) ;; | |
25 | *) ac_new_flags="[$]ac_new_flags [$]i" ;; | |
26 | esac | |
27 | done | |
168aa782 | 28 | @@ -719,9 +719,9 @@ |
3162298d JK |
29 | ]) |
30 | ||
31 | dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR) | |
32 | -dnl This function doesn't add -L/usr/lib into LDFLAGS | |
33 | +dnl This function doesn't add -L/usr/lib64 into LDFLAGS | |
34 | AC_DEFUN(LIB_ADD_DIR,[ | |
35 | -if test "$2" != "/usr/lib" ; then | |
36 | +if test "$2" != "/usr/lib64" ; then | |
37 | $1="$$1 -L$2" | |
38 | fi | |
39 | ]) | |
168aa782 AM |
40 | diff -urN samba-3.0.23b.org/source/configure.in samba-3.0.23b/source/configure.in |
41 | --- samba-3.0.23b.org/source/configure.in 2006-07-21 18:22:57.000000000 +0200 | |
42 | +++ samba-3.0.23b/source/configure.in 2006-08-09 21:20:13.784470000 +0200 | |
43 | @@ -28,7 +28,7 @@ | |
44 | test "${mandir}" || mandir="\${prefix}/man" | |
12585bdc AM |
45 | logfilebase="\${VARDIR}" |
46 | privatedir="\${prefix}/private" | |
168aa782 AM |
47 | -test "${libdir}" || libdir="\${prefix}/lib" |
48 | +test "${libdir}" || libdir="\${prefix}/lib64" | |
49 | pammodulesdir="\${LIBDIR}/security" | |
12585bdc AM |
50 | configdir="\${LIBDIR}" |
51 | swatdir="\${prefix}/swat" | |
168aa782 | 52 | @@ -42,7 +42,7 @@ |
3162298d JK |
53 | mandir="\${prefix}/share/man" |
54 | logfilebase="\${VARDIR}/log/samba" | |
55 | privatedir="\${CONFIGDIR}/private" | |
56 | - libdir="\${prefix}/lib/samba" | |
57 | + libdir="\${prefix}/lib64/samba" | |
12585bdc AM |
58 | configdir="${sysconfdir}/samba" |
59 | swatdir="\${DATADIR}/samba/swat" | |
60 | ;; | |
168aa782 | 61 | @@ -811,7 +811,7 @@ |
12585bdc AM |
62 | # Note: iconv does that explicitly below, but other packages |
63 | # don't. | |
64 | CPPFLAGS="$CPPFLAGS -I/sw/include" | |
65 | - LDFLAGS="$LDFLAGS -L/sw/lib" | |
66 | + LDFLAGS="$LDFLAGS -L/sw/lib64" | |
67 | ||
68 | # If we have dlsym_prepend_underscore (from Fink's dlcompat), | |
69 | # use that instead of plain dlsym. | |
168aa782 | 70 | @@ -1183,7 +1183,7 @@ |
3162298d JK |
71 | _cppflags=${CPPFLAGS} |
72 | ||
73 | # Add additional search path | |
74 | - LDFLAGS="-L$with_readline/lib $LDFLAGS" | |
75 | + LDFLAGS="-L$with_readline/lib64 $LDFLAGS" | |
76 | CPPFLAGS="-I$with_readline/include $CPPFLAGS" | |
77 | ||
78 | AC_CHECK_HEADERS(readline.h history.h readline/readline.h) | |
168aa782 | 79 | @@ -1194,7 +1194,7 @@ |
3162298d JK |
80 | AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break]) |
81 | done | |
82 | AC_CHECK_LIB(readline, rl_callback_handler_install, | |
83 | - [TERMLDFLAGS="-L$with_readline/lib" | |
84 | + [TERMLDFLAGS="-L$with_readline/lib64" | |
85 | TERMCPPFLAGS="-I$with_readline/include" | |
86 | CPPFLAGS="-I$with_readline/include $CPPFLAGS" | |
87 | TERMLIBS="-lreadline $TERMLIBS" | |
168aa782 | 88 | @@ -2280,7 +2280,7 @@ |
3162298d | 89 | ICONV_LOCATION=standard |
12585bdc | 90 | LOOK_DIRS="/usr /usr/local /sw /opt" |
3162298d JK |
91 | AC_ARG_WITH(libiconv, |
92 | -[ --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib and BASEDIR/include (default=auto) ], | |
93 | +[ --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib64 and BASEDIR/include (default=auto) ], | |
94 | [ | |
95 | if test "$withval" = "no" ; then | |
96 | AC_MSG_ERROR([argument to --with-libiconv must be a directory]) | |
168aa782 | 97 | @@ -3307,7 +3307,7 @@ |
3162298d JK |
98 | AC_MSG_RESULT($withval) |
99 | KRB5_CFLAGS="-I$withval/include" | |
100 | KRB5_CPPFLAGS="-I$withval/include" | |
101 | - KRB5_LDFLAGS="-L$withval/lib" | |
102 | + KRB5_LDFLAGS="-L$withval/lib64" | |
103 | FOUND_KRB5=yes | |
e8bb5c51 | 104 | if test -x "$withval/bin/krb5-config"; then |
105 | KRB5CONFIG=$withval/bin/krb5-config | |
168aa782 | 106 | @@ -3344,10 +3344,10 @@ |
3162298d JK |
107 | # see if this box has the SuSE location for the heimdal krb implementation |
108 | AC_MSG_CHECKING(for /usr/include/heimdal) | |
109 | if test -d /usr/include/heimdal; then | |
110 | - if test -f /usr/lib/heimdal/lib/libkrb5.a; then | |
111 | + if test -f /usr/lib64/heimdal/lib/libkrb5.a; then | |
112 | KRB5_CFLAGS="-I/usr/include/heimdal" | |
113 | KRB5_CPPFLAGS="-I/usr/include/heimdal" | |
114 | - KRB5_LDFLAGS="-L/usr/lib/heimdal/lib" | |
115 | + KRB5_LDFLAGS="-L/usr/lib64/heimdal/lib" | |
116 | AC_MSG_RESULT(yes) | |
117 | else | |
118 | KRB5_CFLAGS="-I/usr/include/heimdal" | |
168aa782 AM |
119 | @@ -5636,7 +5636,7 @@ |
120 | SMBD_LIBS="$samba_fam_libs $samba_dmapi_libs" | |
121 | AC_SUBST(SMBD_LIBS) | |
3162298d JK |
122 | |
123 | -dnl Remove -L/usr/lib/? from LDFLAGS and LIBS | |
124 | +dnl Remove -L/usr/lib64/? from LDFLAGS and LIBS | |
125 | LIB_REMOVE_USR_LIB(LDFLAGS) | |
126 | LIB_REMOVE_USR_LIB(LIBS) | |
127 | ||
168aa782 AM |
128 | diff -urN samba-3.0.23b.org/source/torture/nsstest.c samba-3.0.23b/source/torture/nsstest.c |
129 | --- samba-3.0.23b.org/source/torture/nsstest.c 2006-04-20 04:29:44.000000000 +0200 | |
130 | +++ samba-3.0.23b/source/torture/nsstest.c 2006-08-09 21:19:38.922291250 +0200 | |
3162298d JK |
131 | @@ -21,7 +21,7 @@ |
132 | ||
133 | #include "includes.h" | |
134 | ||
135 | -static const char *so_path = "/lib/libnss_winbind.so"; | |
136 | +static const char *so_path = "/lib64/libnss_winbind.so"; | |
137 | static const char *nss_name = "winbind"; | |
138 | static int nss_errno; | |
139 | static NSS_STATUS last_error; |