Changeset d180753a2ce6fe7d51425b48619bfa44014c2ac6

Show
Ignore:
Timestamp:
02/10/04 15:04:55 (5 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1076421895 +0000
git-parent:

[c08f94af806ba9a7bc4b69a04959846bb6d8239e]

git-author:
Sam Hocevar <sam@videolan.org> 1076421895 +0000
Message:
  • configure.ac:
    + Allow to use --enable-livedotcom without --with-livedotcom-tree so that

we can use an installed version of libliveMedia et al.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • configure.ac

    rc08f94a rd180753  
    11dnl Autoconf settings for vlc 
    2 dnl $Id: configure.ac,v 1.176 2004/02/10 13:29:04 sam Exp $ 
     2dnl $Id: configure.ac,v 1.177 2004/02/10 14:04:55 sam Exp $ 
    33 
    44AC_INIT(vlc,0.7.1-test1) 
    …… 
    11121112AC_ARG_ENABLE(livedotcom, 
    11131113[  --enable-livedotcom     live.com input plugin (default disabled)]) 
    1114 if test "${enable_livedotcom}" = "yes" 
    1115 then 
     1114if test "${enable_livedotcom}" = "yes"; then 
    11161115  AC_ARG_WITH(livedotcom-tree, 
    1117     [    --with-livedotcom-tree=PATH live.com tree for static linking (required)]) 
     1116    [    --with-livedotcom-tree=PATH live.com tree for static linking]) 
    11181117 
    11191118  dnl 
    11201119  dnl test for --with-livedotcom-tree 
    11211120  dnl 
    1122   if test "${with_livedotcom_tree}" != "no" -a -n "${with_livedotcom_tree}"; then 
     1121  if test -z "${with_livedotcom_tree}"; then 
     1122    AC_LANG_PUSH(C++) 
     1123    CPPFLAGS_save="${CPPFLAGS}" 
     1124    CPPFLAGS_livedotcom="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment" 
     1125    CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_livedotcom}" 
     1126    AC_CHECK_HEADERS(liveMedia.hh, [ 
     1127      AX_ADD_CXXFLAGS([livedotcom], [${CPPFLAGS_livedotcom}]) 
     1128      AC_CHECK_LIB(liveMedia_pic, main, [ 
     1129        # We have -lliveMedia_pic, build plugins 
     1130        AX_ADD_PLUGINS([livedotcom]) 
     1131        AX_ADD_LDFLAGS([livedotcom], [-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic]) 
     1132      ], [ 
     1133        AC_CHECK_LIB(liveMedia, main, [ 
     1134          # We only have -lliveMedia, do builtins 
     1135          AX_ADD_BUILTINS([livedotcom]) 
     1136          AX_ADD_LDFLAGS([livedotcom], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment]) 
     1137        ]) 
     1138      ]) 
     1139      if test "${SYS}" = "mingw32"; then 
     1140        # add ws2_32 for closesocket, select, recv 
     1141        AX_ADD_LDFLAGS([livedotcom],[-lws2_32]) 
     1142      fi 
     1143    ]) 
     1144    CPPFLAGS="${CPPFLAGS_save}" 
     1145    AC_LANG_POP(C++) 
     1146  else 
    11231147    AC_MSG_CHECKING(for liveMedia/libliveMedia.a in ${with_livedotcom_tree}) 
    11241148    real_livedotcom_tree="`cd ${with_livedotcom_tree} 2>/dev/null && pwd`" 
    …… 
    11521176      AC_MSG_ERROR([cannot find ${real_livedotcom_tree}/liveMedia/libliveMedia.a, make sure you compiled live.com in ${with_livedotcom_tree}]) 
    11531177    fi 
    1154   else 
    1155     dnl  The --with-livedotcom-tree isn't specified wasn't built 
    1156     AC_MSG_RESULT(no) 
    1157     AC_MSG_ERROR([You have to specify a tree with --with-livedotcom-tree]) 
    11581178  fi 
    11591179fi