git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
NetBSD 5.0 support.
[openafs.git] / src / cf / osconf.m4
diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 02e9699..7fb5515 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -8,7 +8,7 @@ RXDEBUG="-DRXDEBUG"
 SHLIB_SUFFIX="so"
 CCOBJ="$CC"
 MT_CC="$CC"
-XLIBS="${LIB_AFSDB} ${XBSA_XLIBS}"
+XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} ${LIB_libintl}"
 
 dnl debugging and optimization flag defaults
 dnl Note, these are all the defaults for if debug/optimize turned on, and
@@ -287,15 +287,16 @@ case $AFS_SYSNAME in
                YACC="byacc"
                ;;
 
-       *nbsd2*|*nbsd3*|*nbsd4*)
+       *nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*)
                LEX="flex -l"
-               MT_CFLAGS='${XCFLAGS} -DAFS_PTHREAD_ENV -D_REENTRANT '
-               MT_LIBS="-lpthread" # XXX -pthread soon
+               MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+               MT_LIBS="-pthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-pipe -fPIC"
+               SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                SHLIB_LINKER="${MT_CC} -shared"
-               TXLIBS="/usr/lib/libcurses.so"
+               TXLIBS="-lcurses"
                XCFLAGS="-pipe"
                YACC="yacc"
                ;;
@@ -473,58 +474,6 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       ppc_darwin_12)
-               CC="cc"
-               CCOBJ="cc"
-               MT_CC="cc"
-               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
-               LEX="lex -l"
-               REGEX_OBJ="regex.o"
-               XCFLAGS="-traditional-cpp"
-               SHLIB_LINKER="${MT_CC} -dynamiclib"
-               SHLIB_SUFFIX="dylib"
-               ;;
-
-       ppc_darwin_13)
-               CC="cc"
-               CCOBJ="cc"
-               MT_CC="cc"
-               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
-               LEX="lex -l"
-               LWP_OPTMZ="-O2"
-               REGEX_OBJ="regex.o"
-               XCFLAGS="-no-cpp-precomp"
-               SHLIB_LINKER="${MT_CC} -dynamiclib"
-               SHLIB_SUFFIX="dylib"
-               ;;
-
-       ppc_darwin_14)
-               CC="cc"
-               CCOBJ="cc"
-               MT_CC="cc"
-               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
-               LEX="lex -l"
-               LWP_OPTMZ="-O2"
-               REGEX_OBJ="regex.o"
-               XCFLAGS="-no-cpp-precomp"
-               SHLIB_LINKER="${MT_CC} -dynamiclib"
-               SHLIB_SUFFIX="dylib"
-               ;;
-
-       ppc_darwin_60)
-               CC="cc"
-               CCOBJ="cc"
-               MT_CC="cc"
-               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
-               LEX="lex -l"
-               LWP_OPTMZ="-O2"
-               REGEX_OBJ="regex.o"
-               XCFLAGS="-no-cpp-precomp"
-               TXLIBS="-lncurses"
-               SHLIB_LINKER="${MT_CC} -dynamiclib"
-               SHLIB_SUFFIX="dylib"
-               ;;
-
        ppc_darwin_70)
                CC="cc"
                CCOBJ="cc"
@@ -541,6 +490,7 @@ case $AFS_SYSNAME in
                EXTRA_VLIBOBJS="fstab.o"
                SHLIB_LINKER="${MT_CC} -dynamiclib"
                SHLIB_SUFFIX="dylib"
+               XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
 
        *_darwin_80)
@@ -561,6 +511,7 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${MT_CC} -dynamiclib"
                SHLIB_SUFFIX="dylib"
                RANLIB="ranlib -c"
+               XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
 
        *_darwin_90)
@@ -578,14 +529,15 @@ case $AFS_SYSNAME in
                EXTRA_VLIBOBJS="fstab.o"
                SHLIB_LINKER="${MT_CC} -dynamiclib"
                SHLIB_SUFFIX="dylib"
-               RANLIB="ranlib"
+               RANLIB="ranlib -c"
+               XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
 
        *_darwin_100)
                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}'
-               MT_LIBS="-lresolv"
+               MT_LIBS="${LIB_AFSDB} -framework CoreFoundation"
                KROOT=
                KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
                LD="cc"
@@ -599,6 +551,7 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${MT_CC} -dynamiclib"
                SHLIB_SUFFIX="dylib"
                RANLIB="ranlib"
+               XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
 
        ppc_linux*)
@@ -628,7 +581,7 @@ case $AFS_SYSNAME in
                SHLIB_SUFFIX="o"
                TXLIBS="-lcurses"
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
-               XLIBS="${LIB_AFSDB} -ldl"
+               XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
                AIX32=""
                AIX64="#"
@@ -647,7 +600,7 @@ case $AFS_SYSNAME in
                SHLIB_SUFFIX="o"
                TXLIBS="-lcurses"
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
-               XLIBS="${LIB_AFSDB} -ldl"
+               XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
                AIX32=""
                AIX64=""
@@ -665,7 +618,7 @@ case $AFS_SYSNAME in
                SHLIB_SUFFIX="o"
                TXLIBS="-lcurses"
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
-               XLIBS="${LIB_AFSDB} -ldl"
+               XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
                AIX32=""
                AIX64=""
@@ -683,7 +636,7 @@ case $AFS_SYSNAME in
                SHLIB_SUFFIX="o"
                TXLIBS="-lcurses"
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
-               XLIBS="${LIB_AFSDB} -ldl"
+               XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
                AIX32=""
                AIX64=""
