kolan
/
gkrellm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop configure dependency on Gtk+2 

Remove Gtk+2 compile and link flags from all configure tests because:
- no test code depends on Gtk+2
- gkrellmd does not need Gtk+2 at all
- the cflags variable in the src/configure was misspelled and thus did
  not have any effect
This commit is contained in:
Stefan Gehn 2014-08-23 18:11:20 +02:00
parent 45898d3826
commit 320055e6c1
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/configure vendored
View File

@ -13,9 +13,6 @@ do
fi fi
done done
PKG_INCLUDE=`pkg-config gtk+-2.0 --cflags`
PKG_LIB=`pkg-config gtk+-2.0 --libs`
rm -f configure.h configure.log test test.o test.c rm -f configure.h configure.log test test.o test.c
touch configure.h touch configure.h
@ -54,8 +51,8 @@ int main()
} }
EOF EOF
$CC ${PKG_INCLUDE} -c test.c -o test.o 2>& 5 $CC -c test.c -o test.o 2>& 5
$CC test.o -o test ${PKG_LIBS} -lsensors 2>& 5 $CC test.o -o test -lsensors 2>& 5
if [ -x ./test ] && ./test if [ -x ./test ] && ./test
then then

18
src/configure vendored
View File

@ -32,8 +32,6 @@ touch configure.h
touch configure.mk touch configure.mk
exec 5>./configure.log exec 5>./configure.log
GTK_CFLAGS=$(pkg-config gtk+-2.0 --cflags 2>& 5)
GTK_LIBS=$(pkg-config gtk+-2.0 --libs 2>& 5)
CC=${CC-gcc} CC=${CC-gcc}
echo "CC : ${CC}" 1>& 5 echo "CC : ${CC}" 1>& 5
@ -69,8 +67,8 @@ int main()
} }
EOF EOF
$CC ${CFLAGS} ${GTK_INCLUDE} ${OPENSSL_INCLUDE} -c test.c -o test.o 2>& 5 || true $CC ${CFLAGS} ${OPENSSL_INCLUDE} -c test.c -o test.o 2>& 5 || true
$CC test.o -o test ${LINK_FLAGS} ${GTK_LIBS} ${OPENSSL_LIBS} 2>& 5 || true $CC test.o -o test ${LINK_FLAGS} ${OPENSSL_LIBS} 2>& 5 || true
if [ -x ./test ] && ./test if [ -x ./test ] && ./test
then then
@ -124,8 +122,8 @@ int main()
} }
EOF EOF
${CC} ${CFLAGS} ${GTK_INCLUDE} ${GNUTLS_INCLUDE} -c test.c -o test.o 2>& 5 || true ${CC} ${CFLAGS} ${GNUTLS_INCLUDE} -c test.c -o test.o 2>& 5 || true
${CC} test.o -o test ${LINK_FLAGS} ${GTK_LIBS} ${GNUTLS_LIBS} 2>& 5 || true ${CC} test.o -o test ${LINK_FLAGS} ${GNUTLS_LIBS} 2>& 5 || true
if [ -x ./test ] && ./test if [ -x ./test ] && ./test
then then
@ -166,8 +164,8 @@ int main()
} }
EOF EOF
${CC} ${CFLAGS} ${GTK_INCLUDE} ${PKG_NTLM_INCLUDE} -c test.c -o test.o 2>& 5 || true ${CC} ${CFLAGS} ${PKG_NTLM_INCLUDE} -c test.c -o test.o 2>& 5 || true
${CC} test.o -o test ${LINK_FLAGS} ${GTK_LIBS} ${PKG_NTLM_LIBS} 2>& 5 || true ${CC} test.o -o test ${LINK_FLAGS} ${PKG_NTLM_LIBS} 2>& 5 || true
if [ -x ./test ] && ./test if [ -x ./test ] && ./test
then then
@ -216,8 +214,8 @@ int main()
} }
EOF EOF
${CC} ${CFLAGS} ${GTK_INCLUDE} -c test.c -o test.o 2>& 5 || true ${CC} ${CFLAGS} -c test.c -o test.o 2>& 5 || true
${CC} test.o -o test ${LINK_FLAGS} ${GTK_LIBS} -lsensors 2>& 5 || true ${CC} test.o -o test ${LINK_FLAGS} -lsensors 2>& 5 || true
if [ -x ./test ] && ./test if [ -x ./test ] && ./test
then then