Selaa lähdekoodia

get rid of lfds - use nunc-stans/ subdir for nunc-stans headers

Rich Megginson 10 vuotta sitten
vanhempi
sitoutus
4fc526e627
7 muutettua tiedostoa jossa 18 lisäystä ja 220 poistoa
  1. 2 2
      Makefile.am
  2. 5 9
      Makefile.in
  3. 5 121
      configure
  4. 0 4
      configure.ac
  5. 1 1
      ldap/servers/slapd/slap.h
  6. 0 78
      m4/lfds.m4
  7. 5 5
      m4/nunc-stans.m4

+ 2 - 2
Makefile.am

@@ -15,8 +15,8 @@ DEBUG_DEFINES = @debug_defs@
 DS_DEFINES = -DBUILD_NUM=$(BUILDNUM) -DVENDOR="\"$(vendor)\"" -DBRAND="\"$(brand)\"" -DCAPBRAND="\"$(capbrand)\"" \
 	-UPACKAGE_VERSION -UPACKAGE_TARNAME -UPACKAGE_STRING -UPACKAGE_BUGREPORT
 if enable_nunc_stans
-NUNC_STANS_INCLUDES = $(nunc_stans_inc) $(lfds_inc)
-NUNC_STANS_LINK = $(nunc_stans_lib) -lnunc-stans $(lfds_lib) -llfds
+NUNC_STANS_INCLUDES = $(nunc_stans_inc)
+NUNC_STANS_LINK = $(nunc_stans_lib) -lnunc-stans
 endif
 DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I. $(NUNC_STANS_INCLUDES)
 

+ 5 - 9
Makefile.in

@@ -108,8 +108,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/sasl.m4 $(top_srcdir)/m4/svrcore.m4 \
 	$(top_srcdir)/m4/icu.m4 $(top_srcdir)/m4/netsnmp.m4 \
 	$(top_srcdir)/m4/kerberos.m4 $(top_srcdir)/m4/pcre.m4 \
-	$(top_srcdir)/m4/selinux.m4 $(top_srcdir)/m4/lfds.m4 \
-	$(top_srcdir)/m4/nunc-stans.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/selinux.m4 $(top_srcdir)/m4/nunc-stans.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -706,8 +706,7 @@ libschemareload_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libschemareload_plugin_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@enable_nunc_stans_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
-@enable_nunc_stans_TRUE@	$(am__DEPENDENCIES_1)
+@enable_nunc_stans_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
 libslapd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
@@ -1423,9 +1422,6 @@ ldapsdk_lib = @ldapsdk_lib@
 ldapsdk_libdir = @ldapsdk_libdir@
 ldaptool_bindir = @ldaptool_bindir@
 ldaptool_opts = @ldaptool_opts@
-lfds_inc = @lfds_inc@
-lfds_lib = @lfds_lib@
-lfds_libdir = @lfds_libdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -1512,8 +1508,8 @@ DEBUG_DEFINES = @debug_defs@
 DS_DEFINES = -DBUILD_NUM=$(BUILDNUM) -DVENDOR="\"$(vendor)\"" -DBRAND="\"$(brand)\"" -DCAPBRAND="\"$(capbrand)\"" \
 	-UPACKAGE_VERSION -UPACKAGE_TARNAME -UPACKAGE_STRING -UPACKAGE_BUGREPORT
 
-@enable_nunc_stans_TRUE@NUNC_STANS_INCLUDES = $(nunc_stans_inc) $(lfds_inc)
-@enable_nunc_stans_TRUE@NUNC_STANS_LINK = $(nunc_stans_lib) -lnunc-stans $(lfds_lib) -llfds
+@enable_nunc_stans_TRUE@NUNC_STANS_INCLUDES = $(nunc_stans_inc)
+@enable_nunc_stans_TRUE@NUNC_STANS_LINK = $(nunc_stans_lib) -lnunc-stans
 DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I. $(NUNC_STANS_INCLUDES)
 
 # these paths are dependent on the settings of prefix and exec_prefix which may be specified

+ 5 - 121
configure

@@ -643,9 +643,6 @@ localrundir
 nunc_stans_libdir
 nunc_stans_lib
 nunc_stans_inc
-lfds_libdir
-lfds_lib
-lfds_inc
 pcre_libdir
 pcre_lib
 pcre_inc
@@ -965,9 +962,6 @@ with_kerberos_inc
 with_kerberos_lib
 with_pcre
 with_selinux
-with_lfds
-with_lfds_inc
-with_lfds_lib
 with_nunc_stans
 with_nunc_stans_inc
 with_nunc_stans_lib
@@ -1734,9 +1728,6 @@ Optional Packages:
                           kerberos
   --with-pcre[=PATH]      Perl Compatible Regular Expression directory
   --with-selinux          Support SELinux policy
