Changeset 49:6581f7eccd26

Timestamp:

04/17/09 10:12:18 (3 years ago)

Author:

thib

Branch:

default

convert_revision:

svn:d0a2da98-017c-47d2-8c43-22b54484806d/trunk@50

Message:

* Correct --disable-x11
* Better use of --enable and --with. --enable is for optional features whereas --with is for the use of optional libraries

Files:

• README (modified) (1 diff)
• configure.ac (modified) (3 diffs)

README

@@ -21 +21 @@
 
 Other dependences:
-    * libvorbis or libtremor/libvorbisidec (to use it, specify --enable-tremor when calling ./configure).
+    * libvorbis or libtremor/libvorbisidec (to use it, specify --with-tremor when calling ./configure).
       If you don't need vorbis playback, you can add --disable-vorbis to the ./configure args.
+    * X11 is used by default, but you can build OtakuNoRaifu without it.
+      Just add --without-x11 to the ./configure arguments.
 
 

configure.ac

@@ -79 +79 @@
 AC_CHECK_LIB(jpeg, jpeg_start_decompress)
 dnl ogg vobis
-AC_ARG_WITH(vorbis,
+AC_ARG_ENABLE(vorbis,
         AS_HELP_STRING([--disable-vorbis], [Build with vorbis and ogg (default yes)]))
-if test X$with_vorbis != X"no"; then
-    AC_ARG_ENABLE(tremor, AS_HELP_STRING([--enable-tremor],
-        [enable tremor (integer-only implementation of vorbisfile) (default no)]))
+if test X$enable_vorbis != X"no"; then
+    AC_ARG_WITH(tremor, AS_HELP_STRING([--with-tremor],
+        [use the tremor (integer-only implementation of vorbisfile) library (default no)]))
     AC_CHECK_LIB(ogg, ogg_stream_init)
     AC_CHECK_LIB(vorbis,  vorbis_book_decode,,,-logg)
-    if test X$enable_tremor = X"yes"; then
+    if test X$with_tremor = X"yes"; then
         AC_CHECK_LIB(vorbisidec,  ov_read,,
                                  AC_MSG_ERROR(vorbisidec (tremor) not found),-logg -lvorbis)
@@ -116 +116 @@
         USE_SMPEG=1
 fi
-AC_ARG_ENABLE(mad,
-        [ --disable-mad         disable mad (integer-only implementation for mpeg decoding) [ default yes]])
-if test X$enable_mad != X"no"; then
+AC_ARG_WITH(mad,
+        [ --without-mad         use mad (integer-only implementation for mpeg decoding) [ default yes]])
+if test X$without_mad != X"no"; then
         AC_CHECK_LIB(mad, mad_decoder_run)
 fi
@@ -155 +155 @@
 fi
 
-AC_ARG_ENABLE(x11,
-    AS_HELP_STRING([--disable-x11], [Use the X11 library (default yes)]))
-if test X$x11 = X"no"; then
+AC_ARG_WITH(x11,
+    AS_HELP_STRING([--without-x11], [Use the X11 library (default yes)]))
+if test X$with_x11 = X"no"; then
         USE_X11=0
 else