aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-05-13 07:33:01 +0200
committerChristian Grothoff <christian@grothoff.org>2019-05-13 07:33:01 +0200
commit139ce8035d387b7775ff75c21b97d4c3d6ec2f82 (patch)
tree5652d48977afcd83590a3397b3199d3dd4bdfdef
parent44ed20e1ac3c3431d8d39fc5e29f35b6bceba10a (diff)
downloadlibextractor-139ce8035d387b7775ff75c21b97d4c3d6ec2f82.tar.gz
libextractor-139ce8035d387b7775ff75c21b97d4c3d6ec2f82.zip
use AS_CASE/AS_IF
-rw-r--r--configure.ac29
1 files changed, 13 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac
index 5a6ef25..e21e0a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -259,15 +259,13 @@ AC_MSG_CHECKING(for libltdl)
259AC_ARG_WITH(ltdl, 259AC_ARG_WITH(ltdl,
260 [ --with-ltdl=PFX base of libltdl installation], 260 [ --with-ltdl=PFX base of libltdl installation],
261 [AC_MSG_RESULT([$with_ltdl]) 261 [AC_MSG_RESULT([$with_ltdl])
262 case $with_ltdl in 262 AS_CASE([$with_ltdl],
263 no) 263 [no],[],
264 ;; 264 [yes],[
265 yes)
266 AC_CHECK_HEADERS(ltdl.h, 265 AC_CHECK_HEADERS(ltdl.h,
267 AC_CHECK_LIB([ltdl], [lt_dlopenext], 266 AC_CHECK_LIB([ltdl], [lt_dlopenext],
268 ltdl=1)) 267 ltdl=1))
269 ;; 268 ],[
270 *)
271 OLD_LIBS="$LIBS" 269 OLD_LIBS="$LIBS"
272 LIBS="-L$with_ltdl/lib $LIBS" 270 LIBS="-L$with_ltdl/lib $LIBS"
273 AM_CPPFLAGS="-I$with_ltdl/include $AM_CPPFLAGS" 271 AM_CPPFLAGS="-I$with_ltdl/include $AM_CPPFLAGS"
@@ -276,8 +274,7 @@ AC_ARG_WITH(ltdl,
276 EXT_LIB_PATH="-L$with_ltdl/lib $EXT_LIB_PATH" 274 EXT_LIB_PATH="-L$with_ltdl/lib $EXT_LIB_PATH"
277 ltdl=1)) 275 ltdl=1))
278 LIBS="$OLD_LIBS" 276 LIBS="$OLD_LIBS"
279 ;; 277 ])
280 esac
281 ], 278 ],
282 [AC_MSG_RESULT([--with-ltdl not specified]) 279 [AC_MSG_RESULT([--with-ltdl not specified])
283 AC_CHECK_HEADERS(ltdl.h, 280 AC_CHECK_HEADERS(ltdl.h,
@@ -655,14 +652,14 @@ new_ffmpeg=0
655AC_ARG_ENABLE(ffmpeg, 652AC_ARG_ENABLE(ffmpeg,
656 [AC_HELP_STRING([--enable-ffmpeg],[Enable FFmpeg support]) 653 [AC_HELP_STRING([--enable-ffmpeg],[Enable FFmpeg support])
657 AC_HELP_STRING([--disable-ffmpeg],[Disable FFmpeg support])], 654 AC_HELP_STRING([--disable-ffmpeg],[Disable FFmpeg support])],
658 [case "$enableval" in 655 [AS_CASE(["$enableval"],
659 no) AC_MSG_RESULT(no) 656 [no],[
660 ffmpeg_enabled=0 657 AC_MSG_RESULT(no)
661 ;; 658 ffmpeg_enabled=0
662 *) AC_MSG_RESULT(yes) 659 ],[
663 ffmpeg_enabled=1 660 AC_MSG_RESULT(yes)
664 ;; 661 ffmpeg_enabled=1
665 esac], 662 ])],
666 [ AC_MSG_RESULT(yes) 663 [ AC_MSG_RESULT(yes)
667 ffmpeg_enabled=1]) 664 ffmpeg_enabled=1])
668AS_IF([test x$ffmpeg_enabled = x1], 665AS_IF([test x$ffmpeg_enabled = x1],