]> arthur.barton.de Git - netatalk.git/commitdiff
rework Solaris kernel build
authorbfernhomberg <bfernhomberg>
Sun, 29 Feb 2004 15:25:09 +0000 (15:25 +0000)
committerbfernhomberg <bfernhomberg>
Sun, 29 Feb 2004 15:25:09 +0000 (15:25 +0000)
configure.in
sys/solaris/.cvsignore
sys/solaris/Makefile.am [deleted file]
sys/solaris/Makefile.in [new file with mode: 0644]
sys/solaris/Makefile.kernel.in [deleted file]
sys/solaris/aarp.c
sys/solaris/if.c
sys/solaris/if.h
sys/solaris/ioc.c
sys/solaris/tpi.c

index 59c7e0175c2a958c48aac7b33aeedefbfd699150..9e4c22158fe0434bf912e3fd1b6cda8f84599c2c 100644 (file)
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.179.2.3.2.20 2004-02-20 20:53:10 bfernhomberg Exp $
+dnl $Id: configure.in,v 1.179.2.3.2.21 2004-02-29 15:26:03 bfernhomberg Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -119,6 +119,7 @@ AC_CHECK_FUNCS(backtrace_symbols)
 AC_CHECK_FUNCS(setlocale nl_langinfo)
 AC_CHECK_FUNCS(dlopen dlclose dlsym dlerror waitpid getcwd strdup strndup strnlen strtoul strerror chown fchown chmod fchmod chroot link mknod mknod64)
 AC_CHECK_FUNCS(strlcpy strlcat)
+AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,, [#include <time.h>])
 AC_CACHE_SAVE
 
 
@@ -512,8 +513,8 @@ dnl post-FHS substitutions, etc
 dnl --------------------------------------------------------------------------
 
 dnl ***** UAMS_PATH
-AC_DEFINE_UNQUOTED(UAMS_PATH, "${uams_path}",
-       [path to UAMs [default=PKGCONF/uams]])
+dnl AC_DEFINE_UNQUOTED(UAMS_PATH, "${uams_path}",
+dnl    [path to UAMs [default=PKGCONF/uams]])
 UAMS_PATH="${uams_path}"
 AC_SUBST(UAMS_PATH)
 
@@ -748,9 +749,75 @@ if test x"$this_os" = "xsolaris"; then
        AC_DEFINE(SOLARIS, 1, [Solaris compatibility macro])
        CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
        need_dash_r=yes
+       sysv_style=solaris
 
-       AC_MSG_RESULT([enabling Solaris kernel module build])
-       solaris_module=yes
+       solaris_module=no
+       AC_MSG_CHECKING([if we can build Solaris kernel module])
+       if test -x /usr/ccs/bin/ld; then
+               solaris_module=yes
+       fi
+       AC_MSG_RESULT([$solaris_module])
+
+       COMPILE_64BIT_KMODULE=no
+       KCFLAGS=""
+       KLDFLAGS=""
+       COMPILE_KERNEL_GCC=no
+
+       if test "$solaris_module" = "yes"; then
+          dnl Solaris kernel module stuff
+           AC_MSG_CHECKING([if we have to build a 64bit kernel module])
+
+          # check for isainfo, if not found it has to be a 32 bit kernel (<=2.6)       
+          if test -x /usr/bin/isainfo; then
+               # check for 64 bit platform
+               if isainfo -kv | grep '^64-bit'; then
+                       COMPILE_64BIT_KMODULE=yes
+               fi
+          fi
+
+          AC_MSG_RESULT([$COMPILE_64BIT_KMODULE])
+
+
+          if test "${GCC}" = yes; then
+               COMPILE_KERNEL_GCC=yes
+               if test "$COMPILE_64BIT_KMODULE" = yes; then
+                       # use for 64 bit
+                       KCFLAGS="-m64"
+                       #KLDFLAGS="-melf64_sparc"
+                       KLDFLAGS="-64"
+               else
+                       KCFLAGS=""
+                       KLDFLAGS=""
+               fi
+               KCFLAGS="$KCFLAGS -D_KERNEL -Wall -Wstrict-prototypes"
+           else
+               if test "$COMPILE_64BIT_KMODULE" = yes; then
+                # use Sun CC (for a 64-bit kernel, uncomment " -xarch=v9 -xregs=no%appl ")
+                       KCFLAGS="-xarch=v9 -xregs=no%appl"
+                       KLDFLAGS="-64"
+               else
+                       KCFLAGS=""
+                       KLDFLAGS=""
+               fi
+               KCFLAGS="-D_KERNEL $KCFLAGS -mno-app-regs -munaligned-doubles -fpcc-struct-return"
+          fi
+
+           AC_CACHE_CHECK([for timeout_id_t],netatalk_cv_HAVE_TIMEOUT_ID_T,[
+           AC_TRY_LINK([\
+#include <sys/stream.h>
+#include <sys/ddi.h>],
+[\
+timeout_id_t dummy;
+],
+netatalk_cv_HAVE_TIMEOUT_ID_T=yes,netatalk_cv_HAVE_TIMEOUT_ID_T=no,netatalk_cv_HAVE_TIMEOUT_ID_T=cross)])
+
+          AC_DEFINE(HAVE_TIMEOUT_ID_T, test x"$netatalk_cv_HAVE_TIMEOUT_ID" = x"yes", [define for timeout_id_t])
+       fi
+
+       AC_SUBST(COMPILE_KERNEL_GCC)
+       AC_SUBST(COMPILE_64BIT_KMODULE)
+       AC_SUBST(KCFLAGS)
+       AC_SUBST(KLDFLAGS)
 fi
 
 dnl ----- Tru64 specific -----
@@ -868,6 +935,7 @@ AM_CONDITIONAL(USE_REDHAT, test x$sysv_style = xredhat)
 AM_CONDITIONAL(USE_SUSE, test x$sysv_style = xsuse)
 AM_CONDITIONAL(USE_SHADOWPW, test x$shadowpw = xyes)
 AM_CONDITIONAL(USE_TRU64, test x$sysv_style = xtru64)
+AM_CONDITIONAL(USE_SOLARIS, test x$sysv_style = xsolaris)
 
 dnl --------------------- generate files
 
@@ -952,7 +1020,6 @@ AC_OUTPUT([Makefile
        sys/netbsd/Makefile
        sys/netbsd/netatalk/Makefile
        sys/solaris/Makefile
-       sys/solaris/Makefile.kernel
        sys/sunos/Makefile
        sys/ultrix/Makefile
        ],
@@ -962,4 +1029,3 @@ AC_OUTPUT([Makefile
 AC_NETATALK_LIBS_SUMMARY
 AC_NETATALK_CONFIG_SUMMARY
 
-
index bd7ae86417d697f32e83c443b267f142e8eda4e3..b299751afd59f3b0c3415372733636e2e5ce236f 100644 (file)
@@ -1,4 +1,2 @@
 Makefile
-Makefile.in
-Makefile.kernel
 ddp
diff --git a/sys/solaris/Makefile.am b/sys/solaris/Makefile.am
deleted file mode 100644 (file)
index 97dd2f6..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-EXTRA_DIST = \
-       Makefile.kernel.in      \
-       aarp.c          \
-       ddp.c           \
-       ddp.conf        \
-       dlpi.c          \
-       if.c if.h       \
-       ioc.c ioc.h     \
-       linkage.c       \
-       rt.c rt.h       \
-       sock.c sock.h   \
-       tpi.c
diff --git a/sys/solaris/Makefile.in b/sys/solaris/Makefile.in
new file mode 100644 (file)
index 0000000..9a27374
--- /dev/null
@@ -0,0 +1,113 @@
+# Solaris specific defines, passed to subdirectories.
+# To use Sun CC, uncomment the CC and KFLAGS variables.
+#
+# $Id: Makefile.in,v 1.1.2.1 2004-02-29 15:25:09 bfernhomberg Exp $
+
+
+CC     = @CC@
+# LD hardcoded to sun ld, GNU ld has been reported to cause some trouble with 64 bit
+LD     = /usr/ccs/bin/ld
+
+INSTALL = @INSTALL@
+GREP=@GREP@
+
+
+# -D_ISOC9X_SOURCE is handled by OSVERSION. basically, it's not needed
+# with 2.5.1.
+DEFS=  -D__svr4__ -DSOLARIS -I../../sys/generic \
+       -I.. @DEFS@
+
+# Variables
+KCFLAGS=@KCFLAGS@
+KLDFLAGS=@KLDFLAGS@
+COMPILE_KERNEL_GCC=@COMPILE_KERNEL_GCC@
+SPARC64=@COMPILE_64BIT_KMODULE@
+SOLARIS_MODULE_FALSE=@SOLARIS_MODULE_FALSE@
+SOLARIS_MODULE_TRUE=@SOLARIS_MODULE_TRUE@
+
+OPTOPTS=
+
+# Local build stuff.
+
+SRC= linkage.c tpi.c dlpi.c ioc.c if.c aarp.c ddp.c sock.c rt.c
+OBJ= linkage.o tpi.o dlpi.o ioc.o if.o aarp.o ddp.o sock.o rt.o
+HEADERS= if.h ioc.h rt.h sock.h
+EXTRA_DIST= ddp.conf Makefile
+
+INCPATH=       -I../../include -I../netatalk -I../..
+CFLAGS=        ${DEFS} ${OPTOPTS} ${INCPATH} ${KCFLAGS}
+
+
+# No Solaris kernel module build
+@SOLARIS_MODULE_FALSE@all:
+@SOLARIS_MODULE_FALSE@ @echo
+@SOLARIS_MODULE_FALSE@ @echo "Solaris kernel module cannot be build"
+@SOLARIS_MODULE_FALSE@install:
+@SOLARIS_MODULE_FALSE@
+@SOLARIS_MODULE_FALSE@uninstall:
+
+# Build Solaris kernel module
+@SOLARIS_MODULE_TRUE@all :     kernel
+
+@SOLARIS_MODULE_TRUE@kernel: ddp 
+
+@SOLARIS_MODULE_TRUE@FRC: 
+
+@SOLARIS_MODULE_TRUE@ddp :     ${OBJ}
+@SOLARIS_MODULE_TRUE@  ${LD} ${KLDFLAGS} -r -o ddp ${OBJ}
+
+@SOLARIS_MODULE_TRUE@linkage.o : linkage.c
+@SOLARIS_MODULE_TRUE@  ${CC} ${CFLAGS} -DVERSION=\"`cat ../../VERSION`\" -c linkage.c
+
+@SOLARIS_MODULE_TRUE@kuninstall : FRC
+@SOLARIS_MODULE_TRUE@  @if [ x"${SPARC64}" = x"yes" ] ; then \
+@SOLARIS_MODULE_TRUE@          ${RM} /usr/kernel/drv/sparcv9/ddp; \
+@SOLARIS_MODULE_TRUE@          ${RM} /usr/kernel/strmod/sparcv9/ddp; \
+@SOLARIS_MODULE_TRUE@  else \
+@SOLARIS_MODULE_TRUE@          ${RM} /usr/kernel/drv/ddp; \
+@SOLARIS_MODULE_TRUE@          ${RM} /usr/kernel/strmod/ddp; \
+@SOLARIS_MODULE_TRUE@  fi
+@SOLARIS_MODULE_TRUE@  ${RM} /usr/kernel/drv/ddp.conf
+@SOLARIS_MODULE_TRUE@  -rem_drv ddp
+@SOLARIS_MODULE_TRUE@  sync;sync;sync
+
+@SOLARIS_MODULE_TRUE@kinstall : kernel kuninstall
+@SOLARIS_MODULE_TRUE@  @if [ x"${SPARC64}" = x"yes" ]; then \
+@SOLARIS_MODULE_TRUE@          ${INSTALL} -o root -g sys -c ddp /usr/kernel/drv/sparcv9/ddp; \
+@SOLARIS_MODULE_TRUE@          ln /usr/kernel/drv/sparcv9/ddp /usr/kernel/strmod/sparcv9/ddp; \
+@SOLARIS_MODULE_TRUE@  else \
+@SOLARIS_MODULE_TRUE@          ${INSTALL} -o root -g sys -c ddp /usr/kernel/drv/ddp; \
+@SOLARIS_MODULE_TRUE@          ln /usr/kernel/drv/ddp /usr/kernel/strmod/ddp; \
+@SOLARIS_MODULE_TRUE@  fi
+@SOLARIS_MODULE_TRUE@  ${INSTALL} -o root -g sys -c ddp.conf /usr/kernel/drv/ddp.conf
+@SOLARIS_MODULE_TRUE@  add_drv -m '* 0666 root sys' ddp
+@SOLARIS_MODULE_TRUE@  sync;sync;sync
+@SOLARIS_MODULE_TRUE@  @if ${GREP} 'ddp' /etc/netconfig; then \
+@SOLARIS_MODULE_TRUE@            echo "netconfig already contains a ddp module, skipping"; \
+@SOLARIS_MODULE_TRUE@        else \
+@SOLARIS_MODULE_TRUE@            echo "adding ddp module to netconfig"; \
+@SOLARIS_MODULE_TRUE@            echo "ddp        tpi_clts      -    appletalk ddp   /dev/ddp        -" >> /etc/netconfig; \
+@SOLARIS_MODULE_TRUE@  fi
+@SOLARIS_MODULE_TRUE@  @echo "Installed Solaris kernel module"
+
+
+@SOLARIS_MODULE_TRUE@install:
+@SOLARIS_MODULE_TRUE@  @echo
+@SOLARIS_MODULE_TRUE@  @echo "To install the Solaris kernel module type 'make kinstall' as root user"
+
+@SOLARIS_MODULE_TRUE@uninstall:
+@SOLARIS_MODULE_TRUE@  @echo
+@SOLARIS_MODULE_TRUE@  @echo "To uninstall the Solaris kernel module type 'make kuninstall' as root user"
+
+distdir :
+
+clean : sysclean
+
+klean sysclean :
+       rm -f a.out core* *.o *.bak *[Ee]rrs tags
+       rm -f ddp
+
+depend :
+
+# DO NOT DELETE THIS LINE
+
diff --git a/sys/solaris/Makefile.kernel.in b/sys/solaris/Makefile.kernel.in
deleted file mode 100644 (file)
index 560b6cc..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-# Solaris specific defines, passed to subdirectories.
-# To use Sun CC, uncomment the CC and KFLAGS variables.
-#
-# $Id: Makefile.kernel.in,v 1.3.4.1 2003-09-03 20:40:51 didg Exp $
-
-
-# uncomment for 64-bit sparc kernel
-#SPARC64=true
-
-# solaris has -lcrypt, but we shouldn't use it. this may only be true 
-# for solaris 2.5.1
-USE_CRYPTLIB=no
-
-INSTALL = @INSTALL@
-
-CC             = @CC@
-LD             = ld
-
-# use gcc
-KCFLAGS                = -D_KERNEL -Wall -Wstrict-prototypes ${KGCCFLAGS} # -mcpu=ultrasparc
-# optimization has been reported to cause problems, leave it off
-OPTOPTS                = 
-CSHAREDFLAGS   = -fPIC
-LDSHARED       = ${CC}
-LDSHAREDFLAGS  = -shared
-# LDSHAREDFLAGS        = -shared -64
-
-# use Sun CC (for a 64-bit kernel, uncomment " -xarch=v9 -xregs=no%appl ") 
-#KCFLAGS=      -D_KERNEL # -xarch=v9 -xregs=no%appl 
-#OPTOPTS=      -fast -xO5 -xstrconst
-#CSHAREDFLAGS=   -KPIC
-#LDSHARED=       cc
-#LDSHAREDFLAGS=  -G
-#LDFLAGS_EXPORT=
-
-LIBSHARED=      -ldl
-
-# -D_ISOC9X_SOURCE is handled by OSVERSION. basically, it's not needed
-# with 2.5.1.
-# add -DHAVE_IFNAMEINDEX if you're using solaris 8.
-DEFS=  -DNO_STRUCT_TM_GMTOFF -DHAVE_IFNAMEINDEX -D__svr4__ -DSOLARIS -I../../sys/generic \
-       -I.. ${OSDEFS} ${MACHINEDEFS}
-AFPLIBS=
-ADDLIBS=       -lsocket -lnsl
-
-# Local build stuff.
-
-SRC= linkage.c tpi.c dlpi.c ioc.c if.c aarp.c ddp.c sock.c rt.c
-OBJ= linkage.o tpi.o dlpi.o ioc.o if.o aarp.o ddp.o sock.o rt.o
-HEADERS= if.h ioc.h rt.h sock.h
-EXTRA_DIST= ddp.conf Makefile
-
-INCPATH=       -I../../include -I../netatalk -I../..
-CFLAGS=        ${DEFS} ${OPTOPTS} ${INCPATH} ${KCFLAGS} 
-
-ALL=   ../../libatalk ../../include ../../bin ../../etc ../../man
-
-oops:
-       @echo "Read README again.  Don't type 'make' here."
-       @exit 1
-
-all :  kernel ${ALL}
-
-kernel :       FRC
-       @case `uname -p` in \
-           i386) \
-               PROCESSOR=i386; \
-               KGCCFLAGS=""; \
-               ;; \
-           sparc) \
-               PROCESSOR=sparc; \
-               KGCCFLAGS="-mno-app-regs -munaligned-doubles \
-                       -fpcc-struct-return" \
-               ;; \
-           *) echo "Unknown processor type..."; exit 1 \
-               ;; \
-       esac; \
-       if [ x"${OSVERSION}" != x"5.5.1" ]; then \
-               OSDEFS=-D_ISOC9X_SOURCE; \
-       fi; \
-       echo "Making $@ for $$PROCESSOR..."; \
-       ${MAKE} -f Makefile.kernel ${MFLAGS} \
-           SBINDIR="${sbindir}" BINDIR="${bindir}" RESDIR="${RESDIR}"\
-           ETCDIR="${sysconfdir}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
-           MANDIR="${MANDIR}" DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" \
-           KRBDIR="${KRBDIR}" OSDEFS="$${OSDEFS}" \
-           MACHINEDEFS="$${MACHINEDEFS}" \
-           AFPLIBS="${AFPLIBS}" KGCCFLAGS="$${KGCCFLAGS}" ddp
-
-FRC: 
-
-ddp :  ${OBJ}
-       ${LD} -r -o ddp ${OBJ}
-
-linkage.o : linkage.c
-       ${CC} ${CFLAGS} -DVERSION=\"`cat ../../VERSION`\" -c linkage.c
-
-../../bin ../../etc:   ../../libatalk
-
-${ALL}:        FRC
-       if [ x"${OSVERSION}" != x"5.5.1" ]; then \
-         OSDEFS=-D_ISOC9X_SOURCE; \
-       fi; \
-       cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
-           ADDLIBS="${ADDLIBS}" DEFS="${DEFS} $${OSDEFS}" \
-           OPTOPTS="${OPTOPTS}" \
-           SBINDIR="${sbindir}" BINDIR="${bindir}" RESDIR="${RESDIR}" \
-           ETCDIR="${sysconfdir}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
-           DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
-           AFPLIBS="${AFPLIBS}" LDSHARED="${LDSHARED}" \
-           LDFLAGS_EXPORT="${LDFLAGS_EXPORT}" \
-           LDSHAREDFLAGS="${LDSHAREDFLAGS}" CSHAREDFLAGS="${CSHAREDFLAGS}" \
-           LIBSHARED="${LIBSHARED}" USE_CRYPTLIB="${USE_CRYPTLIB}" \
-           OSDEFS="$${OSDEFS}" MACHINEDEFS="$${MACHINEDEFS}" \
-           all
-
-FRC:
-
-kuninstall : FRC
-       rm -f /etc/rc2.d/S79atalk /etc/rc0.d/K79atalk
-       if [ x"${SPARC64}" != x ] ; then \
-               ${RM} /usr/kernel/drv/sparcv9/ddp; \
-               ${RM} /usr/kernel/strmod/sparcv9/ddp; \
-       else \
-               ${RM} /usr/kernel/drv/ddp; \
-               ${RM} /usr/kernel/strmod/ddp; \
-       fi
-       ${RM} /usr/kernel/drv/ddp.conf
-       -rem_drv ddp
-       sync;sync;sync
-
-kinstall : kernel kuninstall
-       if [ x"${SPARC64}" != x ]; then \
-               ${INSTALL} -c ddp /usr/kernel/drv/sparcv9/ddp; \
-               ln /usr/kernel/drv/sparcv9/ddp /usr/kernel/strmod/sparcv9/ddp; \
-       else \
-               ${INSTALL} -c ddp /usr/kernel/drv/ddp; \
-               ln /usr/kernel/drv/ddp /usr/kernel/strmod/ddp; \
-       fi
-       ${INSTALL} -c ddp.conf /usr/kernel/drv/ddp.conf
-       add_drv -m '* 0666 root sys' ddp
-       sync;sync;sync
-       if [ -f /etc/init.d/atalk ]; then \
-               echo "Preserving existing /etc/init.d/atalk settings."; \
-       else \
-       sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${sbindir}@ \
-               -e s@:BINDIR:@${bindir}@ -e s@:RESDIR:@${RESDIR}@ \
-               -e s@:ETCDIR:@${sysconfdir}@ -e s@:LIBDIR:@${LIBDIR}@ \
-               -e s@:INCDIR:@${INCDIR}@ \
-           < ../../distrib/initscripts/rc.atalk.sysv > /etc/init.d/atalk; \
-       fi
-       chmod 744 /etc/init.d/atalk
-       -ln -s ../init.d/atalk /etc/rc2.d/S79atalk
-       -ln -s ../init.d/atalk /etc/rc0.d/K79atalk
-
-install :
-       -mkdir ${DESTDIR}${sbindir} ${DESTDIR}${bindir} ${DESTDIR}${sysconfdir} \
-               ${DESTDIR}${libdir}
-       sed -e s@:BINDIR:@${prefix}/bin@ < ../../contrib/shell_utils/lp2pap.sh > ${DESTDIR}${RESDIR}/lp2pap.sh
-       chmod 744 ${DESTDIR}${sysconfdir}/lp2pap.sh
-       for i in ${ALL}; \
-           do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
-               ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-               SBINDIR="${sbindir}" BINDIR="${bindir}" RESDIR="${RESDIR}" \
-               ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
-               AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
-               AFPLIBS="${AFPLIBS}" \
-               LDSHARED="${LDSHARED}" LDFLAGS_EXPORT="${LDFLAGS_EXPORT}" \
-               LDSHAREDFLAGS="${LDSHAREDFLAGS}" \
-               CSHAREDFLAGS="${CSHAREDFLAGS}" LIBSHARED="${LIBSHARED}" \
-               OSDEFS="$${OSDEFS}" MACHINEDEFS="$${MACHINEDEFS}" \
-               INSTALL="${INSTALL}" $@); \
-       done
-       if [ -f ${DESTDIR}${sysconfdir}/afpd.conf ]; then \
-               echo "Retaining old afpd.conf file.";  \
-       else \
-               sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${sbindir}@ \
-                       -e s@:BINDIR:@${bindir}@ -e s@:RESDIR:@${RESDIR}@ \
-                       -e s@:ETCDIR:@${sysconfdir}@ -e s@:LIBDIR:@${LIBDIR}@ \
-                       -e s@:INCDIR:@${INCDIR}@ \
-                       < ../../config/afpd.conf > ${sysconfdir}/afpd.conf; \
-       fi
-       @echo
-       @echo "Install is done.  Don't forget to add lines from"
-       @echo "services.atalk to /etc/services and to call rc.atalk"
-       @echo "in /etc/rc.  See README and README.SOLARIS for more"
-       @echo "information."
-
-distdir :
-
-clean : sysclean
-       for i in ${ALL}; \
-           do (cd $$i; ${MAKE} ${MFLAGS} clean); \
-       done
-
-klean sysclean :
-       rm -f a.out core* *.o *.bak *[Ee]rrs tags
-       rm -f ddp
-
-depend :
-       for i in ${ALL}; \
-           do (cd $$i; ${MAKE} ${MFLAGS} DEFS="${DEFS}" depend); \
-       done
-
-# DO NOT DELETE THIS LINE
-
index 9383ecfb92766d1891ba8701acd679ed9bcc8ef1..cee7822ac9b42da939c9f40e032ba8c1828b7ae8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * $Id: aarp.c,v 1.3 2002-01-17 06:13:02 srittau Exp $
+ * $Id: aarp.c,v 1.3.10.1 2004-02-29 15:25:09 bfernhomberg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -124,8 +124,9 @@ aarp_free( struct atif_data *aid, struct aarplist *aal )
 }
 
     void
