mirror of
https://github.com/linux-usb-gadgets/libusbgx.git
synced 2025-07-13 03:29:43 +03:00
Added support for CMake projects macros
This commit is contained in:
parent
b5ad66eb1e
commit
664b7e6fe7
6 changed files with 1598 additions and 1133 deletions
24
LibUsbgxConfig.cmake.in
Normal file
24
LibUsbgxConfig.cmake.in
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
get_filename_component(LibUsbgx_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||||
|
include(CMakeFindDependencyMacro)
|
||||||
|
|
||||||
|
# Compute the installation prefix relative to this file.
|
||||||
|
get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||||
|
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
||||||
|
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
||||||
|
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
||||||
|
if(_IMPORT_PREFIX STREQUAL "/")
|
||||||
|
set(_IMPORT_PREFIX "")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(LibUsbgx_INCLUDE_DIRS "${_IMPORT_PREFIX}/include")
|
||||||
|
|
||||||
|
if(NOT TARGET LibUsbgx::LibUsbgx)
|
||||||
|
add_library(LibUsbgx::LibUsbgx SHARED IMPORTED)
|
||||||
|
set_property(TARGET LibUsbgx::LibUsbgx APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||||
|
|
||||||
|
set_target_properties(LibUsbgx::LibUsbgx PROPERTIES
|
||||||
|
IMPORTED_LOCATION "${_IMPORT_PREFIX}/lib/libusbgx.so"
|
||||||
|
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(LibUsbgx_LIBRARIES LibUsbgx::LibUsbgx)
|
|
@ -17,3 +17,5 @@ function_includedir=$(includedir)/usbg/function
|
||||||
function_include_HEADERS = include/usbg/function/ffs.h include/usbg/function/loopback.h include/usbg/function/midi.h include/usbg/function/ms.h include/usbg/function/net.h include/usbg/function/phonet.h include/usbg/function/serial.h include/usbg/function/hid.h include/usbg/function/uac2.h
|
function_include_HEADERS = include/usbg/function/ffs.h include/usbg/function/loopback.h include/usbg/function/midi.h include/usbg/function/ms.h include/usbg/function/net.h include/usbg/function/phonet.h include/usbg/function/serial.h include/usbg/function/hid.h include/usbg/function/uac2.h
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = libusbgx.pc
|
pkgconfig_DATA = libusbgx.pc
|
||||||
|
cmakeconfigdir = $(libdir)/cmake/LibUsbgx
|
||||||
|
cmakeconfig_DATA = LibUsbgxConfig.cmake
|
||||||
|
|
|
@ -56,6 +56,6 @@ AS_IF([test "x$enable_gadget_schemes" = xyes],
|
||||||
AM_CONDITIONAL(TEST_GADGET_SCHEMES, [test "x$enable_gadget_schemes" != xno])
|
AM_CONDITIONAL(TEST_GADGET_SCHEMES, [test "x$enable_gadget_schemes" != xno])
|
||||||
|
|
||||||
LT_INIT
|
LT_INIT
|
||||||
AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile include/usbg/usbg_version.h libusbgx.pc doxygen.cfg])
|
AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile include/usbg/usbg_version.h libusbgx.pc doxygen.cfg LibUsbgxConfig.cmake])
|
||||||
DX_INIT_DOXYGEN([$PACKAGE_NAME],[doxygen.cfg])
|
DX_INIT_DOXYGEN([$PACKAGE_NAME],[doxygen.cfg])
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
2564
m4/libtool.m4
vendored
2564
m4/libtool.m4
vendored
File diff suppressed because it is too large
Load diff
127
m4/ltoptions.m4
vendored
127
m4/ltoptions.m4
vendored
|
@ -1,14 +1,14 @@
|
||||||
# Helper functions for option handling. -*- Autoconf -*-
|
# Helper functions for option handling. -*- Autoconf -*-
|
||||||
#
|
#
|
||||||
# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
|
# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
|
||||||
# Inc.
|
# Foundation, Inc.
|
||||||
# Written by Gary V. Vaughan, 2004
|
# Written by Gary V. Vaughan, 2004
|
||||||
#
|
#
|
||||||
# This file is free software; the Free Software Foundation gives
|
# This file is free software; the Free Software Foundation gives
|
||||||
# unlimited permission to copy and/or distribute it, with or without
|
# unlimited permission to copy and/or distribute it, with or without
|
||||||
# modifications, as long as this notice is preserved.
|
# modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
# serial 7 ltoptions.m4
|
# serial 8 ltoptions.m4
|
||||||
|
|
||||||
# This is to help aclocal find these macros, as it can't see m4_define.
|
# This is to help aclocal find these macros, as it can't see m4_define.
|
||||||
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
|
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
|
||||||
|
@ -29,7 +29,7 @@ m4_define([_LT_SET_OPTION],
|
||||||
[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
|
[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
|
||||||
m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
|
m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
|
||||||
_LT_MANGLE_DEFUN([$1], [$2]),
|
_LT_MANGLE_DEFUN([$1], [$2]),
|
||||||
[m4_warning([Unknown $1 option `$2'])])[]dnl
|
[m4_warning([Unknown $1 option '$2'])])[]dnl
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
|
@ -75,13 +75,15 @@ m4_if([$1],[LT_INIT],[
|
||||||
dnl
|
dnl
|
||||||
dnl If no reference was made to various pairs of opposing options, then
|
dnl If no reference was made to various pairs of opposing options, then
|
||||||
dnl we run the default mode handler for the pair. For example, if neither
|
dnl we run the default mode handler for the pair. For example, if neither
|
||||||
dnl `shared' nor `disable-shared' was passed, we enable building of shared
|
dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
|
||||||
dnl archives by default:
|
dnl archives by default:
|
||||||
_LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
|
_LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
|
||||||
_LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
|
_LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
|
||||||
_LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
|
_LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
|
||||||
_LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
|
_LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
|
||||||
[_LT_ENABLE_FAST_INSTALL])
|
[_LT_ENABLE_FAST_INSTALL])
|
||||||
|
_LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
|
||||||
|
[_LT_WITH_AIX_SONAME([aix])])
|
||||||
])
|
])
|
||||||
])# _LT_SET_OPTIONS
|
])# _LT_SET_OPTIONS
|
||||||
|
|
||||||
|
@ -112,7 +114,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN],
|
||||||
[_LT_SET_OPTION([LT_INIT], [dlopen])
|
[_LT_SET_OPTION([LT_INIT], [dlopen])
|
||||||
AC_DIAGNOSE([obsolete],
|
AC_DIAGNOSE([obsolete],
|
||||||
[$0: Remove this warning and the call to _LT_SET_OPTION when you
|
[$0: Remove this warning and the call to _LT_SET_OPTION when you
|
||||||
put the `dlopen' option into LT_INIT's first parameter.])
|
put the 'dlopen' option into LT_INIT's first parameter.])
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl aclocal-1.4 backwards compatibility:
|
dnl aclocal-1.4 backwards compatibility:
|
||||||
|
@ -148,7 +150,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
|
||||||
_LT_SET_OPTION([LT_INIT], [win32-dll])
|
_LT_SET_OPTION([LT_INIT], [win32-dll])
|
||||||
AC_DIAGNOSE([obsolete],
|
AC_DIAGNOSE([obsolete],
|
||||||
[$0: Remove this warning and the call to _LT_SET_OPTION when you
|
[$0: Remove this warning and the call to _LT_SET_OPTION when you
|
||||||
put the `win32-dll' option into LT_INIT's first parameter.])
|
put the 'win32-dll' option into LT_INIT's first parameter.])
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl aclocal-1.4 backwards compatibility:
|
dnl aclocal-1.4 backwards compatibility:
|
||||||
|
@ -157,9 +159,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
|
||||||
|
|
||||||
# _LT_ENABLE_SHARED([DEFAULT])
|
# _LT_ENABLE_SHARED([DEFAULT])
|
||||||
# ----------------------------
|
# ----------------------------
|
||||||
# implement the --enable-shared flag, and supports the `shared' and
|
# implement the --enable-shared flag, and supports the 'shared' and
|
||||||
# `disable-shared' LT_INIT options.
|
# 'disable-shared' LT_INIT options.
|
||||||
# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
|
# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
|
||||||
m4_define([_LT_ENABLE_SHARED],
|
m4_define([_LT_ENABLE_SHARED],
|
||||||
[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
||||||
AC_ARG_ENABLE([shared],
|
AC_ARG_ENABLE([shared],
|
||||||
|
@ -172,14 +174,14 @@ AC_ARG_ENABLE([shared],
|
||||||
*)
|
*)
|
||||||
enable_shared=no
|
enable_shared=no
|
||||||
# Look at the argument we got. We use all the common list separators.
|
# Look at the argument we got. We use all the common list separators.
|
||||||
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
||||||
for pkg in $enableval; do
|
for pkg in $enableval; do
|
||||||
IFS="$lt_save_ifs"
|
IFS=$lt_save_ifs
|
||||||
if test "X$pkg" = "X$p"; then
|
if test "X$pkg" = "X$p"; then
|
||||||
enable_shared=yes
|
enable_shared=yes
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
IFS="$lt_save_ifs"
|
IFS=$lt_save_ifs
|
||||||
;;
|
;;
|
||||||
esac],
|
esac],
|
||||||
[enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
|
[enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
|
||||||
|
@ -211,9 +213,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], [])
|
||||||
|
|
||||||
# _LT_ENABLE_STATIC([DEFAULT])
|
# _LT_ENABLE_STATIC([DEFAULT])
|
||||||
# ----------------------------
|
# ----------------------------
|
||||||
# implement the --enable-static flag, and support the `static' and
|
# implement the --enable-static flag, and support the 'static' and
|
||||||
# `disable-static' LT_INIT options.
|
# 'disable-static' LT_INIT options.
|
||||||
# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
|
# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
|
||||||
m4_define([_LT_ENABLE_STATIC],
|
m4_define([_LT_ENABLE_STATIC],
|
||||||
[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
||||||
AC_ARG_ENABLE([static],
|
AC_ARG_ENABLE([static],
|
||||||
|
@ -226,14 +228,14 @@ AC_ARG_ENABLE([static],
|
||||||
*)
|
*)
|
||||||
enable_static=no
|
enable_static=no
|
||||||
# Look at the argument we got. We use all the common list separators.
|
# Look at the argument we got. We use all the common list separators.
|
||||||
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
||||||
for pkg in $enableval; do
|
for pkg in $enableval; do
|
||||||
IFS="$lt_save_ifs"
|
IFS=$lt_save_ifs
|
||||||
if test "X$pkg" = "X$p"; then
|
if test "X$pkg" = "X$p"; then
|
||||||
enable_static=yes
|
enable_static=yes
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
IFS="$lt_save_ifs"
|
IFS=$lt_save_ifs
|
||||||
;;
|
;;
|
||||||
esac],
|
esac],
|
||||||
[enable_static=]_LT_ENABLE_STATIC_DEFAULT)
|
[enable_static=]_LT_ENABLE_STATIC_DEFAULT)
|
||||||
|
@ -265,9 +267,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], [])
|
||||||
|
|
||||||
# _LT_ENABLE_FAST_INSTALL([DEFAULT])
|
# _LT_ENABLE_FAST_INSTALL([DEFAULT])
|
||||||
# ----------------------------------
|
# ----------------------------------
|
||||||
# implement the --enable-fast-install flag, and support the `fast-install'
|
# implement the --enable-fast-install flag, and support the 'fast-install'
|
||||||
# and `disable-fast-install' LT_INIT options.
|
# and 'disable-fast-install' LT_INIT options.
|
||||||
# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
|
# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
|
||||||
m4_define([_LT_ENABLE_FAST_INSTALL],
|
m4_define([_LT_ENABLE_FAST_INSTALL],
|
||||||
[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
||||||
AC_ARG_ENABLE([fast-install],
|
AC_ARG_ENABLE([fast-install],
|
||||||
|
@ -280,14 +282,14 @@ AC_ARG_ENABLE([fast-install],
|
||||||
*)
|
*)
|
||||||
enable_fast_install=no
|
enable_fast_install=no
|
||||||
# Look at the argument we got. We use all the common list separators.
|
# Look at the argument we got. We use all the common list separators.
|
||||||
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
||||||
for pkg in $enableval; do
|
for pkg in $enableval; do
|
||||||
IFS="$lt_save_ifs"
|
IFS=$lt_save_ifs
|
||||||
if test "X$pkg" = "X$p"; then
|
if test "X$pkg" = "X$p"; then
|
||||||
enable_fast_install=yes
|
enable_fast_install=yes
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
IFS="$lt_save_ifs"
|
IFS=$lt_save_ifs
|
||||||
;;
|
;;
|
||||||
esac],
|
esac],
|
||||||
[enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
|
[enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
|
||||||
|
@ -304,14 +306,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL],
|
||||||
[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
|
[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
|
||||||
AC_DIAGNOSE([obsolete],
|
AC_DIAGNOSE([obsolete],
|
||||||
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
|
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
|
||||||
the `fast-install' option into LT_INIT's first parameter.])
|
the 'fast-install' option into LT_INIT's first parameter.])
|
||||||
])
|
])
|
||||||
|
|
||||||
AU_DEFUN([AC_DISABLE_FAST_INSTALL],
|
AU_DEFUN([AC_DISABLE_FAST_INSTALL],
|
||||||
[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
|
[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
|
||||||
AC_DIAGNOSE([obsolete],
|
AC_DIAGNOSE([obsolete],
|
||||||
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
|
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
|
||||||
the `disable-fast-install' option into LT_INIT's first parameter.])
|
the 'disable-fast-install' option into LT_INIT's first parameter.])
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl aclocal-1.4 backwards compatibility:
|
dnl aclocal-1.4 backwards compatibility:
|
||||||
|
@ -319,11 +321,64 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
|
||||||
dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
|
dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
|
||||||
|
|
||||||
|
|
||||||
|
# _LT_WITH_AIX_SONAME([DEFAULT])
|
||||||
|
# ----------------------------------
|
||||||
|
# implement the --with-aix-soname flag, and support the `aix-soname=aix'
|
||||||
|
# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
|
||||||
|
# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
|
||||||
|
m4_define([_LT_WITH_AIX_SONAME],
|
||||||
|
[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
|
||||||
|
shared_archive_member_spec=
|
||||||
|
case $host,$enable_shared in
|
||||||
|
power*-*-aix[[5-9]]*,yes)
|
||||||
|
AC_MSG_CHECKING([which variant of shared library versioning to provide])
|
||||||
|
AC_ARG_WITH([aix-soname],
|
||||||
|
[AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
|
||||||
|
[shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
|
||||||
|
[case $withval in
|
||||||
|
aix|svr4|both)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
AC_MSG_ERROR([Unknown argument to --with-aix-soname])
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
lt_cv_with_aix_soname=$with_aix_soname],
|
||||||
|
[AC_CACHE_VAL([lt_cv_with_aix_soname],
|
||||||
|
[lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
|
||||||
|
with_aix_soname=$lt_cv_with_aix_soname])
|
||||||
|
AC_MSG_RESULT([$with_aix_soname])
|
||||||
|
if test aix != "$with_aix_soname"; then
|
||||||
|
# For the AIX way of multilib, we name the shared archive member
|
||||||
|
# based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
|
||||||
|
# and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
|
||||||
|
# Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
|
||||||
|
# the AIX toolchain works better with OBJECT_MODE set (default 32).
|
||||||
|
if test 64 = "${OBJECT_MODE-32}"; then
|
||||||
|
shared_archive_member_spec=shr_64
|
||||||
|
else
|
||||||
|
shared_archive_member_spec=shr
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
with_aix_soname=aix
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
_LT_DECL([], [shared_archive_member_spec], [0],
|
||||||
|
[Shared archive member basename, for filename based shared library versioning on AIX])dnl
|
||||||
|
])# _LT_WITH_AIX_SONAME
|
||||||
|
|
||||||
|
LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
|
||||||
|
LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
|
||||||
|
LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
|
||||||
|
|
||||||
|
|
||||||
# _LT_WITH_PIC([MODE])
|
# _LT_WITH_PIC([MODE])
|
||||||
# --------------------
|
# --------------------
|
||||||
# implement the --with-pic flag, and support the `pic-only' and `no-pic'
|
# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
|
||||||
# LT_INIT options.
|
# LT_INIT options.
|
||||||
# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
|
# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'.
|
||||||
m4_define([_LT_WITH_PIC],
|
m4_define([_LT_WITH_PIC],
|
||||||
[AC_ARG_WITH([pic],
|
[AC_ARG_WITH([pic],
|
||||||
[AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
|
[AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
|
||||||
|
@ -334,19 +389,17 @@ m4_define([_LT_WITH_PIC],
|
||||||
*)
|
*)
|
||||||
pic_mode=default
|
pic_mode=default
|
||||||
# Look at the argument we got. We use all the common list separators.
|
# Look at the argument we got. We use all the common list separators.
|
||||||
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
||||||
for lt_pkg in $withval; do
|
for lt_pkg in $withval; do
|
||||||
IFS="$lt_save_ifs"
|
IFS=$lt_save_ifs
|
||||||
if test "X$lt_pkg" = "X$lt_p"; then
|
if test "X$lt_pkg" = "X$lt_p"; then
|
||||||
pic_mode=yes
|
pic_mode=yes
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
IFS="$lt_save_ifs"
|
IFS=$lt_save_ifs
|
||||||
;;
|
;;
|
||||||
esac],
|
esac],
|
||||||
[pic_mode=default])
|
[pic_mode=m4_default([$1], [default])])
|
||||||
|
|
||||||
test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
|
|
||||||
|
|
||||||
_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
|
_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
|
||||||
])# _LT_WITH_PIC
|
])# _LT_WITH_PIC
|
||||||
|
@ -359,7 +412,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE],
|
||||||
[_LT_SET_OPTION([LT_INIT], [pic-only])
|
[_LT_SET_OPTION([LT_INIT], [pic-only])
|
||||||
AC_DIAGNOSE([obsolete],
|
AC_DIAGNOSE([obsolete],
|
||||||
[$0: Remove this warning and the call to _LT_SET_OPTION when you
|
[$0: Remove this warning and the call to _LT_SET_OPTION when you
|
||||||
put the `pic-only' option into LT_INIT's first parameter.])
|
put the 'pic-only' option into LT_INIT's first parameter.])
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl aclocal-1.4 backwards compatibility:
|
dnl aclocal-1.4 backwards compatibility:
|
||||||
|
|
12
m4/ltversion.m4
vendored
12
m4/ltversion.m4
vendored
|
@ -1,6 +1,6 @@
|
||||||
# ltversion.m4 -- version numbers -*- Autoconf -*-
|
# ltversion.m4 -- version numbers -*- Autoconf -*-
|
||||||
#
|
#
|
||||||
# Copyright (C) 2004 Free Software Foundation, Inc.
|
# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
|
||||||
# Written by Scott James Remnant, 2004
|
# Written by Scott James Remnant, 2004
|
||||||
#
|
#
|
||||||
# This file is free software; the Free Software Foundation gives
|
# This file is free software; the Free Software Foundation gives
|
||||||
|
@ -9,15 +9,15 @@
|
||||||
|
|
||||||
# @configure_input@
|
# @configure_input@
|
||||||
|
|
||||||
# serial 3337 ltversion.m4
|
# serial 4179 ltversion.m4
|
||||||
# This file is part of GNU Libtool
|
# This file is part of GNU Libtool
|
||||||
|
|
||||||
m4_define([LT_PACKAGE_VERSION], [2.4.2])
|
m4_define([LT_PACKAGE_VERSION], [2.4.6])
|
||||||
m4_define([LT_PACKAGE_REVISION], [1.3337])
|
m4_define([LT_PACKAGE_REVISION], [2.4.6])
|
||||||
|
|
||||||
AC_DEFUN([LTVERSION_VERSION],
|
AC_DEFUN([LTVERSION_VERSION],
|
||||||
[macro_version='2.4.2'
|
[macro_version='2.4.6'
|
||||||
macro_revision='1.3337'
|
macro_revision='2.4.6'
|
||||||
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
|
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
|
||||||
_LT_DECL(, macro_revision, 0)
|
_LT_DECL(, macro_revision, 0)
|
||||||
])
|
])
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue