Changeset: 8fbcf787a68c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8fbcf787a68c
Modified Files:
        configure.ag
        gdk/Makefile.ag
Branch: mal-weld
Log Message:

weld library dependency


diffs (76 lines):

diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1811,6 +1811,41 @@ AS_VAR_IF([have_valgrind], [no], [], [
                [AC_DEFINE([HAVE_VALGRIND], 1, [Define if you have valgrind 
installed and want to use it])],
                [AS_VAR_IF([have_valgrind], [yes], [AC_MSG_ERROR([no valgrind 
support found])])])])
 
+# libweld
+org_have_weld=auto
+have_weld=$org_have_weld
+WELD_LIBS=""
+WELD_INCS=""
+AC_ARG_WITH([weld],
+       [AS_HELP_STRING([--with-weld=DIR],
+               [weld library is installed in DIR])],
+       [have_weld="$withval"])
+AS_VAR_IF([have_weld], [no], [], [
+       AS_CASE([$have_weld],
+       [auto|yes], [],
+       [
+               WELD_LIBS="-L$have_weld/lib -lweld"
+               WELD_INCS="-I$have_weld/include"])
+       save_CPPFLAGS="$CPPFLAGS"
+       save_LDFLAGS="$LDFLAGS"
+       CPPFLAGS="$CPPFLAGS $WELD_INCS"
+       LDFLAGS="$LDFLAGS $WELD_LIBS"
+       AC_CHECK_HEADER([weld.h],
+               AC_CHECK_LIB([weld], [weld_conf_new],
+                       [AC_DEFINE([HAVE_WELD], 1, [Define if the weld library 
exists])],
+                       [AS_VAR_IF([have_weld], [auto], [], 
[AC_MSG_ERROR([-lweld library not found])])
+                       have_weld=no; why_have_weld="(weld library not found)" 
], ),
+               [AS_VAR_IF([have_weld], [auto], [], [AC_MSG_ERROR([weld.h 
header not found])])
+               have_weld=no; why_have_weld="(weld.h header not found)" ])
+       LDFLAGS="$save_LDFLAGS"
+       CPPFLAGS="$save_CPPFLAGS"
+       AS_IF([test "x$have_weld" = "xyes" -o "x$have_weld" = "xauto"], [
+           WELD_INCS=
+           WELD_LIBS="-lweld"])])
+AC_SUBST([WELD_INCS])
+AC_SUBST([WELD_LIBS])
+AM_CONDITIONAL([HAVE_WELD], [test x"$have_weld" != xno])
+
 # R API (R UDFs)
 have_libr=no
 AS_VAR_IF([enable_rintegration], [no], [], [
@@ -3041,6 +3076,7 @@ for comp in \
        'snappy     ' \
        'unixodbc   ' \
        'valgrind   ' \
+       'weld       ' \
        'zlib       ' \
 ; do
        eval "org=\$org_have_$comp"
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -6,7 +6,8 @@
 
 MTSAFE
 
-INCLUDES = ../common/options ../common/stream ../common/utils 
$(valgrind_CFLAGS)
+INCLUDES = ../common/options ../common/stream ../common/utils \
+                  $(valgrind_CFLAGS) $(WELD_INCS)
 
 lib_gdk = {
        VERSION = $(GDK_VERSION)
@@ -39,7 +40,8 @@ lib_gdk = {
                ../common/stream/libstream \
                ../common/utils/libmutils \
                $(MATH_LIBS) $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) \
-               $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS) $(PSAPILIB) 
$(KVM_LIBS)
+               $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS) $(PSAPILIB) 
$(KVM_LIBS) \
+               $(WELD_LIBS)
 }
 
 headers_h = {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to