mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Removing efltk checks. Small fix inside pekwm.m4

Browse Source
This commit is contained in:
Sanel Zukan 2011-11-14 08:54:06 +00:00
parent 5ee83e3c21
commit 9c3ab096be
4 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Jamconfig.in
View File

@ -105,11 +105,6 @@ FLTKINCLUDE ?= @FLTK_CFLAGS@ ;
FLTKLIB ?= @FLTK_LIBS@ ; FLTKLIB ?= @FLTK_LIBS@ ;
FLTKLIB_NOIMAGES ?= @FLTK_LIBS_NOIMAGES@ ; FLTKLIB_NOIMAGES ?= @FLTK_LIBS_NOIMAGES@ ;
# backward; efltk libraries path
EFLTKINCLUDE ?= @EFLTK_CFLAGS@ ;
EFLTKLIB ?= @EFLTK_LIBS@ ;
EFLTKLIB_NOIMAGES ?= @EFLTK_LIBS_NOIMAGES@ ;
# Xcomposite # Xcomposite
COMPOSITEINCLUDE ?= @COMPOSITE_CFLAGS@ ; COMPOSITEINCLUDE ?= @COMPOSITE_CFLAGS@ ;
COMPOSITELIB ?= @COMPOSITE_LIBS@ ; COMPOSITELIB ?= @COMPOSITE_LIBS@ ;

9
configure.in
View File

@ -165,12 +165,6 @@ else
AC_MSG_ERROR([You don't have FLTK installed. To compile EDE, you will need it.]) AC_MSG_ERROR([You don't have FLTK installed. To compile EDE, you will need it.])
fi fi
if test "x$with_efltk_path" = "x"; then
AC_PATH_PROG(EFLTK_CONFIG, efltk-config)
else
AC_PATH_PROG(EFLTK_CONFIG, efltk-config,, "$with_efltk_path/bin")
fi
EDE_CHECK_LIBXPM EDE_CHECK_LIBXPM
if test "$have_libxpm" = "yes"; then if test "$have_libxpm" = "yes"; then
FLTK_LIBS="$FLTK_LIBS $LIBXPM_LIBS" FLTK_LIBS="$FLTK_LIBS $LIBXPM_LIBS"
@ -249,9 +243,6 @@ AC_SUBST(EDE_DEBUG_FLAGS)
AC_SUBST(FLTK_CFLAGS) AC_SUBST(FLTK_CFLAGS)
AC_SUBST(FLTK_LIBS) AC_SUBST(FLTK_LIBS)
AC_SUBST(FLTK_LIBS_NOIMAGES) AC_SUBST(FLTK_LIBS_NOIMAGES)
AC_SUBST(EFLTK_CFLAGS)
AC_SUBST(EFLTK_LIBS_NOIMAGES)
AC_SUBST(EFLTK_LIBS)
AC_SUBST(EDELIB_API_INDEX) AC_SUBST(EDELIB_API_INDEX)
AC_SUBST(CURL_CFLAGS) AC_SUBST(CURL_CFLAGS)
AC_SUBST(CURL_LIBS) AC_SUBST(CURL_LIBS)

4
efiler/Fl_Icon_Browser.h
View File

@ -34,8 +34,8 @@
#ifndef Fl_Icon_Browser_H #ifndef Fl_Icon_Browser_H
#define Fl_Icon_Browser_H #define Fl_Icon_Browser_H
#include <Fl/Fl_Browser_.H> #include <FL/Fl_Browser_.H>
#include <Fl/Fl_Image.H> #include <FL/Fl_Image.H>
#include <stdio.h> #include <stdio.h>

4
m4/pekwm.m4
View File

@ -15,7 +15,7 @@ AC_LANG_CPLUSPLUS
dnl Stupid way to find iconv; on linux, iconv is part of glibc, for others dnl Stupid way to find iconv; on linux, iconv is part of glibc, for others
dnl try to search binary, then adjust paths dnl try to search binary, then adjust paths
if test "x$`uname`" = "xLinux"; then if test "x`uname`" = "xLinux"; then
LIBICONV="" LIBICONV=""
INCICONV="" INCICONV=""
else else
@ -36,7 +36,7 @@ AC_CHECK_FUNC(iconvctl, [AC_DEFINE(HAVE_ICONVCTL, [1], [Define to 1 if you the i
dnl Assume we have X libs dnl Assume we have X libs
PEKWM_CXXFLAGS="$PEKWM_CXXFLAGS $X_CFLAGS" PEKWM_CXXFLAGS="$PEKWM_CXXFLAGS $X_CFLAGS"
PEKWM_LIBS="$PEKWM_LIBS $X_LIBS $X_EXTRA_LIBS" PEKWM_LIBS="$PEKWM_LIBS -lX11 -lXext $X_LIBS $X_EXTRA_LIBS"
dnl Check for Xinerama support dnl Check for Xinerama support
AC_MSG_CHECKING([whether to build support for the Xinerama extension]) AC_MSG_CHECKING([whether to build support for the Xinerama extension])