kopia lustrzana https://github.com/jamescoxon/dl-fldigi
Fix pkg-config error
The first call to the PKG_CHECK_MODULES must always run, i.e., not be wrapped inside OS conditionals.pull/2/head
rodzic
69cb51295d
commit
d952ad492e
16
configure.ac
16
configure.ac
|
@ -188,14 +188,6 @@ AC_FLDIGI_TLS
|
|||
# if falling back to Boost
|
||||
AC_FLDIGI_BIND
|
||||
|
||||
### X11
|
||||
# Set ac_cv_x to yes/no
|
||||
# Define USE_X in config.h
|
||||
# Substitute X_CFLAGS and X_LIBS in Makefile
|
||||
if test "x$target_darwin" = "xno" && test "x$target_win32" = "xno"; then
|
||||
AC_FLDIGI_PKG_CHECK([x], [x11], [no], [yes])
|
||||
fi
|
||||
|
||||
### FLTK
|
||||
# Substitute FLTK_CFLAGS and FLTK_LIBS in Makefile
|
||||
# Set FLUID variable
|
||||
|
@ -272,6 +264,14 @@ AC_FLDIGI_PKG_CHECK([hamlib], [hamlib >= 1.2.4], [yes], [yes],
|
|||
AX_COMPARE_VERSION([$pkg_hamlib_version], [le], [1.2.9], [need_locator_c=yes], [need_locator_c=no])
|
||||
AM_CONDITIONAL([NEED_HAMLIB_LOCATOR], [test "$need_locator_c" = "yes"])
|
||||
|
||||
### X11
|
||||
# Set ac_cv_x to yes/no
|
||||
# Define USE_X in config.h
|
||||
# Substitute X_CFLAGS and X_LIBS in Makefile
|
||||
if test "x$target_darwin" = "xno" && test "x$target_win32" = "xno"; then
|
||||
AC_FLDIGI_PKG_CHECK([x], [x11], [no], [yes])
|
||||
fi
|
||||
|
||||
### libintl
|
||||
# Substitute INTL_CFLAGS in Makefile
|
||||
# Substitute INTL_LIBS in Makefile
|
||||
|
|
Ładowanie…
Reference in New Issue