pic libraries are now correctly installed when needed:

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 465099a70ee620543108329110ea658ce138747f..2d29dbb8e0d008aab52f83f8ff19f244461432b7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -264,7 +264,9 @@ case "${target_os}" in
     VLC_ADD_CXXFLAGS([beos],[])
     VLC_ADD_LDFLAGS([vlc logger],[-lbe])
     VLC_ADD_LDFLAGS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame])
-
+    VLC_ADD_LDFLAGS([dvdnav dvdread],[-ldl])
+    VLC_ADD_LDFLAGS([access_file],[-lpoll])
+    LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${CFLAGS_save}"
     dnl Check for BONE
     if test -f /boot/beos/system/lib/libbind.so; then
         VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc growl],[-lbind -lsocket])
@@ -718,9 +720,9 @@ VLC_ADD_LDFLAGS([vlc plugin],[${THREAD_LIB}])
 
 dnl Don't link with rt when using GNU-pth
 if test "${THREAD_LIB}" != "-lpth" && test "${THREAD_LIB}" != "-lst"; then
-  AC_CHECK_LIB(rt, clock_gettime, [
+  AC_CHECK_LIB(rt, clock_nanosleep, [
     VLC_ADD_LDFLAGS([vlc],[-lrt])
-    AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define to 1 if you have clock_gettime.])
+    AC_DEFINE(HAVE_CLOCK_NANOSLEEP, 1, [Define to 1 if you have clock_nanosleep.])
   ], [
     dnl HP/UX port
     AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LDFLAGS([vlc],[-lrt])])
@@ -839,7 +841,7 @@ fi
 
 dnl Check for dbus
 AC_ARG_ENABLE(dbus,
-  [  --enable-dbus            Linux D-BUS message bus system (default enabled)])
+  [  --enable-dbus           Linux D-BUS message bus system (default enabled)])
  
 if test "${enable_dbus}" != "no"
 then
@@ -1507,6 +1509,26 @@ AS_IF([test "${enable_growl}" != "no"], [
   ]
 )
 
+dnl
+dnl Libnotify notification plugin
+dnl
+
+AC_ARG_ENABLE(notify,
+  [  --enable-notify         libnotify notification plugin (default enabled)])
+AS_IF([test "${enable_notify}" != "no"], [
+    PKG_CHECK_MODULES(NOTIFY, libnotify,
+      [
+        VLC_ADD_PLUGINS([notify])
+        VLC_ADD_CFLAGS(notify, [$NOTIFY_CFLAGS])
+       VLC_ADD_LDFLAGS(notify, [$NOTIFY_LIBS])
+      ],[
+       AS_IF([test "${enable_notify}" = "yes"],[
+              AC_MSG_WARN( libnotify not found) ])
+      ])
+  ])
+
+
+
 
 dnl
 dnl  Input plugins
@@ -1526,7 +1548,7 @@ then
   enable_live555="yes"
 fi
 AC_ARG_ENABLE(live555,
-[  --enable-live555     live555 RTSP input plugin (default disabled)])
+[  --enable-live555        live555 RTSP input plugin (default disabled)])
 if test "${enable_live555}" = "yes"; then
   AC_ARG_WITH(live555-tree,
     [    --with-live555-tree=PATH live.com tree for static linking])
@@ -2720,7 +2742,7 @@ dnl Trying with pkg-config
         if test "${enable_sout}" != "no"; then
             VLC_ADD_BUILTINS([stream_out_switcher])
         fi],
