mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
Change PICFLAG -> PICFLAGS to keep in line with version from source
directory and fix display bug.
This commit is contained in:
parent
b798f30f0a
commit
f43546d0af
@ -53,7 +53,7 @@ AC_SUBST(LDSHFLAGS)
|
||||
AC_SUBST(SONAMEFLAG)
|
||||
AC_SUBST(SHLD)
|
||||
AC_SUBST(HOST_OS)
|
||||
AC_SUBST(PICFLAG)
|
||||
AC_SUBST(PICFLAGS)
|
||||
AC_SUBST(PICSUFFIX)
|
||||
AC_SUBST(POBAD_CC)
|
||||
AC_SUBST(SHLIBEXT)
|
||||
@ -179,7 +179,7 @@ HOST_OS="$host_os"
|
||||
LDSHFLAGS="-shared"
|
||||
SONAMEFLAG="#"
|
||||
SHLD="\${CC}"
|
||||
PICFLAG=""
|
||||
PICFLAGS=""
|
||||
PICSUFFIX="po"
|
||||
POBAD_CC="#"
|
||||
SHLIBEXT="so"
|
||||
@ -197,7 +197,7 @@ if test "$enable_shared" = "yes"; then
|
||||
BLDSHARED="true"
|
||||
LDSHFLAGS="-shared"
|
||||
DYNEXP="-Wl,--export-dynamic"
|
||||
PICFLAG="-fPIC"
|
||||
PICFLAGS="-fPIC"
|
||||
SONAMEFLAG="-Wl,-soname="
|
||||
;;
|
||||
*solaris*)
|
||||
@ -205,12 +205,12 @@ if test "$enable_shared" = "yes"; then
|
||||
LDSHFLAGS="-G"
|
||||
SONAMEFLAG="-h "
|
||||
if test "${GCC}" = "yes"; then
|
||||
PICFLAG="-fPIC"
|
||||
PICFLAGS="-fPIC"
|
||||
if test "${ac_cv_prog_gnu_ld}" = "yes"; then
|
||||
DYNEXP="-Wl,-E"
|
||||
fi
|
||||
else
|
||||
PICFLAG="-KPIC"
|
||||
PICFLAGS="-KPIC"
|
||||
## ${CFLAGS} added for building 64-bit shared
|
||||
## libs using Sun's Compiler
|
||||
LDSHFLAGS="-G \${CFLAGS}"
|
||||
@ -222,19 +222,19 @@ if test "$enable_shared" = "yes"; then
|
||||
BLDSHARED="true"
|
||||
LDSHFLAGS="-G"
|
||||
SONAMEFLAG="-Wl,-h,"
|
||||
PICFLAG="-KPIC" # Is this correct for SunOS
|
||||
PICFLAGS="-KPIC" # Is this correct for SunOS
|
||||
;;
|
||||
*netbsd* | *freebsd*) BLDSHARED="true"
|
||||
LDSHFLAGS="-shared"
|
||||
DYNEXP="-Wl,--export-dynamic"
|
||||
SONAMEFLAG="-Wl,-soname,"
|
||||
PICFLAG="-fPIC -DPIC"
|
||||
PICFLAGS="-fPIC -DPIC"
|
||||
;;
|
||||
*openbsd*) BLDSHARED="true"
|
||||
LDSHFLAGS="-shared"
|
||||
DYNEXP="-Wl,-Bdynamic"
|
||||
SONAMEFLAG="-Wl,-soname,"
|
||||
PICFLAG="-fPIC"
|
||||
PICFLAGS="-fPIC"
|
||||
;;
|
||||
*irix*)
|
||||
case "$host_os" in
|
||||
@ -247,16 +247,16 @@ if test "$enable_shared" = "yes"; then
|
||||
SONAMEFLAG="-soname "
|
||||
SHLD="\${LD}"
|
||||
if test "${GCC}" = "yes"; then
|
||||
PICFLAG="-fPIC"
|
||||
PICFLAGS="-fPIC"
|
||||
else
|
||||
PICFLAG="-KPIC"
|
||||
PICFLAGS="-KPIC"
|
||||
fi
|
||||
;;
|
||||
*aix*)
|
||||
BLDSHARED="true"
|
||||
LDSHFLAGS="-Wl,-bexpall,-bM:SRE,-bnoentry,-berok"
|
||||
DYNEXP="-Wl,-brtl,-bexpall"
|
||||
PICFLAG="-O2"
|
||||
PICFLAGS="-O2"
|
||||
if test "${GCC}" != "yes"; then
|
||||
## for funky AIX compiler using strncpy()
|
||||
CFLAGS="$CFLAGS -D_LINUX_SOURCE_COMPAT -qmaxmem=32000"
|
||||
@ -270,7 +270,7 @@ if test "$enable_shared" = "yes"; then
|
||||
SHLD="/usr/bin/ld"
|
||||
LDSHFLAGS="-B symbolic -b -z"
|
||||
SONAMEFLAG="+h "
|
||||
PICFLAG="+z"
|
||||
PICFLAGS="+z"
|
||||
fi
|
||||
DYNEXP="-Wl,-E"
|
||||
;;
|
||||
@ -280,7 +280,7 @@ if test "$enable_shared" = "yes"; then
|
||||
BLDSHARED="true"
|
||||
LDSHFLAGS="-shared"
|
||||
SONAMEFLAG="-Wl,-soname,"
|
||||
PICFLAG="-fPIC"
|
||||
PICFLAGS="-fPIC"
|
||||
;;
|
||||
*sco*)
|
||||
;;
|
||||
@ -288,7 +288,7 @@ if test "$enable_shared" = "yes"; then
|
||||
BLDSHARED="true"
|
||||
LDSHFLAGS="-shared"
|
||||
SONAMEFLAG="-Wl,-soname,"
|
||||
PICFLAG="-KPIC"
|
||||
PICFLAGS="-KPIC"
|
||||
;;
|
||||
*next2*)
|
||||
;;
|
||||
@ -331,11 +331,11 @@ AC_CACHE_CHECK([whether building shared libraries actually works],
|
||||
ac_cv_shlib_works=no
|
||||
# try building a trivial shared library
|
||||
if test "$PICSUFFIX" = "po"; then
|
||||
$CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.po ${srcdir-.}/tests/shlib.c &&
|
||||
$CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.po ${srcdir-.}/tests/shlib.c &&
|
||||
$CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o "shlib.$SHLIBEXT" shlib.po &&
|
||||
ac_cv_shlib_works=yes
|
||||
else
|
||||
$CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.$PICSUFFIX ${srcdir-.}/tests/shlib.c &&
|
||||
$CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.$PICSUFFIX ${srcdir-.}/tests/shlib.c &&
|
||||
mv shlib.$PICSUFFIX shlib.po &&
|
||||
$CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o "shlib.$SHLIBEXT" shlib.po &&
|
||||
ac_cv_shlib_works=yes
|
||||
|
Loading…
Reference in New Issue
Block a user