Changeset 1705:70de81e67cd2 in roaraudio

Timestamp:

05/14/09 14:15:11 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

write $subdir_plugins_* to Makefile.conf if configure script did not fail

File:

• configure (modified) (5 diffs)

configure

@@ -689 +689 @@
 #                #define                 subdir       name          -lxxx      -- header
 test_lib_defmake ROAR_HAVE_ESD           libroaresd   EsounD        esd        -- esd.h
-test_lib_defmake ROAR_HAVE_LIBAO         plugins/ao   libao         ao         -- ao/ao.h ao/plugin.h
+test_lib_defmake ROAR_HAVE_LIBAO         %            libao         ao         -- ao/ao.h ao/plugin.h
 test_lib_defmake ROAR_HAVE_LIBOGG        %            libogg        ogg        -- ogg/ogg.h
 test_lib_defmake ROAR_HAVE_LIBVORBIS     %            libvorbis     vorbis     -- vorbis/codec.h
@@ -1369 +1369 @@
 echo '//ll' >&5
 
+echo >&4
+echo >&4
+
 cd plugins
 
@@ -1377 +1380 @@
  if [ "$AO_INST_DIR" = '' ]
  then
-  ./configure --force-have-roar
+  ./configure --force-have-roar                           && \
+    echo "subdir_plugins_ao=plugins/ao" >&4
  else
-  ./configure --force-have-roar --inst-dir "$AO_INST_DIR"
+  ./configure --force-have-roar --inst-dir "$AO_INST_DIR" && \
+    echo "subdir_plugins_ao=plugins/ao" >&4
  fi
  cd ..
@@ -1390 +1395 @@
  echo 'running xmms plugin configure...'
  cd xmms/
-  ./configure --force-have-roar --pkg-config "$PKG_CONFIG" --inst-dir "$XMMS_INST_DIR"
+  ./configure --force-have-roar --pkg-config "$PKG_CONFIG" --inst-dir "$XMMS_INST_DIR" && \
+    echo "subdir_plugins_xmms=plugins/xmms" >&4
  cd ..
 else
@@ -1400 +1406 @@
  echo 'running Audacious plugin configure...'
  cd audacious/
-  ./configure --force-have-roar --pkg-config "$PKG_CONFIG" --inst-dir "$AUDACIOUS_INST_DIR"
+  ./configure --force-have-roar --pkg-config "$PKG_CONFIG" --inst-dir "$AUDACIOUS_INST_DIR" && \
+    echo "subdir_plugins_audacious=plugins/audacious" >&4
  cd ..
 else