diff options
| author | Christian Persch <chpe@src.gnome.org> | 2008-11-22 13:45:09 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2008-11-22 13:45:09 +0000 |
| commit | 5792cacf58b35e4664cf6aca5933e0090eec3f0c (patch) | |
| tree | e43f7d72f297f239af50b31321bf599316e1e78b /configure.in | |
| parent | a48bb06cadb10ebfc44d38533bfd82dc6c2a4602 (diff) | |
Remove more configure cruft: OTHERLIBS/CFLAGS and X_LIBS/CFLAGS.
Don't add LIBS to *_LDADD, since it's there by default already.
svn path=/trunk/; revision=2170
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/configure.in b/configure.in index 5e1da8c..c5883bf 100644 --- a/configure.in +++ b/configure.in @@ -87,12 +87,6 @@ AC_SUBST([LIBTOOL_FLAGS]) # Compilation ################################################################################ -# Save the names of these other libraries. -OTHERCFLAGS="$X_CFLAGS" -AC_SUBST(OTHERCFLAGS) -OTHERLIBS="$LIBS" -AC_SUBST(OTHERLIBS) - dnl Use lots of warning flags with with gcc and compatible compilers dnl Copied from cairo AC_DEFUN([VTE_CC_TRY_FLAG], [ @@ -203,29 +197,6 @@ fi # Core ################################################################################ - -# On some OSs, AC_PATH_XTRA doesn't work right(?), so let the user specify -# X_PRE_LIBS and X_EXTRA_LIBS to add even more libraries, and add -lX11 to -# the list of libraries for grins. -AC_PATH_XTRA([X11], [X11/Xlib.h], [XFlush(NULL)]) -if test "$have_x" = yes ; then - if test -d "$x_includes" ; then - X_CFLAGS="-I$x_includes $X_CFLAGS" - elif test -d "$ac_x_includes" ; then - X_CFLAGS="-I$ac_x_includes $X_CFLAGS" - fi - X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" - if test -d "$ac_x_libraries" ; then - X_LIBS="-L$x_libraries $X_LIBS" - elif test -d "$ac_x_libraries" ; then - X_LIBS="-L$ac_x_libraries $X_LIBS" - fi -fi -AC_SUBST([X_CFLAGS]) -AC_SUBST([X_LIBS]) - - - # Use all available features under glibc, and disable accidental use of # deprecated functionality. AC_EGREP_CPP(glibc, |