Cleaned up configure file. (d20abae2) · Commits · csst-pipeline / msc / sextractor

Makefile.in

+4 −0

Original line number	Diff line number	Diff line
		@@ -711,6 +711,10 @@ rpm: dist
		rpm-icc: dist
		cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
		USE_ICC="1" rpmbuild -ba --clean --nodeps $(PACKAGE_NAME).spec

		rpm-best: dist
		cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
		USE_BEST="1" rpmbuild -ba --clean --nodeps $(PACKAGE_NAME).spec
		# Tell versions [3.59,3.63) of GNU make to not export all variables.
		# Otherwise a system limit (for SysV at least) may be exceeded.
		.NOEXPORT:

configure

+42 −44

Original line number	Diff line number	Diff line
		@@ -921,8 +921,8 @@ enable_option_checking
		enable_auto_flags
		enable_icc
		enable_dependency_tracking
		enable_static
		enable_shared
		enable_static
		enable_fast_install
		with_gnu_ld
		enable_libtool_lock
		@@ -1589,8 +1589,8 @@ Optional Features:
		compiler (off by default)
		--disable-dependency-tracking speeds up one-time build
		--enable-dependency-tracking do not reject slow dependency extractors
		--enable-static[=PKGS] build static libraries [default=no]
		--enable-shared[=PKGS] build shared libraries [default=yes]
		--enable-static[=PKGS] build static libraries [default=yes]
		--enable-fast-install[=PKGS]
		optimize for fast installation [default=yes]
		--disable-libtool-lock avoid locking (might break parallel builds)
		@@ -4541,53 +4541,51 @@ fi
		$as_echo "$prog_cc_optim_flags" >&6; }

		fi
		# Check whether --enable-static was given.
		if test "${enable_static+set}" = set; then
		enableval=$enable_static; p=${PACKAGE-default}
		# Check whether --enable-shared was given.
		if test "${enable_shared+set}" = set; then
		enableval=$enable_shared; p=${PACKAGE-default}
		case $enableval in
		yes) enable_static=yes ;;
		no) enable_static=no ;;
		yes) enable_shared=yes ;;
		no) enable_shared=no ;;
		*)
		enable_static=no
		enable_shared=no
		# Look at the argument we got. We use all the common list separators.
		lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
		for pkg in $enableval; do
		IFS="$lt_save_ifs"
		if test "X$pkg" = "X$p"; then
		enable_static=yes
		enable_shared=yes
		fi
		done
		IFS="$lt_save_ifs"
		;;
		esac
		else
		enable_static=no
		enable_shared=yes
		fi



		#AC_DISABLE_SHARED
		# Check whether --enable-shared was given.
		if test "${enable_shared+set}" = set; then
		enableval=$enable_shared; p=${PACKAGE-default}
		# Check whether --enable-static was given.
		if test "${enable_static+set}" = set; then
		enableval=$enable_static; p=${PACKAGE-default}
		case $enableval in
		yes) enable_shared=yes ;;
		no) enable_shared=no ;;
		yes) enable_static=yes ;;
		no) enable_static=no ;;
		*)
		enable_shared=no
		enable_static=no
		# Look at the argument we got. We use all the common list separators.
		lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
		for pkg in $enableval; do
		IFS="$lt_save_ifs"
		if test "X$pkg" = "X$p"; then
		enable_shared=yes
		enable_static=yes
		fi
		done
		IFS="$lt_save_ifs"
		;;
		esac
		else
		enable_shared=yes
		enable_static=yes
		fi


		@@ -5322,7 +5320,7 @@ ia64--hpux)
		;;
		--irix6*)
		# Find out which ABI we are using.
		echo '#line 5325 "configure"' > conftest.$ac_ext
		echo '#line 5323 "configure"' > conftest.$ac_ext
		if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
		(eval $ac_compile) 2>&5
		ac_status=$?
		@@ -8097,11 +8095,11 @@ else
		-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
		-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
		-e 's:$: $lt_compiler_flag:'`
		(eval echo "\"\$as_me:8100: $lt_compile\"" >&5)
		(eval echo "\"\$as_me:8098: $lt_compile\"" >&5)
		(eval "$lt_compile" 2>conftest.err)
		ac_status=$?
		cat conftest.err >&5
		echo "$as_me:8104: \$? = $ac_status" >&5
		echo "$as_me:8102: \$? = $ac_status" >&5
		if (exit $ac_status) && test -s "$ac_outfile"; then
		# The compiler can only warn and ignore the option if not recognized
		# So say no if there are warnings other than the usual output.
		@@ -8387,11 +8385,11 @@ else
		-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
		-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
		-e 's:$: $lt_compiler_flag:'`
		(eval echo "\"\$as_me:8390: $lt_compile\"" >&5)
		(eval echo "\"\$as_me:8388: $lt_compile\"" >&5)
		(eval "$lt_compile" 2>conftest.err)
		ac_status=$?
		cat conftest.err >&5
		echo "$as_me:8394: \$? = $ac_status" >&5
		echo "$as_me:8392: \$? = $ac_status" >&5
		if (exit $ac_status) && test -s "$ac_outfile"; then
		# The compiler can only warn and ignore the option if not recognized
		# So say no if there are warnings other than the usual output.
		@@ -8491,11 +8489,11 @@ else
		-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
		-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
		-e 's:$: $lt_compiler_flag:'`
		(eval echo "\"\$as_me:8494: $lt_compile\"" >&5)
		(eval echo "\"\$as_me:8492: $lt_compile\"" >&5)
		(eval "$lt_compile" 2>out/conftest.err)
		ac_status=$?
		cat out/conftest.err >&5
		echo "$as_me:8498: \$? = $ac_status" >&5
		echo "$as_me:8496: \$? = $ac_status" >&5
		if (exit $ac_status) && test -s out/conftest2.$ac_objext
		then
		# The compiler can only warn and ignore the option if not recognized
		@@ -10878,7 +10876,7 @@ else
		lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
		lt_status=$lt_dlunknown
		cat > conftest.$ac_ext <<EOF
		#line 10881 "configure"
		#line 10879 "configure"
		#include "confdefs.h"

		#if HAVE_DLFCN_H
		@@ -10978,7 +10976,7 @@ else
		lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
		lt_status=$lt_dlunknown
		cat > conftest.$ac_ext <<EOF
		#line 10981 "configure"
		#line 10979 "configure"
		#include "confdefs.h"

		#if HAVE_DLFCN_H
		@@ -13406,11 +13404,11 @@ else
		-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
		-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
		-e 's:$: $lt_compiler_flag:'`
		(eval echo "\"\$as_me:13409: $lt_compile\"" >&5)
		(eval echo "\"\$as_me:13407: $lt_compile\"" >&5)
		(eval "$lt_compile" 2>conftest.err)
		ac_status=$?
		cat conftest.err >&5
		echo "$as_me:13413: \$? = $ac_status" >&5
		echo "$as_me:13411: \$? = $ac_status" >&5
		if (exit $ac_status) && test -s "$ac_outfile"; then
		# The compiler can only warn and ignore the option if not recognized
		# So say no if there are warnings other than the usual output.
		@@ -13510,11 +13508,11 @@ else
		-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
		-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
		-e 's:$: $lt_compiler_flag:'`
		(eval echo "\"\$as_me:13513: $lt_compile\"" >&5)
		(eval echo "\"\$as_me:13511: $lt_compile\"" >&5)
		(eval "$lt_compile" 2>out/conftest.err)
		ac_status=$?
		cat out/conftest.err >&5
		echo "$as_me:13517: \$? = $ac_status" >&5
		echo "$as_me:13515: \$? = $ac_status" >&5
		if (exit $ac_status) && test -s out/conftest2.$ac_objext
		then
		# The compiler can only warn and ignore the option if not recognized
		@@ -15074,11 +15072,11 @@ else
		-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
		-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
		-e 's:$: $lt_compiler_flag:'`
		(eval echo "\"\$as_me:15077: $lt_compile\"" >&5)
		(eval echo "\"\$as_me:15075: $lt_compile\"" >&5)
		(eval "$lt_compile" 2>conftest.err)
		ac_status=$?
		cat conftest.err >&5
		echo "$as_me:15081: \$? = $ac_status" >&5
		echo "$as_me:15079: \$? = $ac_status" >&5
		if (exit $ac_status) && test -s "$ac_outfile"; then
		# The compiler can only warn and ignore the option if not recognized
		# So say no if there are warnings other than the usual output.
		@@ -15178,11 +15176,11 @@ else
		-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
		-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
		-e 's:$: $lt_compiler_flag:'`
		(eval echo "\"\$as_me:15181: $lt_compile\"" >&5)
		(eval echo "\"\$as_me:15179: $lt_compile\"" >&5)
		(eval "$lt_compile" 2>out/conftest.err)
		ac_status=$?
		cat out/conftest.err >&5
		echo "$as_me:15185: \$? = $ac_status" >&5
		echo "$as_me:15183: \$? = $ac_status" >&5
		if (exit $ac_status) && test -s out/conftest2.$ac_objext
		then
		# The compiler can only warn and ignore the option if not recognized
		@@ -17375,11 +17373,11 @@ else
		-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
		-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
		-e 's:$: $lt_compiler_flag:'`
		(eval echo "\"\$as_me:17378: $lt_compile\"" >&5)
		(eval echo "\"\$as_me:17376: $lt_compile\"" >&5)
		(eval "$lt_compile" 2>conftest.err)
		ac_status=$?
		cat conftest.err >&5
		echo "$as_me:17382: \$? = $ac_status" >&5
		echo "$as_me:17380: \$? = $ac_status" >&5
		if (exit $ac_status) && test -s "$ac_outfile"; then
		# The compiler can only warn and ignore the option if not recognized
		# So say no if there are warnings other than the usual output.
		@@ -17665,11 +17663,11 @@ else
		-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
		-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
		-e 's:$: $lt_compiler_flag:'`
		(eval echo "\"\$as_me:17668: $lt_compile\"" >&5)
		(eval echo "\"\$as_me:17666: $lt_compile\"" >&5)
		(eval "$lt_compile" 2>conftest.err)
		ac_status=$?
		cat conftest.err >&5
		echo "$as_me:17672: \$? = $ac_status" >&5
		echo "$as_me:17670: \$? = $ac_status" >&5
		if (exit $ac_status) && test -s "$ac_outfile"; then
		# The compiler can only warn and ignore the option if not recognized
		# So say no if there are warnings other than the usual output.
		@@ -17769,11 +17767,11 @@ else
		-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
		-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
		-e 's:$: $lt_compiler_flag:'`
		(eval echo "\"\$as_me:17772: $lt_compile\"" >&5)
		(eval echo "\"\$as_me:17770: $lt_compile\"" >&5)
		(eval "$lt_compile" 2>out/conftest.err)
		ac_status=$?
		cat out/conftest.err >&5
		echo "$as_me:17776: \$? = $ac_status" >&5
		echo "$as_me:17774: \$? = $ac_status" >&5
		if (exit $ac_status) && test -s out/conftest2.$ac_objext
		then
		# The compiler can only warn and ignore the option if not recognized
		@@ -27744,7 +27742,7 @@ fi

		# "Best" linking option
		if test "$use_best" = "yes"; then
		AM_LDFLAGS="-static -shared-libgcc -static-libtool-libs $AM_LDFLAGS"
		AM_LDFLAGS="-shared-libgcc -static-libtool-libs $AM_LDFLAGS"
		fi

configure.ac

+1 −3

Original line number	Diff line number	Diff line
		@@ -68,8 +68,6 @@ if test "$use_autoflag" = "yes"; then
		LDFLAGS =""
		ACX_PROG_CC_OPTIM
		fi
		AC_DISABLE_STATIC
		#AC_DISABLE_SHARED
		AC_PROG_LIBTOOL
		AC_PROG_INSTALL

		@@ -233,7 +231,7 @@ fi

		# "Best" linking option
		if test "$use_best" = "yes"; then
		AM_LDFLAGS="-static -shared-libgcc -static-libtool-libs $AM_LDFLAGS"
		AM_LDFLAGS="-shared-libgcc -static-libtool-libs $AM_LDFLAGS"
		fi

		AC_SUBST(AM_CFLAGS)