-  --with-lfds[=PATH]      LFDS directory
-  --with-lfds-inc=PATH    LFDS include file directory
-  --with-lfds-lib=PATH    LFDS library directory
   --with-nunc-stans[=PATH]
                           nunc-stans directory
   --with-nunc-stans-inc=PATH
@@ -21293,110 +21284,6 @@ $as_echo "no" >&6; }
 fi
 
 
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2015 Red Hat, Inc.
-# All rights reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# END COPYRIGHT BLOCK
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lfds..." >&5
-$as_echo "$as_me: checking for lfds..." >&6;}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-lfds" >&5
-$as_echo_n "checking for --with-lfds... " >&6; }
-
-# Check whether --with-lfds was given.
-if test "${with_lfds+set}" = set; then :
-  withval=$with_lfds;
-  if test "$withval" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  elif test "$withval" = "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  elif test -d "$withval"/inc -a -d "$withval"/bin; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $withval" >&5
-$as_echo "using $withval" >&6; }
-        lfds_lib="-L$withval/bin"
-    lfds_libdir="$withval/lib"
-    lfds_incdir="$withval/inc"
-    if ! test -e "$lfds_incdir/liblfds.h" ; then
-      as_fn_error $? "$withval include dir not found" "$LINENO" 5
-    fi
-    lfds_inc="-I$lfds_incdir"
-  else
-    echo
-    as_fn_error $? "$withval not found" "$LINENO" 5
-  fi
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# check for --with-lfds-inc
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-lfds-inc" >&5
-$as_echo_n "checking for --with-lfds-inc... " >&6; }
-
-# Check whether --with-lfds-inc was given.
-if test "${with_lfds_inc+set}" = set; then :
-  withval=$with_lfds_inc;
-  if test -e "$withval"/liblfds.h
-  then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $withval" >&5
-$as_echo "using $withval" >&6; }
-    lfds_incdir="$withval"
-    lfds_inc="-I$withval"
-  else
-    echo
-    as_fn_error $? "$withval not found" "$LINENO" 5
-  fi
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# check for --with-lfds-lib
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-lfds-lib" >&5
-$as_echo_n "checking for --with-lfds-lib... " >&6; }
-
-# Check whether --with-lfds-lib was given.
-if test "${with_lfds_lib+set}" = set; then :
-  withval=$with_lfds_lib;
-  if test -d "$withval"
-  then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $withval" >&5
-$as_echo "using $withval" >&6; }
-    lfds_lib="-L$withval"
-    lfds_libdir="$withval"
-  else
-    echo
-    as_fn_error $? "$withval not found" "$LINENO" 5
-  fi
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
 # BEGIN COPYRIGHT BLOCK
 # Copyright (C) 2015 Red Hat, Inc.
 # All rights reserved.
@@ -21435,10 +21322,10 @@ $as_echo "no" >&6; }
   elif test -d "$withval"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $withval" >&5
 $as_echo "using $withval" >&6; }
-        nunc_stans_lib="-L$withval"
-    nunc_stans_libdir="$withval"
-    nunc_stans_incdir="$withval"
-    if ! test -e "$nunc_stans_incdir/ns_thrpool.h" ; then
+        nunc_stans_lib="-L$withval/lib"
+    nunc_stans_libdir="$withval/lib"
+    nunc_stans_incdir="$withval/include"
+    if ! test -e "$nunc_stans_incdir/nunc-stans/ns_thrpool.h" ; then
       as_fn_error $? "$withval include dir not found" "$LINENO" 5
     fi
     nunc_stans_inc="-I$nunc_stans_incdir"
@@ -21460,7 +21347,7 @@ $as_echo_n "checking for --with-nunc-stans-inc... " >&6; }
 # Check whether --with-nunc-stans-inc was given.
 if test "${with_nunc_stans_inc+set}" = set; then :
   withval=$with_nunc_stans_inc;
-  if test -e "$withval"/ns_thrpool.h
+  if test -e "$withval"/nunc-stans/ns_thrpool.h
   then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $withval" >&5
 $as_echo "using $withval" >&6; }
@@ -21591,9 +21478,6 @@ fi
 
 
 
-
-
-
 
 
 

+ 0 - 4
configure.ac

@@ -690,7 +690,6 @@ m4_include(m4/netsnmp.m4)
 m4_include(m4/kerberos.m4)
 m4_include(m4/pcre.m4)
 m4_include(m4/selinux.m4)
-m4_include(m4/lfds.m4)
 m4_include(m4/nunc-stans.m4)
 
 PACKAGE_BASE_VERSION=`echo $PACKAGE_VERSION | awk -F\. '{print $1"."$2}'`
@@ -749,9 +748,6 @@ AC_SUBST(netsnmp_link)
 AC_SUBST(pcre_inc)
 AC_SUBST(pcre_lib)
 AC_SUBST(pcre_libdir)
-AC_SUBST(lfds_inc)
-AC_SUBST(lfds_lib)
-AC_SUBST(lfds_libdir)
 AC_SUBST(nunc_stans_inc)
 AC_SUBST(nunc_stans_lib)
 AC_SUBST(nunc_stans_libdir)

+ 1 - 1
ldap/servers/slapd/slap.h

@@ -173,7 +173,7 @@ typedef struct symbol_t {
 #include "uuid.h"
 
 #ifdef ENABLE_NUNC_STANS
-#include <ns_thrpool.h>
+#include <nunc-stans/ns_thrpool.h>
 #endif
 
 #if defined(OS_solaris)

+ 0 - 78
m4/lfds.m4

@@ -1,78 +0,0 @@
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2015 Red Hat, Inc.
-# All rights reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# END COPYRIGHT BLOCK
-
-AC_CHECKING(for lfds)
-
-dnl  - check for --with-lfds
-AC_MSG_CHECKING(for --with-lfds)
-AC_ARG_WITH(lfds, AS_HELP_STRING([--with-lfds@<:@=PATH@:>@],[LFDS directory]),
-[
-  if test "$withval" = "yes"; then
-    AC_MSG_RESULT(yes)
-  elif test "$withval" = "no"; then
-    AC_MSG_RESULT(no)
-  elif test -d "$withval"/inc -a -d "$withval"/bin; then
-    AC_MSG_RESULT([using $withval])
-    dnl - check the user provided location
-    lfds_lib="-L$withval/bin"
-    lfds_libdir="$withval/lib"
-    lfds_incdir="$withval/inc"
-    if ! test -e "$lfds_incdir/liblfds.h" ; then
-      AC_MSG_ERROR([$withval include dir not found])
-    fi
-    lfds_inc="-I$lfds_incdir"
-  else
-    echo
-    AC_MSG_ERROR([$withval not found])
-  fi
-],
-AC_MSG_RESULT(no))
-
-# check for --with-lfds-inc
-AC_MSG_CHECKING(for --with-lfds-inc)
-AC_ARG_WITH(lfds-inc, AS_HELP_STRING([--with-lfds-inc=PATH],[LFDS include file directory]),
-[
-  if test -e "$withval"/liblfds.h
-  then
-    AC_MSG_RESULT([using $withval])
-    lfds_incdir="$withval"
-    lfds_inc="-I$withval"
-  else
-    echo
-    AC_MSG_ERROR([$withval not found])
-  fi
-],
-AC_MSG_RESULT(no))
-
-# check for --with-lfds-lib
-AC_MSG_CHECKING(for --with-lfds-lib)
-AC_ARG_WITH(lfds-lib, AS_HELP_STRING([--with-lfds-lib=PATH],[LFDS library directory]),
-[
-  if test -d "$withval"
-  then
-    AC_MSG_RESULT([using $withval])
-    lfds_lib="-L$withval"
-    lfds_libdir="$withval"
-  else
-    echo
-    AC_MSG_ERROR([$withval not found])
-  fi
-],
-AC_MSG_RESULT(no))

+ 5 - 5
m4/nunc-stans.m4

@@ -31,10 +31,10 @@ AC_ARG_WITH(nunc-stans, AS_HELP_STRING([--with-nunc-stans@<:@=PATH@:>@],[nunc-st
   elif test -d "$withval"; then
     AC_MSG_RESULT([using $withval])
     dnl - check the user provided location
-    nunc_stans_lib="-L$withval"
-    nunc_stans_libdir="$withval"
-    nunc_stans_incdir="$withval"
-    if ! test -e "$nunc_stans_incdir/ns_thrpool.h" ; then
+    nunc_stans_lib="-L$withval/lib"
+    nunc_stans_libdir="$withval/lib"
+    nunc_stans_incdir="$withval/include"
+    if ! test -e "$nunc_stans_incdir/nunc-stans/ns_thrpool.h" ; then
       AC_MSG_ERROR([$withval include dir not found])
     fi
     nunc_stans_inc="-I$nunc_stans_incdir"
@@ -49,7 +49,7 @@ AC_MSG_RESULT(no))
 AC_MSG_CHECKING(for --with-nunc-stans-inc)
 AC_ARG_WITH(nunc-stans-inc, AS_HELP_STRING([--with-nunc-stans-inc=PATH],[nunc-stans include file directory]),
 [
-  if test -e "$withval"/ns_thrpool.h
+  if test -e "$withval"/nunc-stans/ns_thrpool.h
   then
     AC_MSG_RESULT([using $withval])
     nunc_stans_incdir="$withval"