Project

General

Profile

remove_X11_overlinking.patch

move X11 flag inside ngmx Makefile - Christoph Junghans, 07/19/2010 11:40 PM

View differences:

configure.ac
804 804
# Look for X
805 805
AC_PATH_XTRA
806 806
if test "$no_x" != "yes"; then
807
  LIBS="$X_LIBS $LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
808
  INCLUDES="$INCLUDES $X_CFLAGS"
809 807
  AM_CONDITIONAL(USE_X11,true)
810 808
else
811 809
  AM_CONDITIONAL(USE_X11,false)
src/ngmx/Makefile.am
2 2
# Note: Makefile is automatically generated from Makefile.in by the configure
3 3
# script, and Makefile.in is generated from Makefile.am by automake.
4 4

  
5
AM_CPPFLAGS = -I$(top_srcdir)/include -DGMXLIBDIR=\"$(datadir)/top\"
6

  
7 5
LDADD = ../mdlib/libmd@LIBSUFFIX@.la ../gmxlib/libgmx@LIBSUFFIX@.la
8 6

  
9 7
# Ngmx requires X11 - nothing is built if it doesn't exist
10 8

  
11 9
if USE_X11
12 10

  
11
AM_CPPFLAGS = -I$(top_srcdir)/include -DGMXLIBDIR=\"$(datadir)/top\" $(X_CFLAGS)
12
AM_LDFLAGS = $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
13 13
bin_PROGRAMS     = ngmx g_xrama g_highway g_logo 
14 14
EXTRA_PROGRAMS   = test_ngmx_dialog  g_showcol
15 15