X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fnetatalk.m4;h=bbd6d8b0dba61efc9ab94420332d07350494baf7;hb=e238a56db3e1aadd88387c7979f0c53376445916;hp=1a55276471d8e7c2066fd5db2b12006d0e22c189;hpb=967716d1c5bd18e35a433d6d74fe3a7fac17c4da;p=netatalk.git

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 1a552764..bbd6d8b0 100644
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -413,7 +413,7 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [
 	    ;;
     "redhat-systemd")
 	    AC_MSG_RESULT([enabling redhat-style systemd support])
-	    ac_cv_init_dir="/lib/systemd/system"
+	    ac_cv_init_dir="/usr/lib/systemd/system"
 	    ;;
     "suse")
 	    AC_MSG_ERROR([--with-init-style=suse is obsoleted. Use suse-sysv or suse-systemd.])
@@ -424,7 +424,7 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [
 	    ;;
     "suse-systemd")
 	    AC_MSG_RESULT([enabling suse-style systemd support (>=openSUSE12.1)])
-	    ac_cv_init_dir="/lib/systemd/system"
+	    ac_cv_init_dir="/usr/lib/systemd/system"
 	    ;;
     "gentoo")
 	    AC_MSG_RESULT([enabling gentoo-style initscript support])
@@ -444,7 +444,7 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [
         ;;
     "systemd")
 	    AC_MSG_RESULT([enabling general systemd support])
-	    ac_cv_init_dir="/lib/systemd/system"
+	    ac_cv_init_dir="/usr/lib/systemd/system"
         ;;
     "none")
 	    AC_MSG_RESULT([disabling init-style support])
@@ -570,87 +570,8 @@ if test x"$this_os" = "xsolaris"; then
 	AC_DEFINE(SOLARIS, 1, [Solaris compatibility macro])
     AC_DEFINE(_XOPEN_SOURCE, 600, [Solaris compilation environment])
     AC_DEFINE(__EXTENSIONS__,  1, [Solaris compilation environment])
-	CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
 	need_dash_r=yes
 	init_style=solaris
-
-	solaris_module=no
-	AC_MSG_CHECKING([if we can build Solaris kernel module])
-	if test -x /usr/ccs/bin/ld && test x"$netatalk_cv_ddp_enabled" = x"yes" ; 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
-  	        
-                        AC_MSG_CHECKING([if we can build a 64bit kernel module])
-		        
-                        case `$CC --version 2>/dev/null` in
-			[[12]].* | 3.0.*)
-				COMPILE_64BIT_KMODULE=no
-				COMPILE_KERNEL_GCC=no	
-				solaris_module=no;;
-			*)
-			       	# use for 64 bit
-				KCFLAGS="-m64"
-				#KLDFLAGS="-melf64_sparc"
-				KLDFLAGS="-64";;
-			esac	
-			
-			AC_MSG_RESULT([$COMPILE_64BIT_KMODULE])
-			
-		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_LINK_IFELSE([AC_LANG_PROGRAM([[\
-#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])])
-
-	   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 Whether to run ldconfig after installing libraries
@@ -770,7 +691,7 @@ dnl Check for LDAP support, for client-side ACL visibility
 AC_DEFUN([AC_NETATALK_LDAP], [
 AC_MSG_CHECKING(for LDAP (necessary for client-side ACL visibility))
 AC_ARG_WITH(ldap,
-    [AS_HELP_STRING([--with-ldap],
+    [AS_HELP_STRING([--with-ldap[[=PATH]]],
         [LDAP support (default=auto)])],
         netatalk_cv_ldap=$withval,
         netatalk_cv_ldap=auto