ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-19 21:27:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Save X11 include and library information from configure

Browse Source 
Saved the value of x_libraries variable from the autoconf AC_PATH_X if
the location is not standard.

refs #133
This commit is contained in:
Alex Lin 2016-06-27 09:50:04 -05:00
parent 8921811f7e
commit 6f20aa4b8b
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
autoconf/configure.ac
View File

@ -210,6 +210,9 @@ dnl look for libraries and headers we need to compile
AC_PATH_X AC_PATH_X
AS_IF([test "$no_x" = "yes"],AC_MSG_ERROR([could not find Xwindows development libraries and/or headers]),[]) AS_IF([test "$no_x" = "yes"],AC_MSG_ERROR([could not find Xwindows development libraries and/or headers]),[])
AC_CHECK_HEADER([X11/Intrinsic.h],[],AC_MSG_ERROR([could not find libxt development headers])) AC_CHECK_HEADER([X11/Intrinsic.h],[],AC_MSG_ERROR([could not find libxt development headers]))
AS_IF([test "x$x_libraries" = "x"],[X_LIB_DIR=],[X_LIB_DIR=-L$x_libraries])
dnl X_LIBRARIES=$x_libraries
AC_SUBST([X_LIB_DIR])
AX_JSC_DIRS([]) AX_JSC_DIRS([])
AC_CHECK_LIB(xml2, main, AC_CHECK_LIB(xml2, main,
[LIBXML=-lxml2 [LIBXML=-lxml2

7
configure vendored
View File

@ -653,6 +653,7 @@ build_cpu
build build
LIBXML LIBXML
MOTIF_HOME MOTIF_HOME
X_LIB_DIR
EGREP EGREP
GREP GREP
CXXCPP CXXCPP
@ -5867,6 +5868,12 @@ else
fi fi
if test "x$x_libraries" = "x"; then :
X_LIB_DIR=
else
X_LIB_DIR=-L$x_libraries
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for trick_source/data_products/fermi-ware" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for trick_source/data_products/fermi-ware" >&5
$as_echo_n "checking for trick_source/data_products/fermi-ware... " >&6; } $as_echo_n "checking for trick_source/data_products/fermi-ware... " >&6; }

4
share/trick/makefiles/config_user.mk.in
View File

@ -10,13 +10,15 @@ PYTHON = @PYTHON@
JAVAC = @JAVA_CC@ JAVAC = @JAVA_CC@
CLANG = @CLANG@ CLANG = @CLANG@
LLVM_HOME = @LLVM_HOME@
PYTHON_INCLUDES = @PYTHON_CPPFLAGS@ PYTHON_INCLUDES = @PYTHON_CPPFLAGS@
PYTHON_LIB = @PYTHON_LIBS@ @PYTHON_EXTRA_LDFLAGS@ PYTHON_LIB = @PYTHON_LIBS@ @PYTHON_EXTRA_LDFLAGS@
# @PYTHON_EXTRA_LIBS@ # @PYTHON_EXTRA_LIBS@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@ PTHREAD_LIBS = @PTHREAD_LIBS@
LLVM_HOME = @LLVM_HOME@ X_LIB_DIR = @X_LIB_DIR@
MOTIF_HOME = @MOTIF_HOME@ MOTIF_HOME = @MOTIF_HOME@
UDUNITS_INCLUDES = @UDUNITS_INCLUDES@ UDUNITS_INCLUDES = @UDUNITS_INCLUDES@

2
trick_source/data_products/DPX/APPS/FXPLOT/makefile
View File

@ -22,7 +22,7 @@ endif
ifeq ($(TRICK_HOST_TYPE), Darwin) ifeq ($(TRICK_HOST_TYPE), Darwin)
INCDIRS += -I/usr/X11/include INCDIRS += -I/usr/X11/include
XLIBS = -L${MOTIF_HOME}/lib -lXm -L/usr/X11R6/lib -L/usr/X11/lib -lXt -lX11 -lc++abi XLIBS = -L${MOTIF_HOME}/lib -lXm -L/usr/X11R6/lib ${X_LIB_DIR} -lXt -lX11 -lc++abi
else else
ifneq (${MOTIF_HOME},/usr) ifneq (${MOTIF_HOME},/usr)
XLIBS = -L${MOTIF_HOME}/lib64 -L${MOTIF_HOME}/lib XLIBS = -L${MOTIF_HOME}/lib64 -L${MOTIF_HOME}/lib