blob: 4418e31b115a72ad5b346a55ed433fb2e2daf4b1 (
plain)
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
|
--- configure.ac.orig 2015-09-07 16:25:35.000000000 +0200
+++ configure.ac 2015-09-07 16:26:30.000000000 +0200
@@ -7,26 +7,17 @@
AM_INIT_AUTOMAKE(gsmc, 1.0, ik5nax@amsat.org)
# Checks for programs.
-AC_PROG_CC
-pkg_modules="gtk+-2.0"
-PKG_CHECK_MODULES(PACKAGE,[$pkg_modules])
+AM_PROG_CC_C_O
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
# Checks for libraries.
-LIBS=" "
-PKG_LIB2=`pkg-config --libs gtk+-2.0`
-PKG_LIB=""
-for i in $PKG_LIB2 ; do
- case $i in
- -l*) PKG_LIB="$i $PKG_LIB" ;;
- -L*) LIBS="$i $LIBS" ;;
- esac
-done
-for i in $PKG_LIB ; do
- j=${i#'-l'}
- AC_CHECK_LIB($j,main)
-done
+PKG_PROG_PKG_CONFIG
+PKG_CHECK_MODULES([GTK], [gtk+-2.0])
+dnl Check for libm for floor
+AC_SEARCH_LIBS([floor], [m], [], [
+ AC_MSG_ERROR([unable to find the floor() function])
+])
# Checks for header files.
AC_HEADER_STDC
--- Makefile.am.orig 2011-01-12 18:14:55.633360421 -0200
+++ Makefile.am 2011-01-12 20:37:21.034615478 -0200
@@ -2,8 +2,8 @@
bin_PROGRAMS=gsmc
gsmc_SOURCES= autotune.c calc.c dataconv.c draw.c main.c print.c widget.c autotune.h calc.h dataconv.h draw.h main.h print.h widget.h
-INCLUDES=@PACKAGE_CFLAGS@
-LIBS=@PACKAGE_LIBS@
+gsmc_CFLAGS = $(AM_CFLAGS) $(GTK_CFLAGS)
+gsmc_LDADD = $(AM_LDADD) $(GTK_LIBS)
EXTRA_DIST=gsmc.1.in gtkrc TODO
-man_MANS=gsmc.1
\ No newline at end of file
+man_MANS=gsmc.1
|
GitWeb
