git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
configure-enable-warnings-20080228
[openafs.git] / src / cf / osconf.m4
diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index bfc12fe..4352724 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -18,6 +18,7 @@ KERN_OPTMZ=-O
 DBG=-g
 OPTMZ=-O
 LWP_DBG=-g
+NO_STRIP_BIN=
 LWP_OPTMZ=-O
 PAM_DBG=-g
 PAM_OPTMZ=
@@ -117,6 +118,38 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
+       arm_linux24)
+               CCOBJ="${CC} -fPIC"
+               KERN_OPTMZ=-O2
+               LEX="flex -l"
+               MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+               MT_LIBS="-lpthread"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
+               SHLIB_LDFLAGS="-shared -Xlinker -x"
+               TXLIBS="-lncurses"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
+               YACC="bison -y"
+               SHLIB_LINKER="${MT_CC} -shared"
+               ;;
+
+       arm_linux26)
+               CCOBJ="${CC} -fPIC"
+               KERN_OPTMZ=-O2
+               LEX="flex -l"
+               MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+               MT_LIBS="-lpthread"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
+               SHLIB_LDFLAGS="-shared -Xlinker -x"
+               TXLIBS="-lncurses"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
+               YACC="bison -y"
+               SHLIB_LINKER="${MT_CC} -shared"
+               ;;
+
        hp_ux102)
                AS="/usr/ccs/bin/as"
                CC="/opt/ansic/bin/cc -Ae"
@@ -221,7 +254,7 @@ case $AFS_SYSNAME in
                YACC="byacc"
                ;;
 
-       *nbsd2*|*nbsd3*)
+       *nbsd2*|*nbsd3*|*nbsd4*)
                LEX="flex -l"
                MT_CFLAGS='${XCFLAGS} -DAFS_PTHREAD_ENV -D_REENTRANT '
                MT_LIBS="-lpthread" # XXX -pthread soon
@@ -475,7 +508,7 @@ case $AFS_SYSNAME in
                ;;
 
        *_darwin_80)
-               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
+               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
                LEX="lex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
                KROOT=
@@ -488,10 +521,11 @@ case $AFS_SYSNAME in
                EXTRA_VLIBOBJS="fstab.o"
                SHLIB_LINKER="${MT_CC} -dynamiclib"
                SHLIB_SUFFIX="dylib"
+               RANLIB="ranlib -c"
                ;;
 
        *_darwin_90)
-               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
+               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
                LEX="lex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
                KROOT=
@@ -505,6 +539,7 @@ case $AFS_SYSNAME in
                EXTRA_VLIBOBJS="fstab.o"
                SHLIB_LINKER="${MT_CC} -dynamiclib"
                SHLIB_SUFFIX="dylib"
+               RANLIB="ranlib -c"
                ;;
 
        ppc_linux*)
@@ -747,7 +782,7 @@ case $AFS_SYSNAME in
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
                LD="/usr/ccs/bin/ld"
-               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
                LWP_OPTMZ="-g"
                ;;
 
@@ -768,7 +803,7 @@ case $AFS_SYSNAME in
                LD="/usr/ccs/bin/ld"
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
                LWP_OPTMZ="-g"
                ;;
 
@@ -790,7 +825,7 @@ case $AFS_SYSNAME in
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
                LWP_OPTMZ="-g"
                ;;
 
@@ -812,7 +847,7 @@ case $AFS_SYSNAME in
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
                LWP_OPTMZ="-g"
                ;;
 
@@ -834,7 +869,7 @@ case $AFS_SYSNAME in
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
                LWP_OPTMZ="-g"
                ;;
 
@@ -851,12 +886,34 @@ case $AFS_SYSNAME in
                SHLIB_CFLAGS="-KPIC"
                SHLIB_LDFLAGS="-G -Bsymbolic"
                TXLIBS="-lcurses"
+               XCFLAGS64='${XCFLAGS} -m64'
+               XCFLAGS="-dy -Bdynamic"
+               XLIBELFA="-lelf"
+               XLIBKVM="-lkvm"
+               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
+               LWP_OPTMZ="-g"
+               ;;
+
+       sun4x_511)
+               CC="/opt/SUNWspro/bin/cc"
+               CCOBJ="/opt/SUNWspro/bin/cc"
+               LEX="lex"
+               LD="/usr/ccs/bin/ld"
+               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+               MT_LIBS="-lpthread -lsocket"
+               PAM_CFLAGS="-KPIC"
+               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
+               SHLIB_CFLAGS="-KPIC"
+               SHLIB_LDFLAGS="-G -Bsymbolic"
+               TXLIBS="-lcurses"
                XCFLAGS64='${XCFLAGS} -xarch=v9'
                XCFLAGS="-dy -Bdynamic"
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
                LWP_OPTMZ="-g"
                ;;
 