-aarp_timeout( struct atif_data *aid )
+aarp_timeout( void *ptr )
 {
+    struct atif_data   *aid = (struct atif_data *) ptr;
     struct aarplist    *aal, *p;
 
     aid->aid_aarptimeo = qtimeout( aid->aid_q, aarp_timeout,
index 922c6023eba76124d9891bf9ea8aa42bccdfd337..ef29d1eae6c5ce25ff074a4360b85a85b871478b 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: if.c,v 1.2 2002-01-17 07:11:13 srittau Exp $
+/* $Id: if.c,v 1.2.10.1 2004-02-29 15:25:09 bfernhomberg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -163,8 +163,10 @@ if_addmulti( queue_t *q, mblk_t *m, char *name, struct sockaddr *sa )
 }
 
     void
-if_pickaddr( struct atif_data *aid )
+if_pickaddr( void *ptr )
 {
+    struct atif_data *aid = (struct atif_data*) ptr;
+
     if ( aid->aid_c.c_type != SIOCSIFADDR ) {
        cmn_err( CE_NOTE, "if_pickaddr context %x\n", aid->aid_c.c_type );
        return;
index f1ed708935df6e09ddc970b2997990604d6877fd..0348d104fd46e9fc87979bef03f8886e8b5615b2 100644 (file)
@@ -11,7 +11,11 @@ struct atif_data {
     /* solaris 7 wants timeout_id_t, but solaris 2.6 doesn't have that.
      * so, we compromise with an unsigned long as we know that's big
      * enough to hold a pointer. */
+#ifdef HAVE_TIMEOUT_ID_T
+    timeout_id_t       aid_aarptimeo;
+#else
     unsigned long      aid_aarptimeo;
+#endif
     /*
      * A little bit of cleverness, to overcome the inability of
      * streams to sleep.  The type of context must be checked before
index 84b1586167666c37dceeb2f8cabbfc8ba67edc68..ab24e6c165e006c20293f368d1ba8302529cfad2 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: ioc.c,v 1.2 2002-01-17 07:11:13 srittau Exp $
+/* $Id: ioc.c,v 1.2.10.1 2004-02-29 15:25:09 bfernhomberg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -84,7 +84,7 @@ ioc_copyin( queue_t *q, mblk_t *m, mblk_t *private, caddr_t addr, uint size )
        freemsg( m );
        return;
     }
-#endif notdef
+#endif /* notdef */
     m->b_datap->db_type = M_COPYIN;
     m->b_wptr = m->b_rptr + sizeof( struct copyreq );
     cq = (struct copyreq *)m->b_rptr;
@@ -114,7 +114,7 @@ ioc_copyout( queue_t *q, mblk_t *m, mblk_t *private, caddr_t data,
        freemsg( m );
        return;
     }
-#endif notdef
+#endif /* notdef */
     if (( m0 = allocb( size, BPRI_MED )) == NULL ) {
        cmn_err( CE_CONT, "ioc_copyout nomem\n" );
        freemsg( m );
index 2738cb7ca1b0bde0dd55cc81a26e5d43b75d4952..60bac2b4c36c870d8bcaf61b92bf422312ec07ce 100644 (file)
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
 #include <sys/types.h>
 #include <sys/kmem.h>
 #include <sys/conf.h>
@@ -348,7 +351,7 @@ cmn_err( CE_CONT, "tpi_wput T_UNITDATA_REQ mblk size %X %X\n", m->b_rptr + tl->u
                freemsg( m );
                break;
            }
-#endif notdef
+#endif /* notdef */
 
            sat = *(struct sockaddr_at *)(m->b_rptr +
                    tl->unitdata_req.DEST_offset );