diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-05-13 07:36:03 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-05-13 07:36:03 +0200 |
commit | 22d43f8c17654a84d70491d494d91d5829479f96 (patch) | |
tree | e7b34a2518cf47cc8fda3857bbf2b35e9cffdf1f | |
parent | 139ce8035d387b7775ff75c21b97d4c3d6ec2f82 (diff) | |
download | libextractor-22d43f8c17654a84d70491d494d91d5829479f96.tar.gz libextractor-22d43f8c17654a84d70491d494d91d5829479f96.zip |
use AS_CASE/AS_IF
-rw-r--r-- | configure.ac | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index e21e0a3..d0e4f44 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -683,14 +683,12 @@ LE_INTLINCL="" | |||
683 | LE_LIBINTL="$LTLIBINTL" | 683 | LE_LIBINTL="$LTLIBINTL" |
684 | AC_ARG_ENABLE(framework, [ --enable-framework enable Mac OS X framework build helpers],enable_framework_build=$enableval) | 684 | AC_ARG_ENABLE(framework, [ --enable-framework enable Mac OS X framework build helpers],enable_framework_build=$enableval) |
685 | AM_CONDITIONAL(WANT_FRAMEWORK, test x$enable_framework_build = xyes) | 685 | AM_CONDITIONAL(WANT_FRAMEWORK, test x$enable_framework_build = xyes) |
686 | if test x$enable_framework_build = xyes | 686 | AS_IF([test x$enable_framework_build = xyes], |
687 | then | 687 | [AC_DEFINE([FRAMEWORK_BUILD], 1, [Build a Mac OS X Framework]) |
688 | AC_DEFINE([FRAMEWORK_BUILD], 1, [Build a Mac OS X Framework]) | ||
689 | LE_INTLINCL='-I$(top_srcdir)/src/intlemu' | 688 | LE_INTLINCL='-I$(top_srcdir)/src/intlemu' |
690 | LE_LIBINTL='$(top_builddir)/src/intlemu/libintlemu.la -framework CoreFoundation' | 689 | LE_LIBINTL='$(top_builddir)/src/intlemu/libintlemu.la -framework CoreFoundation' |
691 | AC_LIB_APPENDTOVAR([AM_CPPFLAGS], [$LE_INTLINCL]) | 690 | AC_LIB_APPENDTOVAR([AM_CPPFLAGS], [$LE_INTLINCL]) |
692 | fi | 691 | ]) |
693 | |||
694 | 692 | ||
695 | LE_LIB_LDFLAGS="-export-dynamic -no-undefined" | 693 | LE_LIB_LDFLAGS="-export-dynamic -no-undefined" |
696 | LE_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined" | 694 | LE_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined" |
@@ -699,17 +697,14 @@ LE_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined" | |||
699 | # TODO insert a proper check here | 697 | # TODO insert a proper check here |
700 | AC_CACHE_CHECK([whether -export-symbols-regex works], | 698 | AC_CACHE_CHECK([whether -export-symbols-regex works], |
701 | gn_cv_export_symbols_regex_works, | 699 | gn_cv_export_symbols_regex_works, |
702 | [ | 700 | [AS_CASE(["$host_os"], |
703 | case "$host_os" in | 701 | [mingw*],[gn_cv_export_symbols_regex_works=no], |
704 | mingw*) gn_cv_export_symbols_regex_works=no;; | 702 | [gn_cv_export_symbols_regex_works=yes]) |
705 | *) gn_cv_export_symbols_regex_works=yes;; | ||
706 | esac | ||
707 | ]) | 703 | ]) |
708 | if test "x$gn_cv_export_symbols_regex_works" = "xyes" | 704 | AS_IF([test "x$gn_cv_export_symbols_regex_works" = "xyes"], |
709 | then | 705 | [LE_LIB_LDFLAGS="$LE_LIB_LDFLAGS -export-symbols-regex \"(EXTRACTOR|pl)_@<:@a-zA-Z0-9_@:>@*\"" |
710 | LE_LIB_LDFLAGS="$LE_LIB_LDFLAGS -export-symbols-regex \"(EXTRACTOR|pl)_@<:@a-zA-Z0-9_@:>@*\"" | ||
711 | LE_PLUGIN_LDFLAGS="$LE_PLUGIN_LDFLAGS -export-symbols-regex \"(EXTRACTOR|pl)_@<:@a-zA-Z0-9_@:>@*_.......\"" | 706 | LE_PLUGIN_LDFLAGS="$LE_PLUGIN_LDFLAGS -export-symbols-regex \"(EXTRACTOR|pl)_@<:@a-zA-Z0-9_@:>@*_.......\"" |
712 | fi | 707 | ]) |
713 | 708 | ||
714 | # restore LIBS | 709 | # restore LIBS |
715 | LIBS=$LIBSOLD | 710 | LIBS=$LIBSOLD |
@@ -758,15 +753,11 @@ AX_CREATE_PKGCONFIG_INFO([libextractor.pc],,[-lextractor],[Metadata extraction l | |||
758 | 753 | ||
759 | AC_OUTPUT | 754 | AC_OUTPUT |
760 | 755 | ||
761 | if test "x$HAVE_ZLIB_TRUE" = "x#" | 756 | AS_IF([test "x$HAVE_ZLIB_TRUE" = "x#"], |
762 | then | 757 | [AC_MSG_NOTICE([NOTICE: zlib not found, zlib support disabled])]) |
763 | AC_MSG_NOTICE([NOTICE: zlib not found, zlib support disabled]) | ||
764 | fi | ||
765 | 758 | ||
766 | if test "x$HAVE_BZ2_TRUE" = "x#" | 759 | AS_IF([test "x$HAVE_BZ2_TRUE" = "x#"], |
767 | then | 760 | [AC_MSG_NOTICE([NOTICE: libbz2 not found, bz2 support disabled])]) |
768 | AC_MSG_NOTICE([NOTICE: libbz2 not found, bz2 support disabled]) | ||
769 | fi | ||
770 | 761 | ||
771 | if test "x$HAVE_EXIV2_TRUE" = "x#" | 762 | if test "x$HAVE_EXIV2_TRUE" = "x#" |
772 | then | 763 | then |