From 7f006d50db1e574739650e3048573d17064df9b6 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 21 Feb 2003 17:24:39 +0000 Subject: [PATCH] more configure tweaks git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6229 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/ChangeLog | 10 +++++++ config/configure.ac | 5 ---- config/configure.in | 4 --- config/lyxinclude.m4 | 69 -------------------------------------------- config/xforms.m4 | 52 +++++++++++++++++++++++++++++++++ 5 files changed, 62 insertions(+), 78 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 2f9e6ecce5..de2841d552 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,13 @@ +2003-02-21 Jean-Marc Lasgouttes + + * xforms.m4 (LYX_PATH_XPM): move here from lyxinclude.m4 + + * lyxinclude.m4 (LYX_FUNC_PUTENV_ARGTYPE): remove, not used + anymore + + * configure.in: + * configure.ac: do not call LYX_FUNC_PUTENV_ARGTYPE + 2003-02-21 André Pönitz * configure.ac, configure.in: removed check for setenv and putenv diff --git a/config/configure.ac b/config/configure.ac index e94f30f46e..135323198c 100644 --- a/config/configure.ac +++ b/config/configure.ac @@ -248,13 +248,8 @@ AC_LANG_PUSH(C) AC_CHECK_FUNCS(memmove memset strchr mkfifo mkstemp mktemp) AC_LANG_POP(C) -dnl Until this is fixed in autoconf we provide our own version AC_FUNC_SELECT_ARGTYPES -dnl check whether we have to work around solaris broken putenv() -LYX_FUNC_PUTENV_ARGTYPE - - ### Some information on what just happened real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"` real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"` diff --git a/config/configure.in b/config/configure.in index 22faf1dae8..1c9649d1fd 100644 --- a/config/configure.in +++ b/config/configure.in @@ -255,10 +255,6 @@ AC_LANG_CPLUSPLUS dnl Until this is fixed in autoconf we provide our own version LYX_FUNC_SELECT_ARGTYPES -dnl check whether we have to work around solaris broken putenv() -LYX_FUNC_PUTENV_ARGTYPE - - LYX_CHECK_DECL_HDRS(mkstemp,[unistd.h stdlib.h]) ### Some information on what just happened diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index b59377af1b..a2aa58d7bf 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -497,75 +497,6 @@ AC_DEFUN(LYX_CXX_GLOBAL_CSTD,[ fi ]) -dnl Usage LYX_PATH_XPM: Checks for xpm library and header -AC_DEFUN(LYX_PATH_XPM,[ -### Check for Xpm library -AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage, XPM_LIB="-lXpm", - [LYX_LIB_ERROR(libXpm,Xpm)]) -AC_SUBST(XPM_LIB) -### Check for Xpm headers -lyx_cv_xpm_h_location="" -AC_CHECK_HEADER(X11/xpm.h,[ - ac_cv_header_xpm_h=yes - lyx_cv_xpm_h_location=""],[ -AC_CHECK_HEADER(xpm.h,[],[ -LYX_LIB_ERROR(xpm.h,Xpm)])]) -AC_DEFINE_UNQUOTED(XPM_H_LOCATION,$lyx_cv_xpm_h_location, - [define this to the location of xpm.h to be used with #include, e.g. ]) - -### Test for the header version -if test $ac_cv_header_xpm_h = yes; then - AC_CACHE_CHECK([xpm header version],lyx_cv_xpmversion, - [ cat > conftest.$ac_ext <&5 | \ - grep '^"%%%"' 2>/dev/null | \ - sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'` - case "$lyx_cv_xpmr" in -changequote(,) - [0-9]) lyxxpmr_alpha=`echo $lyx_cv_xpmr |tr 123456789 abcdefghi` - lyxxpmv_alpha=" (aka 3.$lyx_cv_xpmv$lyxxpmr_alpha)";; -changequote([,]) - *) ;; - esac - lyx_cv_xpmversion="$lyx_cv_xpmv.$lyx_cv_xpmr$lyxxpmv_alpha" - rm -f conftest*]) - XPM_VERSION=${lyx_cv_xpmversion} - case "$lyx_cv_xpmr" in -changequote(,) - [789]|[0-9][0-9]*) ;; -changequote([,]) - *) LYX_WARNING([Version $lyx_cv_xpmversion of the Xpm library is a bit old. - If you experience strange crashes with LyX, try to upgrade - to at least version 4.7 (aka 3.4g). - If you have installed a newer version of the library, check whether you - have an old xpm.h header file in your include path.]);; - esac -fi]) - - -dnl Usage: LYX_FUNC_PUTENV_ARGTYPE -dnl Checks whether putenv() takes 'char const *' or 'char *' as -dnl argument. This is needed because Solaris 7 (wrongly?) uses 'char *', -dnl while everybody else uses the former... -AC_DEFUN(LYX_FUNC_PUTENV_ARGTYPE, -[AC_MSG_CHECKING([type of argument for putenv()]) - AC_CACHE_VAL(lyx_cv_func_putenv_arg,dnl - [AC_TRY_COMPILE(dnl -[#include ], -[char const * foo = "bar"; - putenv(foo);],dnl - [lyx_cv_func_putenv_arg='char const *'],[lyx_cv_func_putenv_arg='char *'])]) - AC_MSG_RESULT($lyx_cv_func_putenv_arg) - AC_DEFINE_UNQUOTED(PUTENV_TYPE_ARG,$lyx_cv_func_putenv_arg,dnl - [Define to the type of the argument of putenv(). Needed on Solaris 7.])]) - - dnl Usage: LYX_WITH_DIR(dir-name,desc,dir-var-name,default-value, dnl [default-yes-value]) dnl Adds a --with-'dir-name' option (described by 'desc') and puts the diff --git a/config/xforms.m4 b/config/xforms.m4 index d7d6f93782..ee6003d7d8 100644 --- a/config/xforms.m4 +++ b/config/xforms.m4 @@ -1,5 +1,57 @@ dnl some macros to test for xforms-related functionality -*- sh -*- +dnl Usage LYX_PATH_XPM: Checks for xpm library and header +AC_DEFUN(LYX_PATH_XPM,[ +### Check for Xpm library +AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage, XPM_LIB="-lXpm", + [LYX_LIB_ERROR(libXpm,Xpm)]) +AC_SUBST(XPM_LIB) +### Check for Xpm headers +lyx_cv_xpm_h_location="" +AC_CHECK_HEADER(X11/xpm.h,[ + ac_cv_header_xpm_h=yes + lyx_cv_xpm_h_location=""],[ +AC_CHECK_HEADER(xpm.h,[],[ +LYX_LIB_ERROR(xpm.h,Xpm)])]) +AC_DEFINE_UNQUOTED(XPM_H_LOCATION,$lyx_cv_xpm_h_location, + [define this to the location of xpm.h to be used with #include, e.g. ]) + +### Test for the header version +if test $ac_cv_header_xpm_h = yes; then + AC_CACHE_CHECK([xpm header version],lyx_cv_xpmversion, + [ cat > conftest.$ac_ext <&5 | \ + grep '^"%%%"' 2>/dev/null | \ + sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'` + case "$lyx_cv_xpmr" in +changequote(,) + [0-9]) lyxxpmr_alpha=`echo $lyx_cv_xpmr |tr 123456789 abcdefghi` + lyxxpmv_alpha=" (aka 3.$lyx_cv_xpmv$lyxxpmr_alpha)";; +changequote([,]) + *) ;; + esac + lyx_cv_xpmversion="$lyx_cv_xpmv.$lyx_cv_xpmr$lyxxpmv_alpha" + rm -f conftest*]) + XPM_VERSION=${lyx_cv_xpmversion} + case "$lyx_cv_xpmr" in +changequote(,) + [789]|[0-9][0-9]*) ;; +changequote([,]) + *) LYX_WARNING([Version $lyx_cv_xpmversion of the Xpm library is a bit old. + If you experience strange crashes with LyX, try to upgrade + to at least version 4.7 (aka 3.4g). + If you have installed a newer version of the library, check whether you + have an old xpm.h header file in your include path.]);; + esac +fi]) + + dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags dnl If it is found, the variable XFORMS_LIB is set to the relevant -l flags, dnl and FORMS_H_LOCATION / FLIMAGE_H_LOCATION is also set -- 2.39.5