"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "configure.ac" between
libextractor-1.8.tar.gz and libextractor-1.9.tar.gz

About: GNU libextractor is a library used to extract meta-data from files of arbitrary type.

configure.ac  (libextractor-1.8):configure.ac  (libextractor-1.9)
skipping to change at line 19 skipping to change at line 19
# #
# GNU libextractor is distributed in the hope that it will be useful, but WITHO UT ANY # GNU libextractor is distributed in the hope that it will be useful, but WITHO UT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details. # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License along with # You should have received a copy of the GNU General Public License along with
# GNU libextractor; see the file COPYING. If not, If not, see <http://www.gnu. org/license> # GNU libextractor; see the file COPYING. If not, If not, see <http://www.gnu. org/license>
# #
# #
AC_PREREQ(2.61) AC_PREREQ(2.61)
AC_INIT([libextractor], [1.8], [bug-libextractor@gnu.org]) AC_INIT([libextractor], [1.9], [bug-libextractor@gnu.org])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AH_TOP([#define _GNU_SOURCE 1]) AH_TOP([#define _GNU_SOURCE 1])
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
LIB_VERSION_CURRENT=4 LIB_VERSION_CURRENT=4
LIB_VERSION_REVISION=6 LIB_VERSION_REVISION=7
LIB_VERSION_AGE=1 LIB_VERSION_AGE=1
AC_SUBST(LIB_VERSION_CURRENT) AC_SUBST(LIB_VERSION_CURRENT)
AC_SUBST(LIB_VERSION_REVISION) AC_SUBST(LIB_VERSION_REVISION)
AC_SUBST(LIB_VERSION_AGE) AC_SUBST(LIB_VERSION_AGE)
AM_INIT_AUTOMAKE([silent-rules]) AM_INIT_AUTOMAKE([silent-rules])
# Checks for programs. # Checks for programs.
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS
AC_PROG_AWK AC_PROG_AWK
skipping to change at line 158 skipping to change at line 158
esac esac
], ],
[AC_MSG_RESULT([--with-plibc not specified]) [AC_MSG_RESULT([--with-plibc not specified])
AM_LDFLAGS="-L/usr/lib $AM_LDFLAGS" AM_LDFLAGS="-L/usr/lib $AM_LDFLAGS"
AM_CPPFLAGS="-I/usr/include $AM_CPPFLAGS" AM_CPPFLAGS="-I/usr/include $AM_CPPFLAGS"
AC_CHECK_HEADERS([plibc.h], AC_CHECK_HEADERS([plibc.h],
AC_CHECK_LIB([plibc], [plibc_init], AC_CHECK_LIB([plibc], [plibc_init],
EXT_LIB_PATH="-L$with_plibc/lib $EXT_LIB_PATH" EXT_LIB_PATH="-L$with_plibc/lib $EXT_LIB_PATH"
plibc=1))]) plibc=1))])
if test $plibc -ne 1; AS_IF([test $plibc -ne 1],
then [AC_MSG_ERROR([libextractor requires PlibC])],
AC_MSG_ERROR([libextractor requires PlibC]) [LIBS="$LIBS -lplibc"])
else
LIBS="$LIBS -lplibc"
fi
AM_LDFLAGS="$AM_LDFLAGS -Wl,--export-all-symbols" AM_LDFLAGS="$AM_LDFLAGS -Wl,--export-all-symbols"
AM_CONDITIONAL(HAVE_GNU_LD, true) AM_CONDITIONAL(HAVE_GNU_LD, true)
AM_CONDITIONAL(SOMEBSD, false) AM_CONDITIONAL(SOMEBSD, false)
AM_CONDITIONAL(WINDOWS, true) AM_CONDITIONAL(WINDOWS, true)
LIBEXT=.dll LIBEXT=.dll
;; ;;
*) *)
AC_MSG_RESULT(Unrecognised OS $host_os) AC_MSG_RESULT(Unrecognised OS $host_os)
AC_DEFINE_UNQUOTED(OTHEROS,1,[Some strange OS]) AC_DEFINE_UNQUOTED(OTHEROS,1,[Some strange OS])
skipping to change at line 213 skipping to change at line 210
AC_SUBST(RPLUGINDIR, $rplugindir) AC_SUBST(RPLUGINDIR, $rplugindir)
# large file support # large file support
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
AC_FUNC_FSEEKO AC_FUNC_FSEEKO
AM_CONDITIONAL(CYGWIN, test "$build_os" = "cygwin") AM_CONDITIONAL(CYGWIN, test "$build_os" = "cygwin")
AM_CONDITIONAL(MINGW, test "$build_os" = "mingw32") AM_CONDITIONAL(MINGW, test "$build_os" = "mingw32")
# use '-fno-strict-aliasing', but only if the compiler can take it # use '-fno-strict-aliasing', but only if the compiler can take it
if gcc -fno-strict-aliasing -S -o /dev/null -xc /dev/null >/dev/null 2>&1; AS_IF([gcc -fno-strict-aliasing -S -o /dev/null -xc /dev/null >/dev/null 2>&1],
then [AM_CFLAGS="-fno-strict-aliasing $AM_CFLAGS"])
AM_CFLAGS="-fno-strict-aliasing $AM_CFLAGS"
fi
AM_CONDITIONAL(HAVE_CXX, test "x$HAVE_CXX" = "xyes") AM_CONDITIONAL(HAVE_CXX, test "x$HAVE_CXX" = "xyes")
# Adam shostack suggests the following for Windows: # Adam shostack suggests the following for Windows:
# -D_FORTIFY_SOURCE=2 -fstack-protector-all # -D_FORTIFY_SOURCE=2 -fstack-protector-all
AC_ARG_ENABLE(gcc-hardening, AC_ARG_ENABLE(gcc-hardening,
AS_HELP_STRING(--enable-gcc-hardening, enable compiler security checks), [AS_HELP_STRING(--enable-gcc-hardening, enable compiler security checks)],
[if test x$enableval = xyes; then [AS_IF([test x$enableval = xyes],
AM_CFLAGS="$AM_CFLAGS -D_FORTIFY_SOURCE=2 -fstack-protector-all" [AM_CFLAGS="$AM_CFLAGS -D_FORTIFY_SOURCE=2 -fstack-protector-all"
AM_CFLAGS="$AM_CFLAGS -fwrapv -fPIE -Wstack-protector" AM_CFLAGS="$AM_CFLAGS -fwrapv -fPIE -Wstack-protector"
AM_CFLAGS="$AM_CFLAGS --param ssp-buffer-size=1" AM_CFLAGS="$AM_CFLAGS --param ssp-buffer-size=1"
AM_LDFLAGS="$AM_LDFLAGS -pie" AM_LDFLAGS="$AM_LDFLAGS -pie"])])
fi])
# Linker hardening options # Linker hardening options
# Currently these options are ELF specific - you can't use this with MacOSX # Currently these options are ELF specific - you can't use this with MacOSX
AC_ARG_ENABLE(linker-hardening, AC_ARG_ENABLE(linker-hardening,
AS_HELP_STRING(--enable-linker-hardening, enable linker security fixups), [AS_HELP_STRING(--enable-linker-hardening, enable linker security fixups)],
[if test x$enableval = xyes; then [AS_IF([x$enableval = xyes],
AM_LDFLAGS="$AM_LDFLAGS -z relro -z now" [AM_LDFLAGS="$AM_LDFLAGS -z relro -z now"])])
fi])
# Support for hiding non-public symbols
HIDDEN_VISIBILITY_CFLAGS=""
case "$host" in
*-*-mingw*)
dnl on mingw32 we do -fvisibility=hidden and __declspec(dllexport)
AC_DEFINE([_EXTRACTOR_EXTERN], [__attribute__((visibility("default"))) __dec
lspec(dllexport) extern],
[defines how to decorate public symbols while building])
HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden"
;;
*)
dnl on other compilers, check if we can do -fvisibility=hidden
AX_CHECK_LINK_FLAG([-fvisibility=hidden],
[AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],
[AC_DEFINE([_EXTRACTOR_EXTERN], [__attribute__((visib
ility("default"))) extern],
[defines how to decorate public symbols w
hile building])
HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden"])])
;;
esac
AC_SUBST(HIDDEN_VISIBILITY_CFLAGS)
# Checks for libraries. # Checks for libraries.
AC_CHECK_HEADERS(langinfo.h) AC_CHECK_HEADERS([langinfo.h])
# Check for libltdl header (#2999) # Check for libltdl header (#2999)
ltdl=0 ltdl=0
AC_MSG_CHECKING(for libltdl) AC_MSG_CHECKING(for libltdl)
AC_ARG_WITH(ltdl, AC_ARG_WITH(ltdl,
[ --with-ltdl=PFX base of libltdl installation], [ --with-ltdl=PFX base of libltdl installation],
[AC_MSG_RESULT([$with_ltdl]) [AC_MSG_RESULT([$with_ltdl])
case $with_ltdl in case $with_ltdl in
no) no)
;; ;;
skipping to change at line 273 skipping to change at line 286
EXT_LIB_PATH="-L$with_ltdl/lib $EXT_LIB_PATH" EXT_LIB_PATH="-L$with_ltdl/lib $EXT_LIB_PATH"
ltdl=1)) ltdl=1))
LIBS="$OLD_LIBS" LIBS="$OLD_LIBS"
;; ;;
esac esac
], ],
[AC_MSG_RESULT([--with-ltdl not specified]) [AC_MSG_RESULT([--with-ltdl not specified])
AC_CHECK_HEADERS(ltdl.h, AC_CHECK_HEADERS(ltdl.h,
AC_CHECK_LIB([ltdl], [lt_dlopenext], AC_CHECK_LIB([ltdl], [lt_dlopenext],
ltdl=1))]) ltdl=1))])
if test x$ltdl = x1 AS_IF([test x$ltdl = x1],
then [AC_MSG_RESULT([libltdl found])],
AC_MSG_RESULT([libltdl found]) [AC_MSG_ERROR([libextractor requires libltdl (from GNU libtool), try insta
else lling libltdl-dev])])
AC_MSG_ERROR([libextractor requires libltdl (from GNU libtool), try installing
libltdl-dev])
fi
# check for apparmor # check for apparmor
AC_CHECK_LIB(apparmor, aa_change_profile, AC_CHECK_LIB(apparmor, aa_change_profile,
[AC_CHECK_HEADERS([sys/apparmor.h], [AC_CHECK_HEADERS([sys/apparmor.h],
AM_CONDITIONAL(HAVE_APPARMOR, true) AM_CONDITIONAL(HAVE_APPARMOR, true)
AC_DEFINE(HAVE_APPARMOR,1,[Have apparmor]), AC_DEFINE(HAVE_APPARMOR,1,[Have apparmor]),
AM_CONDITIONAL(HAVE_APPARMOR, false) AM_CONDITIONAL(HAVE_APPARMOR, false)
AC_DEFINE(HAVE_APPARMOR,0,[lacking apparmor]))], AC_DEFINE(HAVE_APPARMOR,0,[lacking apparmor]))],
AM_CONDITIONAL(HAVE_APPARMOR, false), AM_CONDITIONAL(HAVE_APPARMOR, false),
-lapparmor) -lapparmor)
skipping to change at line 534 skipping to change at line 544
) )
] ]
) )
] ]
) )
] ]
) )
LIBS="$SAVED_LIBS $SOCKET_LIBS" LIBS="$SAVED_LIBS $SOCKET_LIBS"
AC_LANG_POP(C) AC_LANG_POP(C)
AC_MSG_RESULT([$sockets]) AC_MSG_RESULT([$sockets])
if test "x$sockets" = "xno" AS_IF([test "x$sockets" = "xno"],
then [AC_MSG_ERROR([libextractor requires some kind of socket library])])
AC_MSG_ERROR([libextractor requires some kind of socket library])
fi
AC_SUBST([SOCKET_LIBS],[$SOCKET_LIBS]) AC_SUBST([SOCKET_LIBS],[$SOCKET_LIBS])
LE_LIB_LIBS=$LIBS LE_LIB_LIBS=$LIBS
LIBS=$LIBSOLD LIBS=$LIBSOLD
AM_GNU_GETTEXT_VERSION([0.16.1]) AM_GNU_GETTEXT_VERSION([0.16.1])
AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])
# check for GNU LD # check for GNU LD
AC_LIB_PROG_LD_GNU AC_LIB_PROG_LD_GNU
skipping to change at line 566 skipping to change at line 574
[AC_HELP_STRING([--disable-glib],[disable glib support])], [AC_HELP_STRING([--disable-glib],[disable glib support])],
[case "$enableval" in [case "$enableval" in
no) AC_MSG_RESULT(disabled) no) AC_MSG_RESULT(disabled)
without_glib=true without_glib=true
;; ;;
*) AC_MSG_RESULT(allowed) *) AC_MSG_RESULT(allowed)
;; ;;
esac], esac],
AC_MSG_RESULT(allowed)) AC_MSG_RESULT(allowed))
if test x$without_glib != xtrue AS_IF([test x$without_glib != xtrue],
then [AS_IF([test $with_gnu_ld = yes],
if test $with_gnu_ld = yes [# We need both GNU LD and GLIB here!
then AM_CONDITIONAL(HAVE_GLIB,true)
# We need both GNU LD and GLIB here! AC_DEFINE(HAVE_GLIB, 1, [Have glib])],
AM_CONDITIONAL(HAVE_GLIB,true) [# We may have GLIB, but without GNU LD we must not use it!
AC_DEFINE(HAVE_GLIB, 1, [Have glib]) AM_CONDITIONAL(HAVE_GLIB,false)
else AC_DEFINE(HAVE_GLIB, 0, [Have glib, but not GNU LD])])],
# We may have GLIB, but without GNU LD we must not use it! [AM_CONDITIONAL(HAVE_GLIB,false)
AM_CONDITIONAL(HAVE_GLIB,false) AC_DEFINE(HAVE_GLIB, 0, [Have glib])])
AC_DEFINE(HAVE_GLIB, 0, [Have glib, but not GNU LD])
fi
else
AM_CONDITIONAL(HAVE_GLIB,false)
AC_DEFINE(HAVE_GLIB, 0, [Have glib])
fi
# smf requires glib.h # smf requires glib.h
CFLAGS_OLD="$CFLAGS" CFLAGS_OLD="$CFLAGS"
CPPFLAGS_OLD="$CPPFLAGS" CPPFLAGS_OLD="$CPPFLAGS"
CFLAGS="$AM_CFLAGS $GLIB_CFLAGS" CFLAGS="$AM_CFLAGS $GLIB_CFLAGS"
CPPFLAGS="$AM_CPPFLAGS $GLIB_CFLAGS" CPPFLAGS="$AM_CPPFLAGS $GLIB_CFLAGS"
AC_CHECK_LIB(smf, smf_load_from_memory, AC_CHECK_LIB(smf, smf_load_from_memory,
[AC_CHECK_HEADERS([smf.h], [AC_CHECK_HEADERS([smf.h],
AM_CONDITIONAL(HAVE_SMF, true) AM_CONDITIONAL(HAVE_SMF, true)
AC_DEFINE(HAVE_MPEG2,1,[Have libsmf]), AC_DEFINE(HAVE_MPEG2,1,[Have libsmf]),
AM_CONDITIONAL(HAVE_SMF, false))], AM_CONDITIONAL(HAVE_SMF, false))],
AM_CONDITIONAL(HAVE_SMF, false)) AM_CONDITIONAL(HAVE_SMF, false))
# check for gdk-pixbuf >= 2.4 # check for gdk-pixbuf >= 2.4
AC_MSG_CHECKING(for gdk-pixbuf) AC_MSG_CHECKING(for gdk-pixbuf)
PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= 2.4], [have_gdk_pixbuf=yes], [have_gdk_pixbuf=no]) PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= 2.4], [have_gdk_pixbuf=yes], [have_gdk_pixbuf=no])
AM_CONDITIONAL(HAVE_GDK_PIXBUF, test x$have_gdk_pixbuf != xno) AM_CONDITIONAL(HAVE_GDK_PIXBUF, test x$have_gdk_pixbuf != xno)
if test $have_gdk_pixbuf != no AS_IF([test $have_gdk_pixbuf != no],
then [have_gdk_pixbuf=1],
have_gdk_pixbuf=1 [have_gdk_pixbuf=0
else AC_MSG_NOTICE([Cannot find Gdk-pixbuf: Is pkg-config in path?])])
have_gdk_pixbuf=0
AC_MSG_NOTICE([Cannot find Gdk-pixbuf: Is pkg-config in path?])
fi
AC_DEFINE_UNQUOTED([HAVE_GDK_PIXBUF], [$have_gdk_pixbuf], [We have Gdk-pixbuf]) AC_DEFINE_UNQUOTED([HAVE_GDK_PIXBUF], [$have_gdk_pixbuf], [We have Gdk-pixbuf])
CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
CPPFLAGS="$CPPFLAGS $GDK_PIXBUF_CFLAGS" CPPFLAGS="$CPPFLAGS $GDK_PIXBUF_CFLAGS"
LIBS="$LIBS $GDK_PIXBUF_LIBS" LIBS="$LIBS $GDK_PIXBUF_LIBS"
AC_ARG_WITH([gstreamer], AS_HELP_STRING([--with-gstreamer], [Build with the GStr eamer plugin]), [], [with_gstreamer=yes]) AC_ARG_WITH([gstreamer], AS_HELP_STRING([--with-gstreamer], [Build with the GStr eamer plugin]), [], [with_gstreamer=yes])
have_gstreamer=no have_gstreamer=no
have_gstreamer_pbutils=no have_gstreamer_pbutils=no
skipping to change at line 659 skipping to change at line 658
[case "$enableval" in [case "$enableval" in
no) AC_MSG_RESULT(no) no) AC_MSG_RESULT(no)
ffmpeg_enabled=0 ffmpeg_enabled=0
;; ;;
*) AC_MSG_RESULT(yes) *) AC_MSG_RESULT(yes)
ffmpeg_enabled=1 ffmpeg_enabled=1
;; ;;
esac], esac],
[ AC_MSG_RESULT(yes) [ AC_MSG_RESULT(yes)
ffmpeg_enabled=1]) ffmpeg_enabled=1])
if test x$ffmpeg_enabled = x1 AS_IF([test x$ffmpeg_enabled = x1],
then [ffmpeg_enabled=0
ffmpeg_enabled=0
new_ffmpeg=0 new_ffmpeg=0
AC_CHECK_HEADERS([libavutil/avutil.h libavformat/avformat.h libavcodec/avcodec .h libavutil/frame.h], AC_CHECK_HEADERS([libavutil/avutil.h libavformat/avformat.h libavcodec/avcodec .h libavutil/frame.h],
AC_CHECK_HEADERS([libavresample/avresample.h], AC_CHECK_HEADERS([libavresample/avresample.h],
AC_CHECK_LIB(avutil, av_audio_fifo_alloc, AC_CHECK_LIB(avutil, av_audio_fifo_alloc,
new_ffmpeg=1))) new_ffmpeg=1)))
AC_CHECK_LIB(swscale, sws_getContext, AC_CHECK_LIB(swscale, sws_getContext,
AC_CHECK_LIB(avcodec, avcodec_alloc_context3, AC_CHECK_LIB(avcodec, avcodec_alloc_context3,
ffmpeg_enabled=1)) ffmpeg_enabled=1))
AC_CHECK_HEADERS([libavutil/avutil.h ffmpeg/avutil.h libavformat/avformat.h ff mpeg/avformat.h libavcodec/avcodec.h ffmpeg/avcodec.h libswscale/swscale.h ffmpe g/swscale.h]) AC_CHECK_HEADERS([libavutil/avutil.h ffmpeg/avutil.h libavformat/avformat.h ff mpeg/avformat.h libavcodec/avcodec.h ffmpeg/avcodec.h libswscale/swscale.h ffmpe g/swscale.h])
fi ])
AM_CONDITIONAL(HAVE_FFMPEG, test x$ffmpeg_enabled != x0) AM_CONDITIONAL(HAVE_FFMPEG, test x$ffmpeg_enabled != x0)
AM_CONDITIONAL(HAVE_FFMPEG_NEW, test x$new_ffmpeg != x0) AM_CONDITIONAL(HAVE_FFMPEG_NEW, test x$new_ffmpeg != x0)
LE_INTLINCL="" LE_INTLINCL=""
LE_LIBINTL="$LTLIBINTL" LE_LIBINTL="$LTLIBINTL"
AC_ARG_ENABLE(framework, [ --enable-framework enable Mac OS X framework bu ild helpers],enable_framework_build=$enableval) AC_ARG_ENABLE(framework, [ --enable-framework enable Mac OS X framework bu ild helpers],enable_framework_build=$enableval)
AM_CONDITIONAL(WANT_FRAMEWORK, test x$enable_framework_build = xyes) AM_CONDITIONAL(WANT_FRAMEWORK, test x$enable_framework_build = xyes)
if test x$enable_framework_build = xyes if test x$enable_framework_build = xyes
then then
AC_DEFINE([FRAMEWORK_BUILD], 1, [Build a Mac OS X Framework]) AC_DEFINE([FRAMEWORK_BUILD], 1, [Build a Mac OS X Framework])
 End of changes. 13 change blocks. 
62 lines changed or deleted 63 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)