[cpp-log4shib] 05/17: Clean up unused macro packages

Scott Cantor cantor.2 at osu.edu
Mon Jun 25 10:18:16 EDT 2018


This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-log4shib.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=f374308eca8aadd1fa24d4bda364f08733968a89

commit f374308eca8aadd1fa24d4bda364f08733968a89
Author: Ferenc Wágner <wferi at debian.org>
AuthorDate: Mon Jun 25 00:56:25 2018 +0200

    Clean up unused macro packages
---
 configure.ac               |  4 ---
 m4/BB_CHECK_OMNITHREADS.m4 | 78 ----------------------------------------------
 m4/BB_CHECK_PTHREADS.m4    | 17 ----------
 3 files changed, 99 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9ae4a58..fa57576 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,10 +136,6 @@ fi
 # ----------------------------------------------------------------------------
 BB_ENABLE_DOXYGEN
 
-# check for omnithreads
-#BB_CHECK_OMNITHREADS
-#BB_CHECK_PTHREADS
-
 PETI_PEDANTIC_GCC
 
 # Create files
diff --git a/m4/BB_CHECK_OMNITHREADS.m4 b/m4/BB_CHECK_OMNITHREADS.m4
deleted file mode 100644
index 35dc420..0000000
--- a/m4/BB_CHECK_OMNITHREADS.m4
+++ /dev/null
@@ -1,78 +0,0 @@
-dnl at synposis BB_CHECK_OMNITHREADS.m4
-dnl
-AC_DEFUN([BB_CHECK_OMNITHREADS],[
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_CXX])dnl
-AC_REQUIRE([AC_PROG_CPP])dnl
-AC_REQUIRE([AC_PROG_CXXCPP])dnl
-
-
-AC_ARG_WITH(omnithreads, [  --with-omnithreads      include omnithreads support], [OMNIDIR=${with_omnithreads}], [OMNIDIR=no])
-
-if test "x$OMNIDIR" = "xyes"; then
-    OMNIDIR=/usr
-fi
-
-if test "x$OMNIDIR" = "x"; then
-    OMNIDIR=no
-fi
-
-if test "x$OMNIDIR" != "xno"; then
-    case $host_cpu in
-        sparc*)
-            OMNIDEFINES=-D__sparc__
-            ;;
-        i386)
-            OMNIDEFINES=-D__x86__
-            ;;
-        i486)
-            OMNIDEFINES=-D__x86__
-            ;;
-        i586)
-            OMNIDEFINES=-D__x86__
-            ;;
-        i686)
-            OMNIDEFINES=-D__x86__
-            ;;
-        *)
-            AC_MSG_ERROR([unknown CPU: $host_cpu])
-            ;;
-    esac
-
-    case $host_os in
-        solaris*)
-            OMNIDEFINES="$OMNIDEFINES -D__sunos__ -D__OSVERSION__=5"
-            ;;
-        linux*)
-            OMNIDEFINES="$OMNIDEFINES -D__linux__ -D__OSVERSION__=2"
-            ;;
-        *)
-            AC_MSG_ERROR([unknown OS: $host_os])
-            ;;
-    esac
-
-    CPPFLAGS="$CPPFLAGS -D_PTHREADS -D_REENTRANT -D_THREAD_SAFE"
-    CFLAGS="$CFLAGS $OMNIDEFINES -I$OMNIDIR/include"
-    CXXFLAGS="$CXXCFLAGS $OMNIDEFINES -I$OMNIDIR/include"
-    dnl AC_CHECK_HEADERS([omnithread.h])
-
-    AC_LANG_PUSH(C++)
-
-    LIBS="$LIBS -L$OMNIDIR/lib -lomnithread"
-    AC_CACHE_CHECK([for omnithreads library],
-    bb_cv_check_omnithreads,
-    AC_TRY_LINK(
-        #include <omnithread.h>
-        ,omni_mutex my_mutex,
-        bb_cv_check_omnithreads=yes,bb_cv_check_omnithreads=no)
-    )
-    if test "x$bb_cv_check_omnithreads" = "xno"; then
-        AC_MSG_ERROR([omnithreads not found])
-    fi
-
-    AC_DEFINE(HAVE_THREADING,,[define if threading is enabled])
-    AC_DEFINE(USE_OMNITHREADS,,[define if omnithread library is available])
-
-    AC_LANG_POP(C++)
-fi
-])
diff --git a/m4/BB_CHECK_PTHREADS.m4 b/m4/BB_CHECK_PTHREADS.m4
deleted file mode 100644
index 669b6e3..0000000
--- a/m4/BB_CHECK_PTHREADS.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-dnl at synposis BB_CHECK_PTHREADS.m4
-dnl
-AC_DEFUN([BB_CHECK_PTHREADS],[
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_CXX])dnl
-AC_REQUIRE([AC_PROG_CPP])dnl
-AC_REQUIRE([AC_PROG_CXXCPP])dnl
-
-
-AC_ARG_WITH(pthreads, [  --with-pthreads         include pthreads support],
-    AC_SEARCH_LIBS(pthread_key_create,pthread,
-        [AC_DEFINE(HAVE_THREADING,,[define if threading is enabled])
-         AC_DEFINE(USE_PTHREADS,,[define if pthread library is available])
-         AC_DEFINE(_PTHREADS,,[define for STL if pthread library is used])],
-    AC_MSG_ERROR([pthreads not found])))
-
-])

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list