-         [ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (cvs version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ], [$LDAVUTIL])
+         [ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (svn version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ], [$LDAVUTIL])
 
       
       AC_CHECK_LIB(avformat, av_open_input_stream, [
@@ -3570,12 +3592,12 @@ AC_ARG_ENABLE(opengl,
 if test "${enable_opengl}" != "no" &&
    test "${SYS}" != "beos" -a "${SYS}" != "mingwce"; then
   if test "${SYS}" != "darwin"; then
-    AC_CHECK_HEADERS(GL/gl.h, [
+    AC_CHECK_HEADERS(GL/gl.h GL/glu.h, [
       VLC_ADD_PLUGINS([opengl])
       if test "${SYS}" != "mingw32"; then
         VLC_ADD_LDFLAGS([opengl],[${X_LIBS} -lGL -lGLU])
       else
-        VLC_ADD_LDFLAGS([opengl],[-lopengl32])
+        VLC_ADD_LDFLAGS([opengl],[-lopengl32 -lglu32])
       fi
     ])
   else
@@ -4601,6 +4623,24 @@ then
   fi
 fi
 
+dnl
+dnl QT 4
+dnl
+enableqt4=false
+AC_ARG_ENABLE(qt4,
+  [  --enable-qt4            QT 4 support (default disabled) ],
+  [if test "${enable_qt4}" = "yes"; then
+      PKG_CHECK_MODULES(QT4, QtCore QtGui,
+       [ VLC_ADD_PLUGINS([qt4])
+          enableqt4=true
+         VLC_ADD_LDFLAGS([qt4],[$QT4_LIBS])
+         VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS])
+         MOC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/moc
+         UIC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/uic],
+       [AC_MSG_WARN(QT4 library not found)])
+   fi])
+AM_CONDITIONAL(ENABLE_QT4, test "$enableqt4" = "true")
+
 dnl
 dnl  WinCE GUI module
 dnl
@@ -4732,11 +4772,11 @@ AC_ARG_ENABLE(macosx,
   [if test "${enable_macosx}" = "yes"
    then
      VLC_ADD_BUILTINS([macosx])
-     VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL])
+     VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL])
    fi],
   [AC_CHECK_HEADERS(Cocoa/Cocoa.h,
      VLC_ADD_BUILTINS([macosx])
-     VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL])
+     VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL])
    )])
 CFLAGS=$ORIGCFLAGS
 
@@ -5182,7 +5222,7 @@ then
     CPPFLAGS="${CPPFLAGS_save}"
   fi
   
-  if test "${mozilla}" != "false"
+  if test "${enable_mozilla}" != "false"
   then
     build_pic=yes
     AC_PATH_PROG(XPIDL, xpidl, no, ${xpidl_path}:/usr/lib/mozilla:/usr/lib64/mozilla:/usr/lib/xulrunner:/usr/lib64/xulrunner)
@@ -5216,6 +5256,17 @@ then
   build_pic=yes
 fi
 
+dnl
+dnl  Enable pic libraries
+dnl
+AC_ARG_ENABLE(pic,
+  [  --enable-pic            Enable pic libraries (default disabled)])
+AM_CONDITIONAL(BUILD_PIC, [test "${enable_pic}" = "yes"])
+if test "${enable_pic}" = "yes"
+then
+  build_pic=yes
+fi
+
 
 dnl
 dnl  test plugins
@@ -5383,8 +5434,8 @@ dnl VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`"
 dnl AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions])
 dnl AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
 
-dnl New definitions with value matching 0.8.5 release
-module_symbol="0_8_5"
+dnl New definitions with value matching 0.8.6 release
+module_symbol="0_8_6"
 AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${module_symbol}", [String suffix for module functions])
 AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $module_symbol, [Symbol suffix for module functions])
 VLC_ENTRY="vlc_entry__${module_symbol}"
@@ -5416,6 +5467,7 @@ AC_SUBST(ARCH)
 AC_SUBST(ALIASES)
 AC_SUBST(ASM)
 AC_SUBST(MOC)
+AC_SUBST(UIC)
 AC_SUBST(WINDRES)
 AC_SUBST(MOZILLA_SDK_PATH)
 AC_SUBST(XPIDL)
@@ -5492,6 +5544,7 @@ AC_CONFIG_FILES([
   modules/gui/pda/Makefile
   modules/gui/macosx/Makefile
   modules/gui/qnx/Makefile
+  modules/gui/qt4/Makefile
   modules/gui/skins2/Makefile
   modules/gui/wxwidgets/Makefile
   modules/gui/wince/Makefile