@@ -878,7 +935,7 @@ case $AFS_SYSNAME in
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
                ;;
 
        sunx86_58)
@@ -899,7 +956,7 @@ case $AFS_SYSNAME in
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
                ;;
 
        sunx86_59)
@@ -920,7 +977,7 @@ case $AFS_SYSNAME in
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
                ;;
 
        sunx86_510)
@@ -936,12 +993,33 @@ case $AFS_SYSNAME in
                SHLIB_CFLAGS="-KPIC"
                SHLIB_LDFLAGS="-G -Bsymbolic"
                TXLIBS="-lcurses"
+               XCFLAGS64='${XCFLAGS} -m64'
+               XCFLAGS="-dy -Bdynamic"
+               XLIBELFA="-lelf"
+               XLIBKVM="-lkvm"
+               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
+               ;;
+
+       sunx86_511)
+               CC="/opt/SUNWspro/bin/cc"
+               CCOBJ="/opt/SUNWspro/bin/cc"
+               LEX="lex"
+               LD="/usr/ccs/bin/ld"
+               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+               MT_LIBS="-lpthread -lsocket"
+               PAM_CFLAGS="-KPIC"
+               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
+               SHLIB_CFLAGS="-KPIC"
+               SHLIB_LDFLAGS="-G -Bsymbolic"
+               TXLIBS="-lcurses"
                XCFLAGS64='${XCFLAGS} -xarch=amd64'
                XCFLAGS="-dy -Bdynamic"
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
                ;;
 esac
 
@@ -959,26 +1037,6 @@ case $AFS_SYSNAME in
                AC_SUBST(install_XFS_SIZE_CHECK)
                AC_SUBST(dest_XFS_SIZE_CHECK)
        ;;
-       
-       sun4x_*|sunx86_*)
-               FS_CONV_SOL26="fs_conv_sol26"
-               install_FS_CONV_SOL26='$(DESTDIR)${afssrvsbindir}/fs_conv_sol26'
-               dest_FS_CONV_SOL26='$(DEST)/root.server/usr/afs/bin/fs_conv_sol26'
-
-               AC_SUBST(FS_CONV_SOL26)
-               AC_SUBST(install_FS_CONV_SOL26)
-               AC_SUBST(dest_FS_CONV_SOL26)
-       ;;
-
-       alpha_dux*)
-               FS_CONV_OSF40D="fs_conv_dux40D"
-               install_FS_CONV_OSF40D='$(DESTDIR)${afssrvsbindir}/fs_conv_dux40D'
-               dest_FS_CONV_OSF40D='$(DEST)/root.server/usr/afs/bin/fs_conv_dux40D'
-
-               AC_SUBST(FS_CONV_OSF40D)
-               AC_SUBST(install_FS_CONV_OSF40D)
-               AC_SUBST(dest_FS_CONV_OSF40D)
-       ;;
 esac
 
 
@@ -1004,6 +1062,7 @@ fi
 
 if test "x$enable_debug" = "xno"; then
   DBG=
+  NO_STRIP_BIN=-s
 fi
 
 if test "x$enable_optimize" = "xno"; then
@@ -1018,6 +1077,24 @@ if test "x$enable_optimize_lwp" = "xno"; then
   LWP_OPTMZ=
 fi
 
+if test "x$enable_strip_binaries" != "xno"; then
+  if test "x$enable_strip_binaries" = "xmaybe" -a "x$enable_debug" = "xyes"; then
+    NO_STRIP_BIN=
+  else
+    NO_STRIP_BIN=-s
+  fi
+else
+  NO_STRIP_BIN=
+fi
+
+if test "x$enable_warnings" = "xyes"; then
+  if test "x$GCC" = "xyes"; then
+    XCFLAGS="${XCFLAGS} -Wall -Wstrict-prototypes -Wold-style-definition"
+  fi
+fi
+
+INSTALL_PROGRAM="${INSTALL_PROGRAM} ${NO_STRIP_BIN}"
+
 AC_SUBST(CCXPG2)
 AC_SUBST(CCOBJ)
 AC_SUBST(AFSD_LIBS)
@@ -1038,6 +1115,7 @@ AC_SUBST(MT_CC)
 AC_SUBST(MT_CFLAGS)
 AC_SUBST(MT_LIBS)
 AC_SUBST(MV)
+AC_SUBST(NO_STRIP_BIN)
 AC_SUBST(OPTMZ)
 AC_SUBST(PAM_CFLAGS)
 AC_SUBST(PAM_LIBS)
OpenAFS Master Repository