Reserve $LIBS and @LIBS@ for the system libraries that can be passed to
the configure script. git-svn-id: http://voip.null.ro/svn/yate@2678 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
parent
420d40693e
commit
e301807aa1
|
@ -316,7 +316,7 @@ Makefile: @srcdir@/Makefile.in $(MKDEPS)
|
||||||
./config.status
|
./config.status
|
||||||
|
|
||||||
yate: libyate.so $(OBJS) $(LIBS)
|
yate: libyate.so $(OBJS) $(LIBS)
|
||||||
$(LINK) -o $@ $(LIBTHR) $^
|
$(LINK) -o $@ $(LIBTHR) $^ @LIBS@
|
||||||
|
|
||||||
libyate.so: $(YLIB)
|
libyate.so: $(YLIB)
|
||||||
ln -sf $^ $@
|
ln -sf $^ $@
|
||||||
|
|
|
@ -132,7 +132,7 @@ Makefile: @srcdir@/Makefile.in $(MKDEPS)
|
||||||
cd .. && ./config.status
|
cd .. && ./config.status
|
||||||
|
|
||||||
yate-%: @srcdir@/main-%.cpp $(MKDEPS) ../libyate.so $(INCFILES)
|
yate-%: @srcdir@/main-%.cpp $(MKDEPS) ../libyate.so $(INCFILES)
|
||||||
$(COMPILE) -o $@ $(LOCALFLAGS) $< $(LIBTHR) $(LDFLAGS) $(LOCALLIBS)
|
$(COMPILE) -o $@ $(LOCALFLAGS) $< $(LIBTHR) $(LDFLAGS) $(LOCALLIBS) @LIBS@
|
||||||
|
|
||||||
yate-qt4: $(QTCLIENT)
|
yate-qt4: $(QTCLIENT)
|
||||||
yate-qt4: LDFLAGS := $(QTCLIENT) $(LDFLAGS)
|
yate-qt4: LDFLAGS := $(QTCLIENT) $(LDFLAGS)
|
||||||
|
|
|
@ -96,6 +96,7 @@ AC_CHECK_FUNCS([gettimeofday inet_ntoa memmove strerror], , [AC_MSG_ERROR([This
|
||||||
|
|
||||||
AC_CACHE_SAVE
|
AC_CACHE_SAVE
|
||||||
|
|
||||||
|
SAVE_LIBS="$LIBS"
|
||||||
# Checks for required libraries.
|
# Checks for required libraries.
|
||||||
THREAD_LIB=""
|
THREAD_LIB=""
|
||||||
AC_CHECK_LIB([pthread], [pthread_mutexattr_settype], [THREAD_LIB="-lpthread"])
|
AC_CHECK_LIB([pthread], [pthread_mutexattr_settype], [THREAD_LIB="-lpthread"])
|
||||||
|
@ -115,6 +116,8 @@ AC_CHECK_LIB([dl], [dlopen], , [AC_MSG_ERROR([This function is required.])])
|
||||||
DLOPEN_LIB="-ldl"
|
DLOPEN_LIB="-ldl"
|
||||||
fi
|
fi
|
||||||
AC_SUBST(DLOPEN_LIB)
|
AC_SUBST(DLOPEN_LIB)
|
||||||
|
# Restore the system libs
|
||||||
|
LIBS="$SAVE_LIBS"
|
||||||
|
|
||||||
MUTEX_HACK=""
|
MUTEX_HACK=""
|
||||||
AC_MSG_CHECKING([for pthread_mutexattr_settype declaration])
|
AC_MSG_CHECKING([for pthread_mutexattr_settype declaration])
|
||||||
|
|
|
@ -8,7 +8,7 @@ CC := @CC@ -Wall
|
||||||
CXX := @CXX@ -Wall
|
CXX := @CXX@ -Wall
|
||||||
SED := sed
|
SED := sed
|
||||||
DEFS :=
|
DEFS :=
|
||||||
LIBAUX:= @DLOPEN_LIB@
|
LIBAUX:= @DLOPEN_LIB@ @LIBS@
|
||||||
LIBTHR:= @THREAD_LIB@
|
LIBTHR:= @THREAD_LIB@
|
||||||
INCLUDES := -I.. -I@top_srcdir@
|
INCLUDES := -I.. -I@top_srcdir@
|
||||||
CFLAGS := @CFLAGS@ @MODULE_CFLAGS@ @INLINE_FLAGS@
|
CFLAGS := @CFLAGS@ @MODULE_CFLAGS@ @INLINE_FLAGS@
|
||||||
|
|
|
@ -57,7 +57,7 @@ Makefile: @srcdir@/Makefile.in ../../config.status
|
||||||
cd ../.. && ./config.status
|
cd ../.. && ./config.status
|
||||||
|
|
||||||
../../$(LIBD_VER): $(OBJS) $(YXML)
|
../../$(LIBD_VER): $(OBJS) $(YXML)
|
||||||
$(LINK) -shared -o $@ -Wl,--soname=$(LIBD_VER) $^
|
$(LINK) -shared -o $@ -Wl,--soname=$(LIBD_VER) $^ @LIBS@
|
||||||
|
|
||||||
../../$(LIBD_DEV): ../../$(LIBD_VER)
|
../../$(LIBD_DEV): ../../$(LIBD_VER)
|
||||||
cd ../.. && ln -sf $(LIBD_VER) $(LIBD_DEV)
|
cd ../.. && ln -sf $(LIBD_VER) $(LIBD_DEV)
|
||||||
|
|
|
@ -56,7 +56,7 @@ Makefile: @srcdir@/Makefile.in ../../config.status
|
||||||
cd ../.. && ./config.status
|
cd ../.. && ./config.status
|
||||||
|
|
||||||
../../$(LIBD_VER): $(OBJS)
|
../../$(LIBD_VER): $(OBJS)
|
||||||
$(LINK) -shared -o $@ -Wl,--soname=$(LIBD_VER) $^
|
$(LINK) -shared -o $@ -Wl,--soname=$(LIBD_VER) $^ @LIBS@
|
||||||
|
|
||||||
../../$(LIBD_DEV): ../../$(LIBD_VER)
|
../../$(LIBD_DEV): ../../$(LIBD_VER)
|
||||||
cd ../.. && ln -sf $(LIBD_VER) $(LIBD_DEV)
|
cd ../.. && ln -sf $(LIBD_VER) $(LIBD_DEV)
|
||||||
|
|
|
@ -64,13 +64,13 @@ Makefile: @srcdir@/Makefile.in ../../config.status
|
||||||
cd ../.. && ./config.status
|
cd ../.. && ./config.status
|
||||||
|
|
||||||
../../$(LIBD_VER): $(OBJS)
|
../../$(LIBD_VER): $(OBJS)
|
||||||
$(LINK) -shared -o $@ -Wl,--soname=$(LIBD_VER) $^
|
$(LINK) -shared -o $@ -Wl,--soname=$(LIBD_VER) $^ @LIBS@
|
||||||
|
|
||||||
../../$(LIBD_DEV): ../../$(LIBD_VER)
|
../../$(LIBD_DEV): ../../$(LIBD_VER)
|
||||||
cd ../.. && ln -sf $(LIBD_VER) $(LIBD_DEV)
|
cd ../.. && ln -sf $(LIBD_VER) $(LIBD_DEV)
|
||||||
|
|
||||||
yate-%: @srcdir@/main-%.cpp $(MKDEPS) $(LIBS) ../../libyate.so $(INCFILES)
|
yate-%: @srcdir@/main-%.cpp $(MKDEPS) $(LIBS) ../../libyate.so $(INCFILES)
|
||||||
$(COMPILE) -o $@ $(LOCALFLAGS) $< $(LIBTHR) $(LDFLAGS) $(LOCALLIBS)
|
$(COMPILE) -o $@ $(LOCALFLAGS) $< $(LIBTHR) $(LDFLAGS) $(LOCALLIBS) @LIBS@
|
||||||
|
|
||||||
$(LIBS): $(OBJS)
|
$(LIBS): $(OBJS)
|
||||||
$(AR) rcs $@ $^
|
$(AR) rcs $@ $^
|
||||||
|
|
|
@ -196,22 +196,22 @@ Makefile: @srcdir@/Makefile.in $(MKDEPS)
|
||||||
cd .. && ./config.status
|
cd .. && ./config.status
|
||||||
|
|
||||||
lib%.so: %.o
|
lib%.so: %.o
|
||||||
$(LINK) -shared -o $@ $^
|
$(LINK) -shared -o $@ $^ @LIBS@
|
||||||
|
|
||||||
server/%.yate: @srcdir@/server/%.cpp $(MKDEPS) $(INCFILES)
|
server/%.yate: @srcdir@/server/%.cpp $(MKDEPS) $(INCFILES)
|
||||||
$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS)
|
$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS) @LIBS@
|
||||||
|
|
||||||
client/%.yate: @srcdir@/client/%.cpp $(MKDEPS) $(INCFILES)
|
client/%.yate: @srcdir@/client/%.cpp $(MKDEPS) $(INCFILES)
|
||||||
$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS)
|
$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS) @LIBS@
|
||||||
|
|
||||||
qt4/%.yate: @srcdir@/qt4/%.cpp $(MKDEPS) $(INCFILES)
|
qt4/%.yate: @srcdir@/qt4/%.cpp $(MKDEPS) $(INCFILES)
|
||||||
$(MODCOMP) -o $@ $(LOCALFLAGS) @QT4_INC@ -I@top_srcdir@/clients/qt4 $< $(LOCALLIBS) @QT4_LIB@
|
$(MODCOMP) -o $@ $(LOCALFLAGS) @QT4_INC@ -I@top_srcdir@/clients/qt4 $< $(LOCALLIBS) @QT4_LIB@ @LIBS@
|
||||||
|
|
||||||
qt4/%.moc: @srcdir@/qt4/%.h $(MKDEPS) $(INCFILES)
|
qt4/%.moc: @srcdir@/qt4/%.h $(MKDEPS) $(INCFILES)
|
||||||
mkdir -p qt4 && $(MOC) $(DEFS) $(INCLUDES) @QT4_INC@ -I@top_srcdir@/clients/qt4 -I@srcdir@/qt4 -o $@ $<
|
mkdir -p qt4 && $(MOC) $(DEFS) $(INCLUDES) @QT4_INC@ -I@top_srcdir@/clients/qt4 -I@srcdir@/qt4 -o $@ $<
|
||||||
|
|
||||||
%.yate: @srcdir@/%.cpp $(MKDEPS) $(INCFILES)
|
%.yate: @srcdir@/%.cpp $(MKDEPS) $(INCFILES)
|
||||||
$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS)
|
$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS) @LIBS@
|
||||||
|
|
||||||
# Take special care of the modules that depend on optional libs
|
# Take special care of the modules that depend on optional libs
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue