diff options
Diffstat (limited to 'lib/libdvd/libdvdnav/configure.ac')
| -rw-r--r-- | lib/libdvd/libdvdnav/configure.ac | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/lib/libdvd/libdvdnav/configure.ac b/lib/libdvd/libdvdnav/configure.ac index e76fa25b8f..20acae17e8 100644 --- a/lib/libdvd/libdvdnav/configure.ac +++ b/lib/libdvd/libdvdnav/configure.ac @@ -13,8 +13,8 @@ dnl dnl These are defined in m4 so they can be passed to AC_INIT dnl -------------------------------------------------------------- m4_define([dvdnav_major], [4]) -m4_define([dvdnav_minor], [1]) -m4_define([dvdnav_sub], [3]) +m4_define([dvdnav_minor], [2]) +m4_define([dvdnav_sub], [0]) m4_define([dvdnav_pre], []) AC_INIT([libdvdnav], [dvdnav_major.dvdnav_minor.dvdnav_sub[]dvdnav_pre]) @@ -165,6 +165,9 @@ case $host in *cygwin*) LDFLAGS="-no-undefined $LDFLAGS" ;; + *os2*) + LDFLAGS="-no-undefined -Zbin-files $LDFLAGS" + ;; *) AC_CHECK_LIB(c, dlopen, DYNAMIC_LD_LIBS="", @@ -204,26 +207,6 @@ DEBUG_CFLAGS="-g -DDEBUG $CFLAGS" AC_SUBST(DEBUG_CFLAGS) dnl --------------------------------------------- -dnl Get where .m4 should be installed. -dnl --------------------------------------------- -case "`id`" in - uid=0\(* ) - AC_MSG_CHECKING(for aclocal directory) - if (aclocal --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL_DIR="`eval $ACLOCAL --print-ac-dir`" - AC_MSG_RESULT($ACLOCAL_DIR) - else - ACLOCAL_DIR="/usr/local/share/aclocal" - AC_MSG_RESULT(none - will be installed in $ACLOCAL_DIR) - fi - escapedprefix="`echo $prefix | sed -e 's/\\//\\\\\//g'`" - ACLOCAL_DIR="`echo $ACLOCAL_DIR|sed -e 's/^'$escapedprefix/'\${prefix}'/`" - AC_SUBST(ACLOCAL_DIR) - ;; -esac -AM_CONDITIONAL(INSTALL_M4, test x"$ACLOCAL_DIR" != "x") - -dnl --------------------------------------------- dnl Check for doxygen (dynamic documentation generator) dnl --------------------------------------------- AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, no) |