From 4216e3e056b69dce870c45fa4471a7db6ccce299 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 14 Mar 2014 18:04:07 -0400 Subject: [PATCH] remove DYNAMIC_LIB_EXTEN because we use libtool to figure this all out now --- Makefile.am | 2 +- build/modmake.rules.in | 1 - configure.ac | 13 +------------ libs/freetdm/Makefile.am | 6 +++--- libs/freetdm/configure.ac | 12 ------------ libs/libdingaling/configure.ac | 6 ------ libs/openzap/Makefile.am | 6 +++--- libs/openzap/configure.ac | 11 ----------- libs/srtp/configure.ac | 7 ------- 9 files changed, 8 insertions(+), 56 deletions(-) diff --git a/Makefile.am b/Makefile.am index 50f05dcfa2..f5c7f2ee86 100644 --- a/Makefile.am +++ b/Makefile.am @@ -773,7 +773,7 @@ modclean: $(switch_builddir)/modules.conf @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) clean modwipe: - rm -f $(modulesdir)/*.${DYNAMIC_LIB_EXTEN} $(modulesdir)/*.la + rm -f $(modulesdir)/*.so $(modulesdir)/*.la $(modulesdir)/*.dll $(modulesdir)/*.dylib dox: cd docs && doxygen $(PWD)/docs/Doxygen.conf diff --git a/build/modmake.rules.in b/build/modmake.rules.in index 3a27af690a..9168b1692e 100644 --- a/build/modmake.rules.in +++ b/build/modmake.rules.in @@ -47,7 +47,6 @@ DEFS=@DEFS@ DYLD_LIBRARY_PATH=@libdir@:$DYLD_LIBRARY_PATH LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH OSARCH=`uname -s` -DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ LIBTOOL_LIB_EXTEN = @LIBTOOL_LIB_EXTEN@ SOLINK = @SOLINK@ diff --git a/configure.ac b/configure.ac index 8dd59c486b..225886bc0b 100644 --- a/configure.ac +++ b/configure.ac @@ -236,16 +236,6 @@ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then else AC_ERROR([Please update configure.in with SOLINK values for your compiler]) fi -# set DYNAMIC_LIB_EXTEN -# we should really be using libtool so we don't need to do this -case "$host" in - *cygwin* | *mingw*) - DYNAMIC_LIB_EXTEN="dll" - ;; - *) - DYNAMIC_LIB_EXTEN="so" - ;; -esac ## # detect libtool major version, @@ -263,7 +253,7 @@ if test -z "$LIBTOOL_MAJOR_VERSION" ; then fi AC_MSG_RESULT([${LIBTOOL_MAJOR_VERSION}]) -LIBTOOL_LIB_EXTEN="$DYNAMIC_LIB_EXTEN" +LIBTOOL_LIB_EXTEN=so if test "${LIBTOOL_MAJOR_VERSION}" = "2" ; then LIBTOOL_LIB_EXTEN="la" @@ -626,7 +616,6 @@ AC_SUBST(ESL_LDFLAGS) AC_SUBST(PLATFORM_CORE_LDFLAGS) AC_SUBST(PLATFORM_CORE_LIBS) AC_SUBST(SOLINK) -AC_SUBST(DYNAMIC_LIB_EXTEN) AC_SUBST(LIBTOOL_LIB_EXTEN) # Checks for header files. diff --git a/libs/freetdm/Makefile.am b/libs/freetdm/Makefile.am index 7c0e419719..f6211e58e8 100644 --- a/libs/freetdm/Makefile.am +++ b/libs/freetdm/Makefile.am @@ -270,16 +270,16 @@ endif dox doxygen: doxygen $(FT_SRCDIR)/docs/Doxygen.conf -mod_freetdm/mod_freetdm.$(DYNAMIC_LIB_EXTEN): libfreetdm.la mod_freetdm/mod_freetdm.c +mod_freetdm/mod_freetdm.so: libfreetdm.la mod_freetdm/mod_freetdm.c $(MAKE) -C mod_freetdm -mod_freetdm: mod_freetdm/mod_freetdm.$(DYNAMIC_LIB_EXTEN) +mod_freetdm: mod_freetdm/mod_freetdm.so mod_freetdm-install: mod_freetdm $(MAKE) -C mod_freetdm install mod_freetdm-clean: - @if [ -f mod_freetdm/mod_freetdm.$(DYNAMIC_LIB_EXTEN) ] ; then \ + @if [ -f mod_freetdm/mod_freetdm.so ] ; then \ $(MAKE) -C mod_freetdm clean ; \ fi diff --git a/libs/freetdm/configure.ac b/libs/freetdm/configure.ac index 0fe9246068..5236ad5920 100644 --- a/libs/freetdm/configure.ac +++ b/libs/freetdm/configure.ac @@ -120,18 +120,6 @@ if test "${enable_debug}" != "no"; then fi AC_SUBST([COMP_VENDOR_CFLAGS]) -# set DYNAMIC_LIB_EXTEN -# we should really be using libtool so we don't need to do this -case "$host" in -*cygwin* | *mingw*) - DYNAMIC_LIB_EXTEN="dll" - ;; -*) - DYNAMIC_LIB_EXTEN="so" - ;; -esac -AC_SUBST([DYNAMIC_LIB_EXTEN]) - AC_CHECK_LIB([dl], [dlopen]) AC_CHECK_LIB([pthread], [pthread_create]) AC_CHECK_LIB([m], [cos]) diff --git a/libs/libdingaling/configure.ac b/libs/libdingaling/configure.ac index dc0ae21bd6..57aa712c84 100755 --- a/libs/libdingaling/configure.ac +++ b/libs/libdingaling/configure.ac @@ -58,7 +58,6 @@ case "$host" in new_AM_LDFLAGS="" IN_LINE=inline fi - DYNAMIC_LIB_EXTEN="so" ;; *-darwin*) if test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then @@ -66,7 +65,6 @@ case "$host" in new_AM_CFLAGS="-DMACOSX" new_AM_LDFLAGS="" fi - DYNAMIC_LIB_EXTEN="dylib" IN_LINE=inline ;; x86_64-*-linux-gnu) @@ -80,7 +78,6 @@ case "$host" in new_AM_CFLAGS="-fPIC" new_AM_LDFLAGS="" fi - DYNAMIC_LIB_EXTEN="so" IN_LINE=inline ;; i*6-*-linux-gnu) @@ -94,7 +91,6 @@ case "$host" in new_AM_CFLAGS="-fpic" new_AM_LDFLAGS="" fi - DYNAMIC_LIB_EXTEN="so" IN_LINE=inline ;; *) @@ -108,7 +104,6 @@ case "$host" in new_AM_CFLAGS="-fPIC" new_AM_LDFLAGS="" fi - DYNAMIC_LIB_EXTEN="so" IN_LINE=inline esac @@ -125,7 +120,6 @@ fi AC_SUBST(new_AM_CFLAGS) AC_SUBST(new_AM_LDFLAGS) AC_SUBST(SOLINK) -AC_SUBST(DYNAMIC_LIB_EXTEN) AC_DEFINE_UNQUOTED([__inline__],[$IN_LINE],[sunpro is bad at inline]) # Checks for header files. diff --git a/libs/openzap/Makefile.am b/libs/openzap/Makefile.am index 2ef8da70ff..6292398eab 100644 --- a/libs/openzap/Makefile.am +++ b/libs/openzap/Makefile.am @@ -257,16 +257,16 @@ endif dox doxygen: cd docs && doxygen $(OZ_SRCDIR)/docs/Doxygen.conf -mod_openzap/mod_openzap.$(DYNAMIC_LIB_EXTEN): $(MYLIB) mod_openzap/mod_openzap.c +mod_openzap/mod_openzap.so: $(MYLIB) mod_openzap/mod_openzap.c cd mod_openzap && make -mod_openzap: mod_openzap/mod_openzap.$(DYNAMIC_LIB_EXTEN) +mod_openzap: mod_openzap/mod_openzap.so mod_openzap-install: mod_openzap cd mod_openzap && make install mod_openzap-clean: - @if [ -f mod_openzap/mod_openzap.$(DYNAMIC_LIB_EXTEN) ] ; then cd mod_openzap && make clean ; fi + @if [ -f mod_openzap/mod_openzap.so ] ; then cd mod_openzap && make clean ; fi install-data-local: $(mkinstalldirs) $(DESTDIR)$(PREFIX) diff --git a/libs/openzap/configure.ac b/libs/openzap/configure.ac index c16e11b97f..984a788927 100644 --- a/libs/openzap/configure.ac +++ b/libs/openzap/configure.ac @@ -105,22 +105,11 @@ else AC_ERROR([Please update configure.in with SOLINK values for your compiler]) fi -# set DYNAMIC_LIB_EXTEN -# we should really be using libtool so we don't need to do this -case "$host" in - *cygwin* | *mingw*) - DYNAMIC_LIB_EXTEN="dll" - ;; - *) - DYNAMIC_LIB_EXTEN="so" - ;; -esac DEFAULT_INCLUDES="-I. -I./src/include -I$(srcdir)" AC_SUBST(SOLINK) AC_SUBST(DEFAULT_INCLUDES) -AC_SUBST(DYNAMIC_LIB_EXTEN) AC_CHECK_LIB([dl], [dlopen]) AC_CHECK_LIB([pthread], [pthread_create]) diff --git a/libs/srtp/configure.ac b/libs/srtp/configure.ac index 3ddc2147b2..ba35f8b995 100644 --- a/libs/srtp/configure.ac +++ b/libs/srtp/configure.ac @@ -54,7 +54,6 @@ case "$host" in new_AM_LDFLAGS="" IN_LINE=inline fi - DYNAMIC_LIB_EXTEN="so" ;; *-darwin*) if test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then @@ -62,7 +61,6 @@ case "$host" in new_AM_CFLAGS="-DMACOSX" new_AM_LDFLAGS="" fi - DYNAMIC_LIB_EXTEN="dylib" ;; x86_64-*-linux-gnu) if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then @@ -75,7 +73,6 @@ case "$host" in new_AM_CFLAGS="-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops" new_AM_LDFLAGS="" fi - DYNAMIC_LIB_EXTEN="so" ;; i*6-*-linux-gnu) if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then @@ -88,19 +85,16 @@ case "$host" in new_AM_CFLAGS="-fpic -Wall -O4 -fexpensive-optimizations -funroll-loops" new_AM_LDFLAGS="" fi - DYNAMIC_LIB_EXTEN="so" ;; i*6*-*-freebsd*) SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops" new_AM_LDFLAGS="" - DYNAMIC_LIB_EXTEN="so" ;; x86_64-*-freebsd*|amd64-*-freebsd*) SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops" new_AM_LDFLAGS="" - DYNAMIC_LIB_EXTEN="so" ;; esac @@ -117,7 +111,6 @@ fi AC_SUBST(new_AM_CFLAGS) AC_SUBST(new_AM_LDFLAGS) AC_SUBST(SOLINK) -AC_SUBST(DYNAMIC_LIB_EXTEN) if test "x$FUNC_DEF" != "x"; then AC_DEFINE_UNQUOTED([__FUNCTION__],[$FUNC_DEF],[define it the right way ;)]) fi