Description: Remove libpreludedb-config Author: Thomas Andrejak Last-Update: Mon, 28 September 2020 Forwarded: yes, privately --- a/docs/manpages/libpreludedb-config.1 2020-10-02 17:49:12.375879479 -0400 +++ /dev/null 2019-12-06 11:16:08.668000000 -0500 @@ -1,74 +0,0 @@ -.TH "libpreludedb-config" 1 "2 May 2016" -.SH NAME -libpreludedb\-config \- helper script for building with libpreludedb -.LP -.SH SYNOPSIS -.B libpreludedb\-config -[options] -.SH DESCRIPTION -.B libpreludedb\-config -is a simple shell script used to determine the compiler and linker flags that -should be used to compile and link programs that use the libpreludedb library. -.SH OPTIONS -.TP 15 -.PD 0 -.B \-\-prefix -If specified, use dir instead of the installation prefix that the library was -built with, when computing the output for the -.B \-\-cflags -and -.B \-\-libs -options. -This option must be specified before any -.B \-\-libs -or -.B \-\-cflags -options. This -option is also used for the exec prefix if the -.B \-\-exec-prefix -option is not specified. -.TP -.PD 0 -.B \-\-exec\-prefix -If specified, use dir instead of the exec installation prefix that the library -was built with, when computing the output for the -.B \-\-cflags -and -.B \-\-libs -options. This option must be specified before any -.B \-\-libs -or -.B \-\-cflags -options. -.TP -.PD 0 -.B \-\-version -Print the currently installed version of the library on the standard output. -.TP -.PD 0 -.B \-\-thread -If specified, add the thread library used by libpreludedb to the -.B \-\-libs -or -.B \-\-cflags -options. -.TP -.PD 0 -.B \-\-libs -Print the linker flags that are necessary to link with the specified library. -.TP -.PD 0 -.B \-\-ldflags -Print the LDflags that are necessary to compile a program using the specified -library. -.TP -.PD 0 -.B \-\-cflags -Print the compiler flags that are necessary to compile a program using the -specified library. -.TP -.PD 0 -.B \-\-plugin\-dir -Print the directory where libpreludedb plugins are installed. -.SH AUTHOR -This man page has been written by CS GROUP - France --- a/libpreludedb-config.in 2020-10-02 17:49:12.411878764 -0400 +++ /dev/null 2019-12-06 11:16:08.668000000 -0500 @@ -1,104 +0,0 @@ -#!/bin/sh - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -exec_prefix_set=no -want_cflags=no -want_libs=no -thread_set=no - -usage="\ -Usage: libpreludedb-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--thread] [--libs] [--ldflags] [--cflags] [--plugin-dir]" - -if test $# -eq 0; then - echo "${usage}" 1>&2 - exit 1 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - if test $exec_prefix_set = no ; then - exec_prefix=$optarg - fi - ;; - - --prefix) - echo $prefix - ;; - - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=yes - ;; - - --exec-prefix) - echo $exec_prefix - ;; - - --version) - echo @VERSION@ - ;; - - --cflags) - want_cflags=yes - ;; - - --ldflags) - echo @LIBPRELUDE_LDFLAGS@ - ;; - - --libs) - want_libs=yes - ;; - - --plugin-dir) - echo @db_plugin_dir@ - ;; - - --thread) - thread_set=yes - ;; - - *) - echo "${usage}" 1>&2 - exit 1 - ;; - - esac - shift -done - -if test $want_cflags = yes; then - flags="" - if test @includedir@ != /usr/include ; then - flags=-I@includedir@ - fi - - if test $thread_set = yes; then - flags=$flags @THREADCPPFLAGS@ - fi - - echo $flags -fi - - -if test $want_libs = yes; then - libdirs=-L@libdir@ - - if test $thread_set = yes; then - thrlibs=@LTLIBMULTITHREAD@ - else - thrlibs=@LTLIBTHREAD@ - fi - - echo $libdirs -lpreludedb @LIBPRELUDE_LIBS@ $thrlibs -fi - -exit 0 --- a/Makefile.am 2020-10-02 17:49:12.055885837 -0400 +++ b/Makefile.am 2020-10-04 15:57:30.047953649 -0400 @@ -25,7 +25,6 @@ `find "$(srcdir)" -type f -name Makefile.in -print` -bin_SCRIPTS = $(top_builddir)/libpreludedb-config dist_bin_SCRIPTS = $(top_srcdir)/preludedb-admin distuninstallcheck_listfiles = find . -type f -print | $(GREP) -v 'perl' | $(GREP) -v '3pm' | $(GREP) -v 'egg-info' | $(GREP) -v 'cpython' --- a/configure.ac 2020-10-02 17:49:12.067885599 -0400 +++ b/configure.ac 2020-10-04 15:58:40.378556364 -0400 @@ -343,8 +343,6 @@ AC_CONFIG_FILES([ -libpreludedb-config - Makefile m4/Makefile libmissing/Makefile @@ -375,7 +373,6 @@ bindings/python/Makefile bindings/python/setup.py ]) -AC_CONFIG_COMMANDS([default],[[ chmod +x libpreludedb-config ]],[[]]) AC_OUTPUT --- a/docs/manpages/Makefile.am 2020-10-02 17:49:12.375879479 -0400 +++ b/docs/manpages/Makefile.am 2020-10-04 16:09:04.022166201 -0400 @@ -1,3 +1,3 @@ -dist_man_MANS = preludedb-admin.1 libpreludedb-config.1 +dist_man_MANS = preludedb-admin.1 -include $(top_srcdir)/git.mk --- a/m4/libpreludedb.m4 2020-10-02 17:49:12.415878685 -0400 +++ b/m4/libpreludedb.m4 2020-10-07 17:42:57.660615115 -0400 @@ -1,63 +1,48 @@ dnl Autoconf macros for libpreludedb dnl $id$ +# Modified for LIBPRELUDEDB -- Thomas Andrejak # Modified for LIBPRELUDEDB -- Yoann Vandoorselaere # Modified for LIBGNUTLS -- nmav # Configure paths for LIBGCRYPT # Shamelessly stolen from the one of XDELTA by Owen Taylor # Werner Koch 99-12-09 -dnl AM_PATH_LIBPRELUDEDB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]], THREAD_SUPPORT) +dnl AM_LIBPRELUDEDB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]], THREAD_SUPPORT) dnl Test for libpreludedb, and define LIBPRELUDEDB_CFLAGS, LIBPRELUDEDB_LDFLAGS, and LIBPRELUDEDB_LIBS dnl -AC_DEFUN([AM_PATH_LIBPRELUDEDB], +AC_DEFUN([AM_LIBPRELUDEDB], [dnl -dnl Get the cflags and libraries from the libpreludedb-config script +dnl Get the cflags and libraries from the libpreludedb pkg-config file dnl -AC_ARG_WITH(libpreludedb-prefix, AC_HELP_STRING(--with-libpreludedb-prefix=PFX, - Prefix where libpreludedb is installed (optional)), - libpreludedb_config_prefix="$withval", libpreludedb_config_prefix="") - - if test x$libpreludedb_config_prefix != x ; then - if test x${LIBPRELUDEDB_CONFIG+set} != xset ; then - LIBPRELUDEDB_CONFIG=$libpreludedb_config_prefix/bin/libpreludedb-config - fi - fi - - AC_PATH_PROG(LIBPRELUDEDB_CONFIG, libpreludedb-config, no) - - if test "$LIBPRELUDEDB_CONFIG" != "no"; then - if $($LIBPRELUDEDB_CONFIG --thread > /dev/null 2>&1); then - if test x$4 = xtrue || test x$4 = xyes; then - libpreludedb_config_args="--thread" - fi - fi - fi - - min_libpreludedb_version=ifelse([$1], ,0.1.0,$1) - AC_MSG_CHECKING(for libpreludedb - version >= $min_libpreludedb_version) +AC_ARG_ENABLE(libpreludedb, AC_HELP_STRING(--enable-libpreludedb, Define whether LibPreludeDB is required), libpreludedb_required="yes", enable_libpreludedb="yes") +if test x$enable_libpreludedb = xyes; then no_libpreludedb="" - if test "$LIBPRELUDEDB_CONFIG" = "no" ; then - no_libpreludedb=yes + min_libpreludedb_version=ifelse([$1], ,0.1.0,$1) + PKG_CHECK_MODULES([LIBPRELUDEDB], [libpreludedb >= $min_libpreludedb_version], + [AC_CHECK_HEADER(libpreludedb/preludedb.h, enable_libpreludedb=yes, enable_libpreludedb=no)], + [enable_libpreludedb=no]) + if test "x$enable_libpreludedb" = xno ; then + no_libpreludedb="no" + ifelse([$3], , :, [$3]) else - LIBPRELUDEDB_CFLAGS=`$LIBPRELUDEDB_CONFIG $libpreludedb_config_args $libpreludedb_config_args --cflags` - LIBPRELUDEDB_LDFLAGS=`$LIBPRELUDEDB_CONFIG $libpreludedb_config_args $libpreludedb_config_args --ldflags` - LIBPRELUDEDB_LIBS=`$LIBPRELUDEDB_CONFIG $libpreludedb_config_args $libpreludedb_config_args --libs` - libpreludedb_config_version=`$LIBPRELUDEDB_CONFIG $libpreludedb_config_args --version` + AC_MSG_CHECKING(libpreludedb $min_libpreludedb_version usability) + + libpreludedb_config_version=`$PKG_CONFIG libpreludedb --modversion` + ac_save_CFLAGS="$CFLAGS" + ac_save_LDFLAGS="$LDFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $LIBPRELUDEDB_CFLAGS" + LDFLAGS="$LDFLAGS $LIBPRELUDEDB_LDFLAGS" + LIBS="$LIBS $LIBPRELUDEDB_LIBS" - ac_save_CFLAGS="$CFLAGS" - ac_save_LDFLAGS="$LDFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $LIBPRELUDEDB_CFLAGS" - LDFLAGS="$LDFLAGS $LIBPRELUDEDB_LDFLAGS" - LIBS="$LIBS $LIBPRELUDEDB_LIBS" dnl dnl Now check if the installed libpreludedb is sufficiently new. Also sanity dnl checks the results of libpreludedb-config to some extent dnl - rm -f conf.libpreludedbtest - AC_TRY_RUN([ + rm -f conf.libpreludedbtest + AC_TRY_RUN([ #include #include #include @@ -70,16 +55,10 @@ if( strcmp( preludedb_check_version(NULL), "$libpreludedb_config_version" ) ) { - printf("\n*** 'libpreludedb-config --version' returned %s, but LIBPRELUDEDB (%s)\n", + printf("\n*** 'pkg-config libpreludedb --modversion' returned %s, but LIBPRELUDEDB (%s)\n", "$libpreludedb_config_version", preludedb_check_version(NULL) ); - printf("*** was found! If libpreludedb-config was correct, then it is best\n"); - printf("*** to remove the old version of LIBPRELUDEDB. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If libpreludedb-config was wrong, set the environment variable LIBPRELUDEDB_CONFIG\n"); - printf("*** to point to the correct copy of libpreludedb-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); + printf("*** was found! If pkg-config was correct, then it is best\n"); + printf("*** to remove the old version of LIBPRELUDEDB.\n"); } else if ( strcmp(preludedb_check_version(NULL), LIBPRELUDEDB_VERSION ) ) { @@ -101,45 +80,30 @@ printf("*** LIBPRELUDEDB is always available from https://www.prelude-siem.org/project/prelude/files\n"); printf("*** \n"); printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the libpreludedb-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of LIBPRELUDEDB, but you can also set the LIBPRELUDEDB_CONFIG environment to point to the\n"); - printf("*** correct copy of libpreludedb-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); + printf("*** probably means that the wrong copy of the libpreludedb pkg-config file is\n"); + printf("*** being found.\n"); } } return 1; } ],, no_libpreludedb=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - LDFLAGS="$ac_save_LDFLAGS" - fi - - if test "x$no_libpreludedb" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - if test -f conf.libpreludedbtest ; then + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + LDFLAGS="$ac_save_LDFLAGS" + + if test "x$no_libpreludedb" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + if test -f conf.libpreludedbtest ; then : - else + else AC_MSG_RESULT(no) - fi - if test "$LIBPRELUDEDB_CONFIG" = "no" ; then - echo "*** The libpreludedb-config script installed by LIBPRELUDEDB could not be found" - echo "*** If LIBPRELUDEDB was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the LIBPRELUDEDB_CONFIG environment variable to the" - echo "*** full path to libpreludedb-config." - else - if test -f conf.libpreludedbtest ; then - : - else - echo "*** Could not run libpreludedb test program, checking why..." - CFLAGS="$CFLAGS $LIBPRELUDEDB_CFLAGS" - LDFLAGS="$LDFLAGS $LIBPRELUDEDB_LDFLAGS" - LIBS="$LIBS $LIBPRELUDEDB_LIBS" - AC_TRY_LINK([ + echo "*** Could not run libpreludedb test program, checking why..." + CFLAGS="$CFLAGS $LIBPRELUDEDB_CFLAGS" + LDFLAGS="$LDFLAGS $LIBPRELUDEDB_LDFLAGS" + LIBS="$LIBS $LIBPRELUDEDB_LIBS" + AC_TRY_LINK([ #include #include #include @@ -158,21 +122,25 @@ [ echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means LIBPRELUDEDB was incorrectly installed" echo "*** or that you have moved LIBPRELUDEDB since it was installed. In the latter case, you" - echo "*** may want to edit the libpreludedb-config script: $LIBPRELUDEDB_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LDFLAGS="$ac_save_LDFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - LIBPRELUDEDB_CFLAGS="" - LIBPRELUDEDB_LDFLAGS="" - LIBPRELUDEDB_LIBS="" - ifelse([$3], , :, [$3]) + echo "*** may want to edit the libpreludedb pkg-config file" ]) + CFLAGS="$ac_save_CFLAGS" + LDFLAGS="$ac_save_LDFLAGS" + LIBS="$ac_save_LIBS" + fi + LIBPRELUDEDB_CFLAGS="" + LIBPRELUDEDB_LDFLAGS="" + LIBPRELUDEDB_LIBS="" + ifelse([$3], , :, [$3]) + fi + rm -f conf.libpreludedbtest + AC_SUBST(LIBPRELUDEDB_CFLAGS) + AC_SUBST(LIBPRELUDEDB_LDFLAGS) + AC_SUBST(LIBPRELUDEDB_LIBS) + fi + if test x$enable_libpreludedb = xno && test x$libpreludedb_required = xyes; then + AC_MSG_ERROR([Could not find libpreludedb library]) fi - rm -f conf.libpreludedbtest - AC_SUBST(LIBPRELUDEDB_CFLAGS) - AC_SUBST(LIBPRELUDEDB_LDFLAGS) - AC_SUBST(LIBPRELUDEDB_LIBS) +fi ]) dnl *-*wedit:notab*-* Please keep this as the last line.