1 diff -Nru edelib-2.0.old/configure.ac edelib-2.0/configure.ac
2 --- edelib-2.0.old/configure.ac 1970-01-01 01:00:00.000000000 +0100
3 +++ edelib-2.0/configure.ac 2012-07-24 19:18:30.000000000 +0200
8 +dnl Copyright (c) 2005-2012 edelib authors
10 +dnl This library is free software; you can redistribute it and/or
11 +dnl modify it under the terms of the GNU Lesser General Public
12 +dnl License as published by the Free Software Foundation; either
13 +dnl version 2 of the License, or (at your option) any later version.
15 +dnl This library is distributed in the hope that it will be useful,
16 +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
17 +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 +dnl Lesser General Public License for more details.
20 +dnl You should have received a copy of the GNU Lesser General Public License
21 +dnl along with this library. If not, see <http://www.gnu.org/licenses/>.
23 +m4_define([edelib_major_version], [2])
24 +m4_define([edelib_minor_version], [1])
25 +m4_define([edelib_patch_version], [0])
26 +m4_define([edelib_version], [edelib_major_version.edelib_minor_version.edelib_patch_version])
30 +AC_INIT(edelib, edelib_version, [karijes@users.sourceforge.net])
32 +AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME], [AC_PACKAGE_VERSION])
34 +AM_SILENT_RULES([yes])
36 +AC_CONFIG_SRCDIR(edelib/Nls.h)
37 +AC_CONFIG_HEADER(edelib/_conf.h:edelib/_conf.h.in)
38 +dnl AC_CONFIG_MACRO_DIR([m4])
40 +EDELIB_MAJOR_VERSION=edelib_major_version
41 +EDELIB_MINOR_VERSION=edelib_minor_version
42 +EDELIB_PATCH_VERSION=edelib_patch_version
43 +EDELIB_API_VERSION=$PACKAGE_VERSION
45 +dnl for libtool versioning
46 +EDELIB_LIBTOOL_VERSION_STR="$EDELIB_MAJOR_VERSION:$EDELIB_MINOR_VERSION:$EDELIB_PATCH_VERSION"
48 +dnl configure fuck up CFLAGS/CXXFLAG by adding '-O2' and '-g' after AC_PROG_CC and AC_PROG_CXX
49 +dnl and there is no way to remove them without knowing if user added them
50 +user_cflags="$CFLAGS"
51 +user_cxxflags="$CXXFLAGS"
53 +dnl check for compiler and programs first before any variable was set
54 +dnl this is for case if compiler is not a gcc, so we can set a different variables
58 +AC_PATH_PROG(SED, sed)
59 +AC_PATH_PROG(MSGFMT, msgfmt)
60 +AC_PATH_PROG(XGETTEXT, xgettext)
61 +AC_PATH_PROG(DOXYGEN, doxygen)
62 +AM_CONDITIONAL(HAVE_DOXYGEN, test "x$DOXYGEN" != "x")
66 +EDELIB_COMPILER_VENDOR
67 +case $ac_compiler_vendor in
69 + SANITY_FLAGS="-Wall -pedantic -Wshadow"
70 + DEBUG_FLAGS="-D_DEBUG"
75 + DEBUG_FLAGS="-D_DEBUG"
80 + DEBUG_FLAGS="-D_DEBUG"
85 +CFLAGS="-DHAVE_EDELIB_BASE_CONFIG_H $SANITY_FLAGS $user_cflags"
86 +CXXFLAGS="-DHAVE_EDELIB_BASE_CONFIG_H $SANITY_FLAGS $user_cxxflags"
90 +AC_CHECK_HEADER(string.h, AC_DEFINE(HAVE_STRING_H, 1, [Define to 1 if you have string.h file]))
91 +AC_CHECK_FUNC(snprintf, AC_DEFINE(HAVE_SNPRINTF, 1, [Define to 1 if you have snprintf()]))
92 +AC_CHECK_FUNC(vsnprintf, AC_DEFINE(HAVE_VSNPRINTF, 1, [Define to 1 if you have vsnprintf()]))
94 +dnl freebsd have different unsetenv() impl. and is not compatible with our implementation
95 +AC_CHECK_FUNC(unsetenv, AC_DEFINE(HAVE_UNSETENV, 1, [Define to 1 if you ave unsetenv()]))
98 +AC_CHECK_FUNC(grantpt, AC_DEFINE(HAVE_GRANTPT, 1, [Define to 1 if you have grantpt()]))
99 +AC_CHECK_FUNC(ptsname, AC_DEFINE(HAVE_PTSNAME, 1, [Define to 1 if you have ptsname()]))
100 +AC_CHECK_FUNC(unlockpt, AC_DEFINE(HAVE_UNLOCKPT, 1, [Define to 1 if you have unlockpt()]))
101 +AC_CHECK_FUNC(_getpty, AC_DEFINE(HAVE__GETPTY, 1, [Define to 1 if you have _getpty()]))
102 +AC_CHECK_HEADER(pty.h, AC_DEFINE(HAVE_PTY_H, 1, [Define to 1 if you have pty.h]))
103 +AC_CHECK_HEADER(libutil.h, AC_DEFINE(HAVE_LIBUTIL_H, 1, [Define to 1 if you have libutil.h]))
104 +AC_CHECK_HEADER(util.h, AC_DEFINE(HAVE_UTIL_H, 1, [Define to 1 if you have util.h]))
107 +AC_CHECK_FUNC(mmap, AC_DEFINE(HAVE_MMAP, 1, [Define to 1 if you have mmap()]))
115 +dnl user fired --without-x, we disable FLTK checks
116 +if test "$have_x" = "yes"; then
129 +AC_ARG_VAR([PKG_CONFIG], [pkg-config command])
130 +AC_ARG_VAR([PKG_CONFIG_PATH], [A directory with .pc files for pkg-config])
132 +dnl jam don't like spaces in empty string so clear vars if --without-x is given
133 +if test "$have_x" = "yes"; then
134 + FLTK_LIBS="$FLTK_LIBS $LIBXPM_LIBS $LIBFAM_LIBS"
135 + FLTK_LIBS_FULL="$FLTK_LIBS_FULL $LIBXPM_LIBS $LIBFAM_LIBS"
141 +if test -n "$OPTIM_FLAGS"; then
142 + CFLAGS="$CFLAGS $OPTIM_FLAGS"
143 + CXXFLAGS="$CXXFLAGS $OPTIM_FLAGS"
145 + CFLAGS="$CFLAGS $DEBUG_FLAGS"
146 + CXXFLAGS="$CXXFLAGS $DEBUG_FLAGS"
149 +CFLAGS="$CFLAGS $LARGEFILE"
150 +CXXFLAGS="$CXXFLAGS $LARGEFILE"
152 +dnl this is issued from buildbot so edelib can be used from local directory
153 +if test -n "$EDELIB_USE_LOCALDIR"; then
160 +AC_SUBST(EDELIB_MAJOR_VERSION)
161 +AC_SUBST(EDELIB_MINOR_VERSION)
162 +AC_SUBST(EDELIB_PATCH_VERSION)
163 +AC_SUBST(EDELIB_API_VERSION)
164 +AC_SUBST(EDELIB_LIBTOOL_VERSION_STR)
165 +AC_SUBST(FLTK_CFLAGS)
167 +AC_SUBST(FLTK_LIBS_FULL)
168 +AC_SUBST(DBUS_CFLAGS)
175 +AC_SUBST(XDG_MIME_HAVE_MMAP)
176 +AC_SUBST(SCHEME_FLAGS)
177 +AC_SUBST(DMALLOC_LIBC)
178 +AC_SUBST(DMALLOC_LIBCXX)
180 +dnl specific stuf which goes to edelib-config.h
181 +AC_CONFIG_COMMANDS([outfile], [
182 + cat > $outfile <<\_____EOF
183 +/* generated file; please modify configure.in */
184 +#ifndef __EDELIB_EDELIB_CONFIG_H__
185 +#define __EDELIB_EDELIB_CONFIG_H__
189 + if test "x$have_iso_varargs" = "xyes"; then
190 + echo "#define EDELIB_HAVE_ISO_VARARGS 1" >> $outfile
193 + if test "x$have_gnuc_varargs" = "xyes"; then
194 + echo "#define EDELIB_HAVE_GNUC_VARARGS 1" >> $outfile
197 + if test "x$have_dbus" = "xyes"; then
198 + echo "#define EDELIB_HAVE_DBUS 1" >> $outfile
201 + if test "x$have_libxpm" = "xyes"; then
202 + echo "#define EDELIB_HAVE_LIBXPM 1" >> $outfile
205 + if test "x$fltk_have_xft" != "x"; then
206 + echo "#define EDELIB_HAVE_FLTK_XFT 1" >> $outfile
209 + if test "x$prefix" != "x"; then
210 + echo "#define EDELIB_INSTALL_PREFIX \"$prefix\"" >> $outfile
213 + cat >> $outfile <<\_____EOF
218 + outfile="edelib/edelib-config.h"
219 + have_iso_varargs=$have_iso_varargs
220 + have_gnuc_varargs=$have_gnuc_varargs
221 + have_dbus=$have_dbus
222 + have_libxpm=$have_libxpm
223 + fltk_have_xft=$fltk_have_xft
233 + edelib-gui-no-images.pc
235 + po/update-messages.sh
238 +chmod +x po/update-messages.sh
240 +# generate scheme include files
242 +./gen-c-string.sh init.ss > init_ss.h
243 +./gen-c-string.sh theme.ss > theme_ss.h
247 +echo "#include \"edelib/_conf.h\"" > config.h
248 diff -Nru edelib-2.0.old/Makefile.am edelib-2.0/Makefile.am
249 --- edelib-2.0.old/Makefile.am 1970-01-01 01:00:00.000000000 +0100
250 +++ edelib-2.0/Makefile.am 2012-07-24 19:19:34.000000000 +0200
253 +# $Id: Jamfile 3233 2012-04-03 11:48:19Z karijes $
255 +# Copyright (c) 2005-2012 edelib authors
257 +# This library is free software; you can redistribute it and/or
258 +# modify it under the terms of the GNU Lesser General Public
259 +# License as published by the Free Software Foundation; either
260 +# version 2 of the License, or (at your option) any later version.
262 +# This library is distributed in the hope that it will be useful,
263 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
264 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
265 +# Lesser General Public License for more details.
267 +# You should have received a copy of the GNU Lesser General Public License
268 +# along with this library. If not, see <http://www.gnu.org/licenses/>.
270 +AUTOMAKE_OPTIONS = subdir-objects
271 +ACLOCAL_AMFLAGS = -I m4
273 +INCLUDES = -I$(top_srcdir) \
274 + -DE_LOG_DOMAIN=\"edelib\"
277 + tools/edelib-script/edelib-script \
278 + tools/edelib-dbus-introspect/edelib-dbus-introspect \
279 + tools/edelib-update-font-cache/edelib-update-font-cache
281 +dist_bin_SCRIPTS = \
282 + tools/edelib-convert-icontheme \
283 + tools/edelib-mk-indextheme
288 +lib_LTLIBRARIES = lib/libedelib.la \
289 + lib/libedelib_gui.la \
290 + lib/libedelib_dbus.la
295 + src/xdgmime/xdgmime.c \
296 + src/xdgmime/xdgmimealias.c \
297 + src/xdgmime/xdgmimecache.c \
298 + src/xdgmime/xdgmimeglob.c \
299 + src/xdgmime/xdgmimeicon.c \
300 + src/xdgmime/xdgmimeint.c \
301 + src/xdgmime/xdgmimemagic.c \
302 + src/xdgmime/xdgmimeparent.c
304 +tinyscheme_files = \
308 +pcre_files = src/pcre/pcre.c
310 +lib_libedelib_la_SOURCES = \
312 + $(tinyscheme_files) \
321 + src/DesktopFile.cpp \
322 + src/Directory.cpp \
325 + src/IconTheme.cpp \
330 + src/PtyProcess.cpp \
339 + src/TiXmlParser.cpp \
342 +libedelib_includedir = $(includedir)/edelib
343 +libedelib_include_HEADERS = \
347 + edelib/DateTime.h \
349 + edelib/DesktopFile.h \
350 + edelib/Directory.h \
351 + edelib/edelib-config.h \
352 + edelib/edelib-global.h \
354 + edelib/FileTest.h \
355 + edelib/for-each-macro.h \
356 + edelib/Functional.h \
357 + edelib/IconTheme.h \
358 + edelib/Listener.h \
360 + edelib/MimeType.h \
362 + edelib/Namespace.h \
365 + edelib/PtyProcess.h \
367 + edelib/Resource.h \
373 + edelib/TempFile.h \
378 +libedelib_ts_includedir = $(includedir)/edelib/ts
379 +libedelib_ts_include_HEADERS = \
380 + edelib/ts/opdefines.h \
381 + edelib/ts/scheme.h \
382 + edelib/ts/scheme-private.h
384 +lib_libedelib_la_LDFLAGS = -version-info @EDELIB_LIBTOOL_VERSION_STR@
388 + src/sdbm/sdbm_hash.c \
389 + src/sdbm/sdbm_pair.c
391 +lib_libedelib_gui_la_SOURCES = \
393 + src/AnimateBox.cpp \
396 + src/ExpandableGroup.cpp \
397 + src/FontCache.cpp \
398 + src/FontChooser.cpp \
399 + src/ForeignCallback.cpp \
400 + src/IconChooser.cpp \
401 + src/IconLoader.cpp \
404 + src/MenuButton.cpp \
407 + src/Menu_global.cpp \
408 + src/MessageBox.cpp \
410 + src/SchemeEditor.cpp \
412 + src/TableBase.cpp \
414 + src/ThemeLoader.cpp \
416 + src/WindowUtils.cpp \
417 + src/XSettingsClient.cpp \
418 + src/XSettingsCommon.cpp \
419 + src/XSettingsManager.cpp
421 +libedelib_gui_includedir = $(includedir)/edelib
422 +libedelib_gui_include_HEADERS = \
423 + edelib/AnimateBox.h \
424 + edelib/DirWatch.h \
426 + edelib/ExpandableGroup.h \
427 + edelib/FontCache.h \
428 + edelib/FontChooser.h \
429 + edelib/ForeignCallback.h \
430 + edelib/IconChooser.h \
431 + edelib/IconLoader.h \
433 + edelib/MenuBase.h \
434 + edelib/MenuButton.h \
435 + edelib/MenuItem.h \
436 + edelib/MessageBox.h \
438 + edelib/SchemeEditor.h \
439 + edelib/SevenSeg.h \
440 + edelib/TableBase.h \
442 + edelib/ThemeLoader.h \
444 + edelib/WindowUtils.h \
445 + edelib/WindowXid.h \
446 + edelib/XSettingsClient.h \
447 + edelib/XSettingsCommon.h \
448 + edelib/XSettingsManager.h
450 +lib_libedelib_gui_la_CXXFLAGS = @FLTK_CFLAGS@
451 +lib_libedelib_gui_la_LDFLAGS = -version-info @EDELIB_LIBTOOL_VERSION_STR@
452 +lib_libedelib_gui_la_LIBADD = lib/libedelib.la @FLTK_LIBS_FULL@
454 +lib_libedelib_dbus_la_SOURCES = \
455 + src/EdbusConnection.cpp \
456 + src/EdbusData.cpp \
457 + src/EdbusDict.cpp \
458 + src/EdbusError.cpp \
459 + src/EdbusList.cpp \
460 + src/EdbusMessage.cpp \
461 + src/EdbusObjectPath.cpp
463 +libedelib_dbus_includedir = $(includedir)/edelib
464 +libedelib_dbus_include_HEADERS = \
465 + edelib/EdbusConnection.h \
466 + edelib/EdbusContainer.h \
467 + edelib/EdbusData.h \
468 + edelib/EdbusDict.h \
469 + edelib/EdbusError.h \
470 + edelib/EdbusList.h \
471 + edelib/EdbusMessage.h \
472 + edelib/EdbusObjectPath.h
474 +lib_libedelib_dbus_la_CFLAGS = @FLTK_CFLAGS@ @DBUS_CFLAGS@
475 +lib_libedelib_dbus_la_CXXFLAGS = @FLTK_CFLAGS@ @DBUS_CFLAGS@
476 +lib_libedelib_dbus_la_LDFLAGS = -version-info @EDELIB_LIBTOOL_VERSION_STR@
477 +lib_libedelib_dbus_la_LIBADD = lib/libedelib.la @DBUS_LIBS@ @FLTK_LIBS@
482 +test_run_tests_SOURCES = \
483 + test/UnitTest.cpp \
489 + test/file_test.cpp \
490 + test/directory.cpp \
491 + test/datetime.cpp \
493 + test/resource.cpp \
494 + test/desktopfile.cpp \
502 + test/temp_file.cpp \
503 + test/functional.cpp \
505 + test/run_tests.cpp \
507 + test/xsettings.cpp \
510 +test_run_tests_CXXFLAGS = @FLTK_CFLAGS@ @DBUS_CFLAGS@
511 +test_run_tests_LDADD = \
512 + lib/libedelib_dbus.la \
513 + lib/libedelib_gui.la \
515 + @FLTK_LIBS_FULL@ @DBUS_LIBS@
517 +tools_edelib_script_edelib_script_SOURCES = tools/edelib-script/edelib-script.cpp
518 +tools_edelib_script_edelib_script_LDADD = lib/libedelib.la
520 +tools_edelib_dbus_introspect_edelib_dbus_introspect_SOURCES = tools/edelib-dbus-introspect/edelib-dbus-introspect.cpp
521 +tools_edelib_dbus_introspect_edelib_dbus_introspect_CXXFLAGS = @FLTK_CFLAGS@ @DBUS_CFLAGS@
522 +tools_edelib_dbus_introspect_edelib_dbus_introspect_LDADD = \
523 + lib/libedelib_dbus.la \
524 + lib/libedelib_gui.la \
526 + @FLTK_LIBS_FULL@ @DBUS_LIBS@
528 +tools_edelib_update_font_cache_edelib_update_font_cache_SOURCES = tools/edelib-update-font-cache/edelib-update-font-cache.cpp
529 +tools_edelib_update_font_cache_edelib_update_font_cache_CXXFLAGS = @FLTK_CFLAGS@
530 +tools_edelib_update_font_cache_edelib_update_font_cache_LDADD = \
531 + lib/libedelib_gui.la \
537 +pkgconfigdir = $(libdir)/pkgconfig
538 +pkgconfig_DATA = edelib.pc edelib-gui.pc edelib-gui-no-images.pc edelib-dbus.pc
542 +dist_doc_DATA = README COPYING
546 +sslibdir = $(libdir)/edelib/sslib
557 + edelib-gui-no-images.pc \
569 + edelib/_conf.h.in \
570 + edelib/edelib-config.h
577 + @echo "Building documentation..."
580 + @echo "*** doxygen not found, documentation will not be built."
584 + cd test && ./run-all.sh
587 + rm -Rf $(docdir)/html
590 + rm -Rf autom4te.cache