Changeset 00d49b6


Ignore:
Timestamp:
02/20/12 13:15:43 (9 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
e966aa8
Parents:
9902272
Message:
  • Fix a whole load of problems with the new configure script
File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    r9902272 r00d49b6  
    474474                TOOLS_LIBS="$TOOLS_LIBS $ac_cv_search_mvprintw"
    475475        fi
    476         HAVE_NCURSES=1
     476        AC_DEFINE(HAVE_NCURSES, 1, "Compiled with ncurses support")
    477477        with_ncurses=yes],
    478478
     
    480480        [AS_IF([test "x$with_ncurses" = "xyes"],
    481481                [AC_MSG_ERROR([ncurses requested but not found])])
    482         HAVE_NCURSES=0
     482        AC_DEFINE(HAVE_NCURSES, 0, "Compiled with ncurses support")
    483483        with_ncurses=no]
    484484)
     
    496496                LIBTRACE_LIBS="$LIBTRACE_LIBS -lbz2"
    497497        fi
    498         HAVE_LIBBZ2=1
    499         with_bzip2=yes],
    500 
     498        with_bzip2=yes
     499        AC_DEFINE(HAVE_LIBBZ2, 1, "Compiled with bzip2 support")],
    501500       
    502501        [AS_IF([test "x$with_bzip2" = "xyes"],
    503502                [AC_MSG_ERROR([bzip2 requested but not found])])
    504         HAVE_LIBBZ2=0
     503        AC_DEFINE(HAVE_LIBBZ2, 0, "Compiled with bzip2 support")
    505504        with_bzip2=no]
    506505)
     
    518517                LIBTRACE_LIBS="$LIBTRACE_LIBS -lz"
    519518        fi
    520         HAVE_LIBZ=1
     519        AC_DEFINE(HAVE_LIBZ, 1, "Compiled with zlib support")
    521520        with_zlib=yes],
    522521
     
    524523        [AS_IF([test "x$with_zlib" = "xyes"],
    525524                [AC_MSG_ERROR([zlib requested but not found])])
    526         HAVE_LIBZ=0
     525        AC_DEFINE(HAVE_LIBZ, 0, "Compiled with zlib support")
    527526        with_zlib=no]
    528527)
     
    533532AS_IF([test "x$with_lzo" != "xno"],
    534533        [
    535         AC_CHECK_LIB(lzo2, lzo1x_1_compress, have_lzo=yes, have_lzo=yes)
     534        AC_CHECK_LIB(lzo2, lzo1x_1_compress, have_lzo=yes, have_lzo=no)
    536535        ], [have_lzo=no])
    537536
     
    540539                LIBTRACE_LIBS="$LIBTRACE_LIBS -llzo2"
    541540        fi
    542         HAVE_LIBLZO2=1
     541        AC_DEFINE(HAVE_LIBLZO2, 1, "Compiled with lzo2 support")
    543542        with_lzo=yes],
    544543
     
    546545        [AS_IF([test "x$with_lzo" = "xyes"],
    547546                [AC_MSG_ERROR([lzo requested but not found])])
    548         HAVE_LIBLZO2=0
     547        AC_DEFINE(HAVE_LIBLZO2, 0, "Compiled with lzo2 support")
    549548        with_lzo=no]
    550549)
     
    559558AM_CONDITIONAL([HAVE_LIBGDC], [test "$ac_cv_header_gdc_h" = yes])
    560559AM_CONDITIONAL([HAVE_LLVM], [test "x$JIT" != "xno" ])
    561 AM_CONDITIONAL([HAVE_NCURSES], [test "$HAVE_NCURSES" != 0])
    562 AM_CONDITIONAL([HAVE_BZLIB], [test "$HAVE_LIBBZ2" != 0])
    563 AM_CONDITIONAL([HAVE_ZLIB], [test "$HAVE_LIBZ" != 0])
    564 AM_CONDITIONAL([HAVE_LZO], [ test "$HAVE_LIBLZO2" != 0])
     560AM_CONDITIONAL([HAVE_NCURSES], [test "x$with_ncurses" != "xno"])
     561AM_CONDITIONAL([HAVE_BZLIB], [test "x$with_bzip2" != "xno"])
     562AM_CONDITIONAL([HAVE_ZLIB], [test "x$with_zlib" != "xno"])
     563AM_CONDITIONAL([HAVE_LZO], [ test "x$with_lzo" != "xno"])
    565564
    566565# Check for miscellaneous programs
Note: See TracChangeset for help on using the changeset viewer.