@@ -701,7 +654,7 @@ case $AFS_SYSNAME in
                SHLIB_SUFFIX="o"
                TXLIBS="-lcurses"
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
-               XLIBS="${LIB_AFSDB} -ldl"
+               XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
                AIX32="#"
                AIX64=""
@@ -862,10 +815,10 @@ case $AFS_SYSNAME in
                ;;
 
        sun4x_55)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LEX="lex"
-               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                SHLIB_CFLAGS="-KPIC"
@@ -880,10 +833,10 @@ case $AFS_SYSNAME in
                ;;
 
        sun4x_56)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LEX="lex"
-               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -901,11 +854,11 @@ case $AFS_SYSNAME in
                ;;
 
        sun4x_57)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LEX="lex"
                LD="/usr/ccs/bin/ld"
-               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -923,11 +876,11 @@ case $AFS_SYSNAME in
                ;;
 
        sun4x_58)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LEX="lex"
                LD="/usr/ccs/bin/ld"
-               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -945,11 +898,11 @@ case $AFS_SYSNAME in
                ;;
 
        sun4x_59)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LEX="lex"
                LD="/usr/ccs/bin/ld"
-               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -967,11 +920,11 @@ case $AFS_SYSNAME in
                ;;
 
        sun4x_510)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LEX="lex"
                LD="/usr/ccs/bin/ld"
-               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -989,11 +942,11 @@ case $AFS_SYSNAME in
                ;;
 
        sun4x_511)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LEX="lex"
                LD="/usr/ccs/bin/ld"
-               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -1011,11 +964,11 @@ case $AFS_SYSNAME in
                ;;
 
        sunx86_57)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LEX="lex"
                LD="/usr/ccs/bin/ld"
-               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -1032,11 +985,11 @@ case $AFS_SYSNAME in
                ;;
 
        sunx86_58)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LEX="lex"
                LD="/usr/ccs/bin/ld"
-               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -1053,11 +1006,11 @@ case $AFS_SYSNAME in
                ;;
 
        sunx86_59)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LEX="lex"
                LD="/usr/ccs/bin/ld"
-               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -1074,11 +1027,11 @@ case $AFS_SYSNAME in
                ;;
 
        sunx86_510)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LEX="lex"
                LD="/usr/ccs/bin/ld"
-               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -1095,11 +1048,11 @@ case $AFS_SYSNAME in
                ;;
 
        sunx86_511)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LEX="lex"
                LD="/usr/ccs/bin/ld"
-               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -1132,18 +1085,6 @@ case $AFS_SYSNAME in
        ;;
 esac
 
-
-
-dnl pthreads fixes
-case $AFS_SYSNAME in
-dnl we'll go ahead and turn on XOPEN2K and ISO_C99
-dnl if this causes problems, we should scale back to _XOPEN_SOURCE=500
-       *linux*)
-               MT_CFLAGS="${MT_CFLAGS} -D_XOPEN_SOURCE=600 -D_BSD_SOURCE"
-       ;;
-esac
-
-
 dnl Disable the default for debugging/optimization if not enabled
 if test "x$enable_debug_kernel" = "xno"; then
   KERN_DBG=
@@ -1184,10 +1125,10 @@ CFLAGS_NOERROR=
 
 if test "x$GCC" = "xyes"; then
   if test "x$enable_warnings" = "xyes"; then
-    XCFLAGS="${XCFLAGS} -Wall -Wstrict-prototypes -Wold-style-definition"
+    XCFLAGS="${XCFLAGS} -Wall -Wstrict-prototypes -Wold-style-definition -Wpointer-arith"
   fi
   if test "x$enable_checking" != "xno"; then
-    XCFLAGS="${XCFLAGS} -Wall -Wstrict-prototypes -Wold-style-definition -Werror -fdiagnostics-show-option"
+    XCFLAGS="${XCFLAGS} -Wall -Wstrict-prototypes -Wold-style-definition -Werror -fdiagnostics-show-option -Wpointer-arith"
     if test "x$enable_checking" != "xall"; then
       CFLAGS_NOERROR="-Wno-error"
       AC_DEFINE(IGNORE_SOME_GCC_WARNINGS, 1, [define to disable some gcc warnings in warnings-as-errors mode])
@@ -1195,6 +1136,18 @@ if test "x$GCC" = "xyes"; then
   fi
 fi
 
+CFLAGS_NOSTRICT=
+
+if test "x$GCC" = "xyes"; then
+  CFLAGS_NOSTRICT="-fno-strict-aliasing"
+fi
+
+if test "x$GCC" = "xyes"; then
+  CFLAGS_NOUNUSED="-Wno-unused"
+else
+  CFLAGS_NOUNUSED=
+fi
+
 dnl horribly cheating, assuming double / is ok.
 case $INSTALL in
   ./* ) 
@@ -1245,6 +1198,8 @@ AC_SUBST(TXLIBS)
 AC_SUBST(VFSCK_CFLAGS)
 AC_SUBST(XCFLAGS)
 AC_SUBST(CFLAGS_NOERROR)
+AC_SUBST(CFLAGS_NOSTRICT)
+AC_SUBST(CFLAGS_NOUNUSED)
 AC_SUBST(XCFLAGS64)
 AC_SUBST(XLDFLAGS)
 AC_SUBST(XLDFLAGS64)
OpenAFS Master Repository