osconf: pic_regex.o is now regex_pic.o

[openafs.git] / src / cf / osconf.m4

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 3c3f820..2677892 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -8,7 +8,7 @@ SHLIB_SUFFIX="so"
 CCOBJ="$CC"
 MT_CC="$CC"
 XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} ${LIB_libintl}"
-MT_LIBS="-lpthread ${XLIBS}"
+MT_LIBS='-lpthread ${XLIBS}'
 
 dnl debugging and optimization flag defaults
 dnl Note, these are all the defaults for if debug/optimize turned on, and
@@ -144,7 +144,7 @@ case $AFS_SYSNAME in
                LWP_OPTMZ="-O"
                MT_CC="/opt/ansic/bin/cc -Ae"
                MT_CFLAGS='-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-L/opt/dce/lib -ldce ${XLIBS}"
+               MT_LIBS='-L/opt/dce/lib -ldce ${XLIBS}'
                MV="/bin/mv"
                OPTMZ="-O"
                PAM_CFLAGS="+DA1.0 +z -Wl,+k"
@@ -185,7 +185,6 @@ case $AFS_SYSNAME in
                XCFLAGS64="${XCFLAGS0} +DA2.0W"
                XCFLAGS="${XCFLAGS0} +DA1.0"
                XLIBELFA="-lelf"
-               #XLIBS="${LIB_AFSDB} -lnsl"
                YACC="/opt/langtools/bin/yacc"
                SHLIB_LINKER="ld -b"
                ;;
@@ -214,7 +213,6 @@ case $AFS_SYSNAME in
                XCFLAGS64="${XCFLAGS0} +DD64"
                XCFLAGS="${XCFLAGS0}"
                XLIBELFA="-lelf"
-               #XLIBS="${LIB_AFSDB} -lnsl"
                YACC="/opt/langtools/bin/yacc"
                SHLIB_LINKER="ld -b"
                ;;
@@ -257,7 +255,7 @@ case $AFS_SYSNAME in
 
        *nbsd15|*nbsd16)
                MT_CFLAGS='${XCFLAGS}'
-               MT_LIBS="${XLIBS}"
+               MT_LIBS='${XLIBS}'
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-pipe -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
@@ -369,7 +367,10 @@ case $AFS_SYSNAME in
                ;;
 
        *_obsd*)
+               KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+               LWP_OPTMZ=-O2
+               OPTMZ=-O2
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-pipe -fpic"
                SHLIB_CFLAGS="-fpic"
@@ -399,9 +400,10 @@ case $AFS_SYSNAME in
                KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
                LWP_OPTMZ="-O2"
                REGEX_OBJ="regex.o"
+               REGEX_OBJ_PIC="regex_pic.o"
                XCFLAGS="-no-cpp-precomp"
                EXTRA_VLIBOBJS="fstab.o"
-               SHLIB_LINKER="${MT_CC} ${ARCHFLAGS} -dynamiclib"
+               SHLIB_LINKER="${MT_CC} \${ARCHFLAGS} -dynamiclib"
                SHLIB_SUFFIX="dylib"
                XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
@@ -411,15 +413,16 @@ case $AFS_SYSNAME in
                CCOBJ="cc"
                MT_CC="cc"
                AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
-               MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
+               MT_CFLAGS="-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} \${ARCHFLAGS}"
                KROOT=
                KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
                KERN_OPTMZ="-Os"
                LWP_OPTMZ="-Os"
                OPTMZ="-Os"
                REGEX_OBJ="regex.o"
+               REGEX_OBJ_PIC="regex_pic.o"
                EXTRA_VLIBOBJS="fstab.o"
-               SHLIB_LINKER="${MT_CC} ${ARCHFLAGS} -dynamiclib"
+               SHLIB_LINKER="${MT_CC} \${ARCHFLAGS} -dynamiclib"
                SHLIB_SUFFIX="dylib"
                RANLIB="ranlib -c"
                XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
@@ -427,7 +430,7 @@ case $AFS_SYSNAME in
 
        *_darwin_90)
                AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
-               MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
+               MT_CFLAGS="-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} \${ARCHFLAGS}"
                KROOT=
                KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
                LD="cc"
@@ -435,8 +438,9 @@ case $AFS_SYSNAME in
                LWP_OPTMZ="-Os"
                OPTMZ="-Os"
                REGEX_OBJ="regex.o"
+               REGEX_OBJ_PIC="regex_pic.o"
                EXTRA_VLIBOBJS="fstab.o"
-               SHLIB_LINKER="${MT_CC} ${ARCHFLAGS} -dynamiclib"
+               SHLIB_LINKER="${MT_CC} \${ARCHFLAGS} -dynamiclib"
                SHLIB_SUFFIX="dylib"
                RANLIB="ranlib -c"
                XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
@@ -444,8 +448,8 @@ case $AFS_SYSNAME in
 
        *_darwin_100)
                AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
-               MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
-               MT_LIBS="${XLIBS}"
+               MT_CFLAGS="-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} \${ARCHFLAGS}"
+               MT_LIBS='${XLIBS}'
                KROOT=
                KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
                LD="cc"
@@ -454,8 +458,9 @@ case $AFS_SYSNAME in
                OPTMZ="-Os"
                PAM_LIBS="-lpam"
                REGEX_OBJ="regex.o"
+               REGEX_OBJ_PIC="regex_pic.o"
                EXTRA_VLIBOBJS="fstab.o"
-               SHLIB_LINKER="${MT_CC} ${ARCHFLAGS} -dynamiclib"
+               SHLIB_LINKER="${MT_CC} \${ARCHFLAGS} -dynamiclib"
                SHLIB_SUFFIX="dylib"
                RANLIB="ranlib"
                XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
@@ -483,8 +488,8 @@ case $AFS_SYSNAME in
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
                XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32=""
-               AIX64="#"
+               AIX32="yes"
+               AIX64="no"
                ;;
 
 
@@ -499,8 +504,8 @@ case $AFS_SYSNAME in
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
                XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32=""
-               AIX64=""
+               AIX32="yes"
+               AIX64="yes"
                ;;
 
        rs_aix52)       
@@ -514,8 +519,8 @@ case $AFS_SYSNAME in
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
                XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32=""
-               AIX64=""
+               AIX32="yes"
+               AIX64="yes"
                ;;
 
        rs_aix53)       
@@ -529,8 +534,8 @@ case $AFS_SYSNAME in
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
                XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32=""
-               AIX64=""
+               AIX32="yes"
+               AIX64="yes"
                ;;
 
        rs_aix61)       
@@ -544,8 +549,8 @@ case $AFS_SYSNAME in
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
                XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32="#"
-               AIX64=""
+               AIX32="no"
+               AIX64="yes"
                ;;
 
        s390_linux22)
@@ -1020,6 +1025,7 @@ AC_SUBST(PAM_DBG)
 AC_SUBST(PAM_OPTMZ)
 AC_SUBST(RANLIB)
 AC_SUBST(REGEX_OBJ)
+AC_SUBST(REGEX_OBJ_PIC)
 AC_SUBST(RM)
 AC_SUBST(RXDEBUG)
 AC_SUBST(SHLIB_CFLAGS)