Changeset a27027bb051019a579c5f0e5df0accfce1528412

Timestamp:

10/26/03 13:49:24 (5 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1067172564 +0000

git-parent:

[9ec1b8a0275afa50e0f161b38932d2425970451b]

git-author:

Gildas Bazin <gbazin@videolan.org> 1067172564 +0000

Message:

* configure.ac: added a --disable-fribidi option and make sure the freetype module is linked with libiconv.

Files:

• configure.ac (modified) (4 diffs)

configure.ac

@@ -1 +1 @@
-dnl Autoconf settings for vlc
-5 2003/10/26 12:46:55 sigmunau
+6 2003/10/26 12:49:24 gbazin
-
-AC_INIT(vlc,0.6.3-cvs)
@@ -2276 +2276 @@
-AC_ARG_ENABLE(freetype,
-  [  --enable-freetype       freetype support (default enabled)])
+AC_ARG_ENABLE(fribidi,
+  [  --enable-fribidi        fribidi support (default enabled)])
-if test "${enable_freetype}" != "no"
-then
@@ -2286 +2288 @@
-      fi ])
-  AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no, ${FREETYPE_PATH})
-  FRIBIDI_PATH="${PATH}"
-  AC_ARG_WITH(fribidi-config-path,
-    [    --with-fribidi-config-path=PATH fribidi-config path (default search in \$PATH)],
-    [ if test "${with_fribidi_config_path}" != "no"
-      then
-        FRIBIDI_PATH="${with_fribidi_config_path}:${PATH}"
-      fi ])
-  AC_PATH_PROG(FRIBIDI_CONFIG, fribidi-config, no, ${FRIBIDI_PATH})
-
-
-  if test "${FREETYPE_CONFIG}" != "no"
-  then
-    AX_ADD_PLUGINS([freetype])
-
-
+ ${INCICONV}
+ ${LIBICONV}
-    AC_CHECK_HEADERS(Carbon/Carbon.h,
-      [AX_ADD_LDFLAGS([freetype],[-framework Carbon])])
@@ -2310 +2303 @@
-    ])
-  fi
-
+
+
+
-  then
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  fi
-fi