From: Guy Harris Date: Thu, 17 May 2018 02:42:54 +0000 (-0700) Subject: Note why we assume we have libdagconf if we have libdag. X-Git-Tag: libpcap-1.9-bp~28 X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/77da77c36e5d958f9b8d6729876a33f670de031f Note why we assume we have libdagconf if we have libdag. --- diff --git a/cmake/Modules/FindDAG.cmake b/cmake/Modules/FindDAG.cmake index 108a142a..ef135284 100644 --- a/cmake/Modules/FindDAG.cmake +++ b/cmake/Modules/FindDAG.cmake @@ -5,7 +5,12 @@ # Try to find the header find_path(DAG_INCLUDE_DIR dagapi.h) -# Try to find the library +# +# Try to find the libraries +# +# We assume that if we have libdag we have libdagconf, as they're +# installed at the same time from the same package. +# find_library(DAG_LIBRARY dag) find_library(DAGCONF_LIBRARY dagconf) diff --git a/config.h.in b/config.h.in index 6915fa9c..b1a20a44 100644 --- a/config.h.in +++ b/config.h.in @@ -15,6 +15,9 @@ /* define if we have the AIX getprotobyname_r() */ #undef HAVE_AIX_GETPROTOBYNAME_R +/* Define to 1 if you have the header file. */ +#undef HAVE_DAGAPI_H + /* define if you have the DAG API */ #undef HAVE_DAG_API diff --git a/configure b/configure index 496aa9d6..ef4bc9f2 100755 --- a/configure +++ b/configure @@ -716,7 +716,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -815,7 +814,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1068,15 +1066,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1214,7 +1203,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1367,7 +1356,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -4109,7 +4097,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -4155,7 +4143,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -4179,7 +4167,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -4224,7 +4212,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -4248,7 +4236,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -7002,6 +6990,11 @@ fi LDFLAGS=$saved_ldflags + # + # We assume that if we have libdag we have libdagconf, + # as they're installed at the same time from the same + # package. + # LIBS="$LIBS -ldag -ldagconf" LDFLAGS="$LDFLAGS -L$dag_lib_dir" diff --git a/configure.ac b/configure.ac index 5fd1afa7..2a9c8e95 100644 --- a/configure.ac +++ b/configure.ac @@ -1112,6 +1112,11 @@ if test "$want_dag" != no; then LDFLAGS=$saved_ldflags + # + # We assume that if we have libdag we have libdagconf, + # as they're installed at the same time from the same + # package. + # LIBS="$LIBS -ldag -ldagconf" LDFLAGS="$LDFLAGS -L$dag_lib_dir"