1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
diff -aur saf-0.1/configure.ac saf-0.1.new/configure.ac
--- saf-0.1/configure.ac 2013-01-01 18:34:04.000000000 +0400
+++ saf-0.1.new/configure.ac 2013-08-25 17:06:07.116844632 +0400
@@ -1,29 +1,32 @@
AC_PREREQ([2.68])
AC_INIT([SAF],[0.1],[udo.eisenbarth@arcor.de],[],[http://lasercalc.sourceforge.net])
AM_INIT_AUTOMAKE([-Wall -Werror])
+AM_PROG_AR
LT_PREREQ([2.4.2])
LT_INIT([dlopen])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([src/SAF.cpp])
AC_CONFIG_MACRO_DIR([m4])
# Check host system type (windows or linux) and define $host_os
-AC_CANONICAL_HOST
+AC_CANONICAL_HOST
AC_LANG([C++])
AC_PROG_CXX
+
# Check for wxWidget libraries
-WX_CONFIG_OPTIONS
-WX_CONFIG_CHECK(2.9.4,wxWin=1,,[std,propgrid,richtext],$WXOPTIONS)
+AM_OPTIONS_WXCONFIG
+AM_PATH_WXCONFIG(2.9.4, wxWin=1)
if test "$wxWin" != 1; then
AC_MSG_ERROR([
- wxWidgets must be installed on your system.
-
+ wxWidgets must be installed on your system
+ but wx-config script couldn't be found.
+
Please check that wx-config is in path, the directory
where wxWidgets libraries are installed (returned by
- 'wx-config --libs' or 'wx-config --static --libs' command)
- is in LD_LIBRARY_PATH or equivalent variable and
- wxWidgets version is $reqwx or above.
- ])
+ 'wx-config --libs' command) is in LD_LIBRARY_PATH or
+ equivalent variable and wxWidgets version is 2.3.4 or above.
+ ])
fi
+
AC_ARG_ENABLE(debug,
[[ --enable-debug compile with debug settings]],
[
@@ -34,8 +37,11 @@
[
CXXCONF="-O3 -DNDEBUG"
])
-CPPFLAGS="$CPPFLAGS -D__GXX_EXPERIMENTAL_CXX0X__ $WX_CPPFLAGS -I/usr/local/include"
-CXXFLAGS="-std=c++0x -Wall -Wextra -pedantic $CXXCONF $WX_CXXFLAGS_ONLY"
-LIBS="$LIBS $WX_LIBS"
+
+CPPFLAGS="$WX_CPPFLAGS $CPPFLAGS"
+CXXFLAGS="-std=c++0x -Wall -Wextra -pedantic $CXXCONF $WX_CXXFLAGS_ONLY $CXXFLAGS"
+CFLAGS="$WX_CFLAGS_ONLY $CFLAGS"
+
+LIBS="$WX_LIBS `$WX_CONFIG_WITH_ARGS --optional-libs richtext propgrid` $LIBS"
AC_CONFIG_FILES(Makefile include/Makefile src/Makefile demo/Makefile)
AC_OUTPUT
diff -aur saf-0.1/demo/Makefile.am saf-0.1.new/demo/Makefile.am
--- saf-0.1/demo/Makefile.am 2012-12-30 13:45:20.000000000 +0400
+++ saf-0.1.new/demo/Makefile.am 2013-08-25 17:08:03.072334999 +0400
@@ -3,4 +3,4 @@
safdemo_CPPFLAGS = -I$(top_srcdir)/include
safdemo_LDADD = \
../src/libsaf.la \
- /usr/local/lib/libproperties.la
+ -lproperties
diff -aur saf-0.1/Makefile.am saf-0.1.new/Makefile.am
--- saf-0.1/Makefile.am 2012-12-29 16:55:06.000000000 +0400
+++ saf-0.1.new/Makefile.am 2013-08-25 17:07:46.352504589 +0400
@@ -1,2 +1,2 @@
-ACLOCAL_AMFLAGS = -I m4 -I /usr/local/share/aclocal
-SUBDIRS= include src demo
+ACLOCAL_AMFLAGS=-I m4
+SUBDIRS=include src demo
|