redoconf: assorted minor fixes.
- libqt4.rc: add detection of the 'moc' command in $MOC. - libssl.rc: add detection script for openssl. - default.do.sh: provide a die() function to all .od files. It's just too useful to not have it (I haven't converted everything to it yet). - When building out/x/y.z, match against $S/default.z.od and $S/default.od if they exist. - *.list files (lists of source/object files to include in a binary) can now contain *.o files in addition to *.c, *.cc, etc. - rename compile() to _compile() to avoid polluting the namespace for scripts called from default.do.sh. - When building a .so file in the top level directory, no need to make a symlink of it into the top level directory. - link.od and link-shlib.od forgot to make use of the $xLIBS variable.
This commit is contained in:
parent
1e2fc9be8a
commit
49f85f2156
6 changed files with 62 additions and 23 deletions
|
|
@ -5,6 +5,14 @@ prog='
|
|||
#include <QVector>
|
||||
'
|
||||
|
||||
rc_pkg_detect LIBQT4 QtCore \
|
||||
rc_pkg_detect LIBQT4 QtGui \
|
||||
rc_compile cxx link "$prog"
|
||||
|
||||
for d in "$MOC" moc-qt4 moc; do
|
||||
if type "$d" >/dev/null 2>&1; then
|
||||
rc_replaceln MOC "$d"
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
rc_save
|
||||
|
|
|
|||
10
redoconf/rc/libssl.rc.od
Normal file
10
redoconf/rc/libssl.rc.od
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
. ./redoconf.rc
|
||||
rc_include rc/CC.rc rc/pkg-config.rc
|
||||
|
||||
prog="
|
||||
#include <openssl/ssl.h>
|
||||
"
|
||||
|
||||
rc_pkg_detect LIBSSL "libssl libcrypto" \
|
||||
rc_compile cc link "$prog"
|
||||
rc_save
|
||||
Loading…
Add table
Add a link
Reference in a new issue