mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

* configure.in: AC_CANONICAL_SYSTEM moved above AM_INIT_AUTOMAKE

Browse Source 
to avoid a warning
* acinclude.m4: removed unused macros AC_CHECK_HEADER_IN_PATH,
AC_LIB_XPM, AC_X_SHAPE_EXTENSION
This commit is contained in:
Pavel Roskin 2000-09-01 17:57:22 +00:00
parent eb67f282f5
commit 8800ca2bbf
3 changed files with 8 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2000-09-01 Pavel Roskin <proski@gnu.org>
* configure.in: AC_CANONICAL_SYSTEM moved above AM_INIT_AUTOMAKE
to avoid a warning
* acinclude.m4: removed unused macros AC_CHECK_HEADER_IN_PATH,
AC_LIB_XPM, AC_X_SHAPE_EXTENSION
2000-08-29 Pavel Roskin <proski@gnu.org>
* configure.in: use AM_GNOME_GETTEXT

104
acinclude.m4
View File

@ -404,110 +404,6 @@ dnl job is to detect a method to get file system information.
dnl fi
])
dnl AC_CHECK_HEADER_IN_PATH(HEADER-FILE, ADDITIONAL_PATH, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
AC_DEFUN(AC_CHECK_HEADER_IN_PATH,
[dnl Do the transliteration at runtime so arg 1 can be a shell variable.
ac_safe=`echo "$1" | tr './\055' '___'`
AC_MSG_CHECKING([for $1])
AC_CACHE_VAL(ac_cv_header_in_path_$ac_safe,
[AC_TRY_CPP([#include <$1>], ac_header_in_path=yes, [
ac_header_in_path_found=no
for ac_header_in_path_value in [$2]; do
ac_in_path_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$ac_header_in_path_value"
AC_TRY_CPP([#include <$1>], [
ac_header_in_path_found=yes
ac_header_in_path=$ac_header_in_path_value
], )
CPPFLAGS=$ac_in_path_save_CPPFLAGS
if test x$ac_header_in_path_found = xyes; then
break
fi
done
if test $ac_header_in_path_found = xno; then
ac_header_in_path=no
fi
])
eval "ac_cv_header_in_path_$ac_safe=$ac_header_in_path"
])dnl
eval "ac_header_in_path=`echo '$ac_cv_header_in_path_'$ac_safe`"
if test "$ac_header_in_path" = no; then
AC_MSG_RESULT(no)
ifelse([$4], , , [$4
])dnl
else
if test -n "$ac_header_in_path"; then
AC_MSG_RESULT($ac_header_in_path)
else
AC_MSG_RESULT(yes)
fi
if test x$ac_header_in_path = xyes; then
ac_header_in_path=
eval "ac_cv_header_in_path_$ac_safe="
fi
ifelse([$3], , , [$3
])dnl
fi
])
dnl Hope I can check for libXpm only in the X11 library directory
AC_DEFUN(AC_LIB_XPM, [
AC_MSG_CHECKING(for -lXpm)
AC_CACHE_VAL(ac_cv_has_xpm, [
ac_cv_has_xpm=no
if test x$no_x = xyes; then
:
else
has_xpm_save_LIBS=$LIBS
LIBS="-lXpm $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS"
has_xpm_save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $X_LIBS"
has_xpm_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $X_CFLAGS"
AC_TRY_LINK([
#include <X11/Xlib.h>
#include <X11/xpm.h>
], [XpmLibraryVersion();], ac_cv_has_xpm=yes)
CFLAGS="$has_xpm_save_CFLAGS"
LDFLAGS="$has_xpm_save_LDFLAGS"
LIBS="$has_xpm_save_LIBS"
fi
])
AC_MSG_RESULT($ac_cv_has_xpm)
])
dnl Hope I can check for libXext only in the X11 library directory
dnl and shape.h will be in X11/extensions/shape.h
AC_DEFUN(AC_X_SHAPE_EXTENSION, [
AC_MSG_CHECKING(for X11 non-rectangular shape extension)
AC_CACHE_VAL(ac_cv_has_shape, [
ac_cv_has_shape=no
if test x$no_x = xyes; then
:
else
has_shape_save_LIBS=$LIBS
LIBS="-lXext $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS"
has_shape_save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $X_LIBS"
has_shape_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $X_CFLAGS"
AC_TRY_LINK([
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/extensions/shape.h>
], [
Display *dpy = (Display *)NULL;
int a, b;
XShapeQueryVersion(dpy,&a,&b);
], ac_cv_has_shape=yes)
CFLAGS="$has_shape_save_CFLAGS"
LDFLAGS="$has_shape_save_LDFLAGS"
LIBS="$has_shape_save_LIBS"
fi
])
AC_MSG_RESULT($ac_cv_has_shape)
])
dnl AC_TRY_WARNINGS(INCLUDES, FUNCTION-BODY,
dnl ACTION-IF-NO-WARNINGS [, ACTION-IF-WARNINGS-OR-ERROR])
AC_DEFUN(AC_TRY_WARNINGS,

3
configure.in
View File

@ -2,14 +2,13 @@ dnl
dnl Configure.in file for the Midnight Commander
dnl
AC_INIT(create_vcs)
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(mc, 4.5.51)
AM_CONFIG_HEADER(config.h)
top_srcdir=`dirname $0`
AC_SUBST(top_srcdir)
AC_CANONICAL_SYSTEM
dnl This is path where we're looking for headers in addition to /usr/include
dnl and whatever cpp defaults to.
include_additional_path="/usr/local/include /usr/contrib/include /opt/gnu/include"